1241 files changed, 48170 insertions, 53310 deletions

diff --git a/check.py b/check.py
index 725766aa6..5a04f7c47 100755
--- a/check.py
+++ b/check.py
@@ -409,15 +409,18 @@ def run_torture_tests():
     unexpected_result_count += link_assembly_files.run(
         linker=os.path.abspath(S2WASM_EXE),
         files=os.path.abspath(os.path.join(options.binaryen_test, 'torture-s', '*.s')),
-        fails=os.path.abspath(os.path.join(options.binaryen_test, 's2wasm_known_gcc_test_failures.txt')),
-        out=s2wasm_torture_out)
+        fails=[os.path.abspath(os.path.join(options.binaryen_test, 's2wasm_known_gcc_test_failures.txt'))],
+        attributes=['O2'],
+        out=s2wasm_torture_out,
+        args=None)
     assert os.path.isdir(s2wasm_torture_out), 'Expected output directory %s' % s2wasm_torture_out
 
     import test.waterfall.src.execute_files as execute_files
     unexpected_result_count += execute_files.run(
         runner=os.path.abspath(WASM_SHELL_EXE),
         files=os.path.abspath(os.path.join(s2wasm_torture_out, '*.wast')),
-        fails=os.path.abspath(os.path.join(options.binaryen_test, 's2wasm_known_binaryen_shell_test_failures.txt')),
+        fails=[os.path.abspath(os.path.join(options.binaryen_test, 's2wasm_known_binaryen_shell_test_failures.txt'))],
+        attributes=['O2'],
         out='',
         wasmjs='')
 
diff --git a/test/s2wasm_known_binaryen_shell_test_failures.txt b/test/s2wasm_known_binaryen_shell_test_failures.txt
index 328efba2a..52d495a5d 100644
--- a/test/s2wasm_known_binaryen_shell_test_failures.txt
+++ b/test/s2wasm_known_binaryen_shell_test_failures.txt
@@ -10,7 +10,6 @@
 20070201-1.c.s.wast
 20071030-1.c.s.wast
 20080502-1.c.s.wast
-20100708-1.c.s.wast
 20121108-1.c.s.wast
 920501-8.c.s.wast
 920501-9.c.s.wast
@@ -45,19 +44,13 @@ complex-7.c.s.wast
 # abort called: the tests are self-validating and call abort when they detect a
 # failure.  This may not be binaryen's fault (the toolchain may be emitting bad
 # code) but it could be binaryen's fault.
-20030125-1.c.s.wast
-920612-1.c.s.wast
 920625-1.c.s.wast
-920711-1.c.s.wast
 931004-10.c.s.wast
 931004-12.c.s.wast
 931004-14.c.s.wast
 931004-6.c.s.wast
-bcp-1.c.s.wast
 bitfld-3.c.s.wast
-builtin-constant.c.s.wast
 eeprof-1.c.s.wast
-pr22493-1.c.s.wast
 pr32244-1.c.s.wast
 pr34971.c.s.wast
 pr38151.c.s.wast
@@ -78,7 +71,6 @@ va-arg-pack-1.c.s.wast
 20050218-1.c.s.wast # strlen
 20050826-1.c.s.wast # memset
 20051113-1.c.s.wast # malloc
-20060412-1.c.s.wast # memset
 20071018-1.c.s.wast # __builtin_malloc
 20071120-1.c.s.wast # __builtin_malloc
 20071202-1.c.s.wast # memcpy
@@ -104,12 +96,10 @@ memcpy-2.c.s.wast # memset
 memcpy-bi.c.s.wast # memcpy
 memset-1.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
 pr36038.c.s.wast # memcpy
-pr36093.c.s.wast # memset
 pr36765.c.s.wast # __builtin_malloc
 pr39228.c.s.wast # __builtin_isinff
 pr41395-1.c.s.wast # malloc
@@ -141,11 +131,67 @@ 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()
+# Untriaged
+20000112-1.c.s.wast O0
+20001011-1.c.s.wast O0
+20010409-1.c.s.wast O0
+20010605-2.c.s.wast O0
+20010925-1.c.s.wast O0
+20011008-3.c.s.wast O0
+20011121-1.c.s.wast O0
+20021127-1.c.s.wast O0
+20030626-1.c.s.wast O0
+20030626-2.c.s.wast O0
+20030715-1.c.s.wast O0
+20030914-1.c.s.wast O0
+20030914-2.c.s.wast O0
+20031003-1.c.s.wast O0
+20040208-1.c.s.wast O0
+20040223-1.c.s.wast O0
+20040313-1.c.s.wast O0
+20040709-1.c.s.wast O0
+20040709-2.c.s.wast O0
+20041126-1.c.s.wast O0
+20050121-1.c.s.wast O0
+20090113-1.c.s.wast O0
+20111208-1.c.s.wast O0
+20120207-1.c.s.wast O0
+920810-1.c.s.wast O0
+921006-1.c.s.wast O0
+930622-2.c.s.wast O0
+930725-1.c.s.wast O0
+950426-1.c.s.wast O0
+960327-1.c.s.wast O0
+960513-1.c.s.wast O0
+complex-6.c.s.wast O0
+conversion.c.s.wast O0
+mode-dependent-address.c.s.wast O0
+nestfunc-4.c.s.wast O0
+p18298.c.s.wast O0
+pr15262-1.c.s.wast O0
+pr20621-1.c.s.wast O0
+pr22061-1.c.s.wast O0
+pr23135.c.s.wast O0
+pr30778.c.s.wast O0
+pr33142.c.s.wast O0
+pr36321.c.s.wast O0
+pr42614.c.s.wast O0
+pr49644.c.s.wast O0
+pr60062.c.s.wast O0
+string-opt-18.c.s.wast O0
+vla-dealloc-1.c.s.wast O0
+
+20030914-1.c.s.wast O2
+20040409-1.c.s.wast O2
+20040409-2.c.s.wast O2
+20040409-3.c.s.wast O2
+20060412-1.c.s.wast O2
+20100708-1.c.s.wast O2
+920612-1.c.s.wast O2
+920711-1.c.s.wast O2
+930529-1.c.s.wast O2
+bcp-1.c.s.wast O2
+builtin-constant.c.s.wast O2
+pr22493-1.c.s.wast O2
+# pr28982b.c.s.wast O2
+pr36093.c.s.wast O2
diff --git a/test/torture-s/20000112-1.c.s b/test/torture-s/20000112-1.c.s
index c91f127d4..5ffde7c40 100644
--- a/test/torture-s/20000112-1.c.s
+++ b/test/torture-s/20000112-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000113-1.c.s b/test/torture-s/20000113-1.c.s
index d3e3e6a9a..b1b92dbf4 100644
--- a/test/torture-s/20000113-1.c.s
+++ b/test/torture-s/20000113-1.c.s
@@ -7,18 +7,16 @@
 foobar:                                 # @foobar
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push1=, 1
-	i32.and 	$push11=, $0, $pop1
-	tee_local	$push10=, $0=, $pop11
-	i32.eqz 	$push14=, $pop10
-	br_if   	0, $pop14       # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+	i32.and 	$0=, $0, $pop1
+	block   	
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label0
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push0=, 3
-	i32.and 	$push13=, $1, $pop0
-	tee_local	$push12=, $1=, $pop13
-	i32.sub 	$push2=, $pop12, $0
+	i32.and 	$1=, $1, $pop0
+	i32.sub 	$push2=, $1, $0
 	i32.mul 	$push3=, $pop2, $1
 	i32.add 	$push4=, $pop3, $2
 	i32.const	$push5=, 7
@@ -26,7 +24,7 @@ foobar:                                 # @foobar
 	i32.const	$push7=, 5
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -44,7 +42,7 @@ foobar:                                 # @foobar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -53,6 +51,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 01bf7aba2..206772c70 100644
--- a/test/torture-s/20000121-1.c.s
+++ b/test/torture-s/20000121-1.c.s
@@ -6,7 +6,7 @@
 	.type	big,@function
 big:                                    # @big
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ big:                                    # @big
 	.type	doit,@function
 doit:                                   # @doit
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -30,7 +30,7 @@ doit:                                   # @doit
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -38,4 +38,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20000205-1.c.s b/test/torture-s/20000205-1.c.s
index a9744dd7a..ce06e65fa 100644
--- a/test/torture-s/20000205-1.c.s
+++ b/test/torture-s/20000205-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000217-1.c.s b/test/torture-s/20000217-1.c.s
index 682b89c97..19c04f88f 100644
--- a/test/torture-s/20000217-1.c.s
+++ b/test/torture-s/20000217-1.c.s
@@ -7,18 +7,17 @@
 showbug:                                # @showbug
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$push1=, 0($1)
 	i32.load16_u	$push0=, 0($0)
 	i32.add 	$push2=, $pop1, $pop0
 	i32.const	$push3=, 65528
-	i32.add 	$push9=, $pop2, $pop3
-	tee_local	$push8=, $1=, $pop9
-	i32.store16	0($0), $pop8
+	i32.add 	$1=, $pop2, $pop3
+	i32.store16	0($0), $1
 	i32.const	$push7=, 65528
 	i32.and 	$push4=, $1, $pop7
-	i32.const	$push5=, 7
-	i32.gt_u	$push6=, $pop4, $pop5
+	i32.const	$push5=, 0
+	i32.ne  	$push6=, $pop4, $pop5
                                         # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
@@ -30,7 +29,7 @@ showbug:                                # @showbug
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,5 +38,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000223-1.c.s b/test/torture-s/20000223-1.c.s
index d63634b84..b3d405899 100644
--- a/test/torture-s/20000223-1.c.s
+++ b/test/torture-s/20000223-1.c.s
@@ -6,14 +6,14 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.sub 	$push1=, $pop0, $1
 	i32.and 	$push2=, $pop1, $1
 	i32.ne  	$push3=, $pop2, $1
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,7 +29,7 @@ check:                                  # @check
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,5 +37,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20000224-1.c.s b/test/torture-s/20000224-1.c.s
index 76cf4ccab..6c0ca827c 100644
--- a/test/torture-s/20000224-1.c.s
+++ b/test/torture-s/20000224-1.c.s
@@ -6,47 +6,45 @@
 	.type	test,@function
 test:                                   # @test
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push9=, 0
+	i32.load	$0=, loop_1($pop9)
 	block   	
-	i32.const	$push10=, 0
-	i32.load	$push9=, loop_1($pop10)
-	tee_local	$push8=, $0=, $pop9
-	i32.const	$push7=, 1
-	i32.lt_s	$push0=, $pop8, $pop7
+	i32.const	$push8=, 1
+	i32.lt_s	$push0=, $0, $pop8
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push12=, 0
-	i32.load	$3=, flag($pop12)
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push11=, 0
-	i32.load	$1=, loop_2($pop11)
-	i32.const	$4=, 0
+	i32.load	$2=, flag($pop11)
+	i32.const	$push10=, 0
+	i32.load	$1=, loop_2($pop10)
+	i32.const	$3=, 0
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push19=, 1
-	i32.and 	$2=, $3, $pop19
-	i32.const	$push18=, 1
-	i32.add 	$3=, $3, $pop18
-	i32.const	$push17=, 0
-	i32.sub 	$push3=, $pop17, $2
 	i32.const	$push16=, 0
 	i32.const	$push15=, 1
-	i32.lt_s	$push1=, $1, $pop15
-	i32.select	$push2=, $pop16, $1, $pop1
-	i32.and 	$push4=, $pop3, $pop2
-	i32.add 	$push14=, $4, $pop4
-	tee_local	$push13=, $4=, $pop14
-	i32.gt_s	$push5=, $0, $pop13
-	br_if   	0, $pop5        # 0: up to label1
-# BB#3:                                 # %while.cond.while.end_crit_edge
+	i32.and 	$push3=, $2, $pop15
+	i32.sub 	$push4=, $pop16, $pop3
+	i32.const	$push14=, 0
+	i32.const	$push13=, 1
+	i32.lt_s	$push1=, $1, $pop13
+	i32.select	$push2=, $pop14, $1, $pop1
+	i32.and 	$push5=, $pop4, $pop2
+	i32.add 	$3=, $3, $pop5
+	i32.const	$push12=, 1
+	i32.add 	$2=, $2, $pop12
+	i32.gt_s	$push6=, $0, $3
+	br_if   	0, $pop6        # 0: up to label1
+# %bb.3:                                # %while.cond.while.end_crit_edge
 	end_loop
-	i32.const	$push6=, 0
-	i32.store	flag($pop6), $3
+	i32.const	$push7=, 0
+	i32.store	flag($pop7), $2
 .LBB0_4:                                # %while.end
 	end_block                       # label0:
-	i32.const	$push20=, 1
-                                        # fallthrough-return: $pop20
+	i32.const	$push17=, 1
+                                        # fallthrough-return: $pop17
 	.endfunc
 .Lfunc_end0:
 	.size	test, .Lfunc_end0-test
@@ -57,7 +55,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, test@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -94,5 +92,5 @@ flag:
 	.size	flag, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000225-1.c.s b/test/torture-s/20000225-1.c.s
index 39b221765..82786c82e 100644
--- a/test/torture-s/20000225-1.c.s
+++ b/test/torture-s/20000225-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000227-1.c.s b/test/torture-s/20000227-1.c.s
index 0ea972bd0..90f25df4a 100644
--- a/test/torture-s/20000227-1.c.s
+++ b/test/torture-s/20000227-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20000313-1.c.s b/test/torture-s/20000313-1.c.s
index ff2f0e6ca..676f00670 100644
--- a/test/torture-s/20000313-1.c.s
+++ b/test/torture-s/20000313-1.c.s
@@ -8,7 +8,7 @@ buggy:                                  # @buggy
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$1=, 0($0)
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
@@ -26,7 +26,7 @@ buggy:                                  # @buggy
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end3
+# %bb.0:                                # %if.end3
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,4 +34,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20000314-1.c.s b/test/torture-s/20000314-1.c.s
index 614c0bc88..1ae99f166 100644
--- a/test/torture-s/20000314-1.c.s
+++ b/test/torture-s/20000314-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000314-2.c.s b/test/torture-s/20000314-2.c.s
index d8bb84775..bac00681c 100644
--- a/test/torture-s/20000314-2.c.s
+++ b/test/torture-s/20000314-2.c.s
@@ -6,12 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, a($pop1)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -42,6 +42,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fe08c2733..765266087 100644
--- a/test/torture-s/20000314-3.c.s
+++ b/test/torture-s/20000314-3.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000402-1.c.s b/test/torture-s/20000402-1.c.s
index 34ea67d25..e5bdf3917 100644
--- a/test/torture-s/20000402-1.c.s
+++ b/test/torture-s/20000402-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000403-1.c.s b/test/torture-s/20000403-1.c.s
index c4b2f990a..2531c245c 100644
--- a/test/torture-s/20000403-1.c.s
+++ b/test/torture-s/20000403-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push8=, 0
 	i32.load	$push0=, aa($pop8)
@@ -18,7 +18,7 @@ main:                                   # @main
 	i32.const	$push6=, 0
 	i32.gt_s	$push5=, $pop4, $pop6
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -37,7 +37,7 @@ main:                                   # @main
 seqgt:                                  # @seqgt
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $1, $0
 	i32.sub 	$push1=, $pop0, $2
 	i32.const	$push2=, 0
@@ -54,7 +54,7 @@ seqgt:                                  # @seqgt
 seqgt2:                                 # @seqgt2
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $1, $0
 	i32.sub 	$push1=, $pop0, $2
 	i32.const	$push2=, 0
@@ -83,6 +83,6 @@ bb:
 	.size	bb, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b7de28539..c74077837 100644
--- a/test/torture-s/20000412-1.c.s
+++ b/test/torture-s/20000412-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_s	$push1=, i($pop0)
 	i32.const	$push2=, 2
@@ -24,14 +24,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load16_u	$push0=, i($pop3)
 	i32.const	$push1=, 65535
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -62,6 +62,6 @@ wordlist:
 	.size	wordlist, 828
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3e2937a96..f665f5bb6 100644
--- a/test/torture-s/20000412-2.c.s
+++ b/test/torture-s/20000412-2.c.s
@@ -8,20 +8,19 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop2, $pop4
-	tee_local	$push11=, $2=, $pop12
-	i32.store	__stack_pointer($pop5), $pop11
+	i32.sub 	$2=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $2
 	i32.store	12($2), $0
 	block   	
 	block   	
-	i32.eqz 	$push13=, $0
-	br_if   	0, $pop13       # 0: down to label1
-# BB#1:                                 # %if.end
+	i32.eqz 	$push11=, $0
+	br_if   	0, $pop11       # 0: down to label1
+# %bb.1:                                # %if.end
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push9=, 12
@@ -37,8 +36,8 @@ f:                                      # @f
 	i32.const	$push6=, 16
 	i32.add 	$push7=, $2, $pop6
 	i32.store	__stack_pointer($pop8), $pop7
-	copy_local	$push14=, $0
-                                        # fallthrough-return: $pop14
+	copy_local	$push12=, $0
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -50,7 +49,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 100
 	i32.const	$push4=, 0
@@ -58,7 +57,7 @@ main:                                   # @main
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
 	unreachable
@@ -71,6 +70,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e2dc13f73..087ecfc4c 100644
--- a/test/torture-s/20000412-3.c.s
+++ b/test/torture-s/20000412-3.c.s
@@ -6,7 +6,7 @@
 	.type	z,@function
 z:                                      # @z
 	.result 	i32
-# BB#0:                                 # %f.exit
+# %bb.0:                                # %f.exit
 	i32.const	$push0=, 96
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ z:                                      # @z
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -35,14 +35,14 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 70
 	block   	
 	i32.load8_u	$push1=, 0($0)
 	i32.load8_u	$push0=, 0($1)
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load8_s	$push4=, 1($1)
 	i32.load8_s	$push3=, 1($0)
 	i32.add 	$2=, $pop4, $pop3
@@ -55,5 +55,5 @@ f:                                      # @f
 	.size	f, .Lfunc_end2-f
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-4.c.s b/test/torture-s/20000412-4.c.s
index 0e75be40b..af46826fd 100644
--- a/test/torture-s/20000412-4.c.s
+++ b/test/torture-s/20000412-4.c.s
@@ -6,46 +6,40 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
+	.local  	i32
+# %bb.0:                                # %entry
+	i32.sub 	$5=, $0, $2
+	i32.const	$push0=, 0
+	i32.const	$push11=, 0
+	i32.gt_s	$push1=, $5, $pop11
+	i32.select	$5=, $5, $pop0, $pop1
 	block   	
 	block   	
-	i32.sub 	$push15=, $0, $2
-	tee_local	$push14=, $6=, $pop15
-	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.gt_s	$push1=, $6, $pop13
-	i32.select	$push12=, $pop14, $pop0, $pop1
-	tee_local	$push11=, $5=, $pop12
-	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
-	i32.sub 	$push6=, $pop5, $0
-	i32.mul 	$push7=, $3, $pop6
-	i32.add 	$push8=, $2, $pop7
-	i32.sub 	$2=, $pop8, $1
+	i32.const	$push10=, 2
+	i32.gt_u	$push2=, $5, $pop10
+	br_if   	0, $pop2        # 0: down to label1
+# %bb.1:                                # %for.body.lr.ph
+	i32.add 	$push3=, $2, $5
+	i32.const	$push12=, -1
+	i32.add 	$push4=, $pop3, $pop12
+	i32.sub 	$push5=, $pop4, $0
+	i32.mul 	$push6=, $3, $pop5
+	i32.add 	$push7=, $2, $pop6
+	i32.sub 	$2=, $pop7, $1
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	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
+	i32.add 	$2=, $2, $3
+	i32.const	$push13=, -1
+	i32.le_s	$push8=, $2, $pop13
+	br_if   	2, $pop8        # 2: down to label0
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	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
+	i32.const	$push15=, 1
+	i32.add 	$5=, $5, $pop15
+	i32.const	$push14=, 2
+	i32.le_u	$push9=, $5, $pop14
+	br_if   	0, $pop9        # 0: up to label2
 .LBB0_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
@@ -65,7 +59,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %for.body.lr.ph.i
+# %bb.0:                                # %for.body.lr.ph.i
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -74,6 +68,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 63633ea26..13d055acd 100644
--- a/test/torture-s/20000412-5.c.s
+++ b/test/torture-s/20000412-5.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000412-6.c.s b/test/torture-s/20000412-6.c.s
index e761e0ddd..a4363a260 100644
--- a/test/torture-s/20000412-6.c.s
+++ b/test/torture-s/20000412-6.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %bug.exit
+# %bb.0:                                # %bug.exit
 	block   	
 	i32.const	$push1=, 512
 	i32.const	$push13=, 0
@@ -23,7 +23,7 @@ main:                                   # @main
 	i32.const	$push9=, 491
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push14=, 0
 	call    	exit@FUNCTION, $pop14
 	unreachable
@@ -42,22 +42,21 @@ main:                                   # @main
 bug:                                    # @bug
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ge_u	$push0=, $1, $2
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push9=, 65535
-	i32.and 	$push1=, $0, $pop9
+	i32.const	$push7=, 65535
+	i32.and 	$push1=, $0, $pop7
 	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
+	i32.const	$push6=, 2
+	i32.add 	$1=, $1, $pop6
+	i32.lt_u	$push3=, $1, $2
 	br_if   	0, $pop3        # 0: up to label2
 .LBB1_3:                                # %for.end
 	end_loop
@@ -83,6 +82,6 @@ buf:
 	.size	buf, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6cb3892ac..15374ade1 100644
--- a/test/torture-s/20000419-1.c.s
+++ b/test/torture-s/20000419-1.c.s
@@ -6,10 +6,10 @@
 	.type	brother,@function
 brother:                                # @brother
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -25,12 +25,12 @@ brother:                                # @brother
 	.type	sister,@function
 sister:                                 # @sister
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 4($0)
 	i32.eq  	$push1=, $pop0, $1
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %brother.exit
+# %bb.1:                                # %brother.exit
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -46,7 +46,7 @@ sister:                                 # @sister
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %sister.exit
+# %bb.0:                                # %sister.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -55,6 +55,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d273e3d68..bd3bc0e70 100644
--- a/test/torture-s/20000422-1.c.s
+++ b/test/torture-s/20000422-1.c.s
@@ -7,18 +7,17 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push16=, 0
+	i32.load	$0=, num($pop16)
 	block   	
 	block   	
-	i32.const	$push18=, 0
-	i32.load	$push17=, num($pop18)
-	tee_local	$push16=, $0=, $pop17
 	i32.const	$push15=, 1
-	i32.lt_s	$push0=, $pop16, $pop15
+	i32.lt_s	$push0=, $0, $pop15
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
-	i32.const	$push19=, -1
-	i32.add 	$1=, $0, $pop19
+# %bb.1:                                # %for.body.lr.ph
+	i32.const	$push17=, -1
+	i32.add 	$1=, $0, $pop17
 	i32.const	$push1=, 2
 	i32.shl 	$push2=, $0, $pop1
 	i32.const	$push3=, ops-8
@@ -31,7 +30,7 @@ main:                                   # @main
 	block   	
 	i32.le_s	$push4=, $1, $6
 	br_if   	0, $pop4        # 0: down to label3
-# BB#3:                                 # %for.body3.preheader
+# %bb.3:                                # %for.body3.preheader
                                         #   in Loop: Header=BB0_2 Depth=1
 	copy_local	$7=, $2
 	copy_local	$8=, $1
@@ -39,72 +38,66 @@ main:                                   # @main
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label4:
+	i32.const	$push18=, 4
+	i32.add 	$5=, $7, $pop18
+	i32.load	$4=, 0($5)
+	i32.load	$3=, 0($7)
 	block   	
-	i32.load	$push26=, 0($7)
-	tee_local	$push25=, $3=, $pop26
-	i32.const	$push24=, 4
-	i32.add 	$push23=, $7, $pop24
-	tee_local	$push22=, $5=, $pop23
-	i32.load	$push21=, 0($pop22)
-	tee_local	$push20=, $4=, $pop21
-	i32.ge_s	$push5=, $pop25, $pop20
+	i32.ge_s	$push5=, $3, $4
 	br_if   	0, $pop5        # 0: down to label5
-# BB#5:                                 # %if.then
+# %bb.5:                                # %if.then
                                         #   in Loop: Header=BB0_4 Depth=2
 	i32.store	0($7), $4
 	i32.store	0($5), $3
 .LBB0_6:                                # %for.inc
                                         #   in Loop: Header=BB0_4 Depth=2
 	end_block                       # label5:
-	i32.const	$push30=, -4
-	i32.add 	$7=, $7, $pop30
-	i32.const	$push29=, -1
-	i32.add 	$push28=, $8, $pop29
-	tee_local	$push27=, $8=, $pop28
-	i32.gt_s	$push6=, $pop27, $6
+	i32.const	$push20=, -4
+	i32.add 	$7=, $7, $pop20
+	i32.const	$push19=, -1
+	i32.add 	$8=, $8, $pop19
+	i32.gt_s	$push6=, $8, $6
 	br_if   	0, $pop6        # 0: up to label4
 .LBB0_7:                                # %for.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
 	end_block                       # label3:
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $6, $pop33
-	tee_local	$push31=, $6=, $pop32
-	i32.lt_s	$push7=, $pop31, $0
+	i32.const	$push21=, 1
+	i32.add 	$6=, $6, $pop21
+	i32.lt_s	$push7=, $6, $0
 	br_if   	0, $pop7        # 0: up to label2
-# BB#8:                                 # %for.end14
+# %bb.8:                                # %for.end14
 	end_loop
-	i32.const	$push34=, 1
-	i32.lt_s	$push8=, $0, $pop34
+	i32.const	$push22=, 1
+	i32.lt_s	$push8=, $0, $pop22
 	br_if   	0, $pop8        # 0: down to label1
-# BB#9:                                 # %for.body17.preheader
+# %bb.9:                                # %for.body17.preheader
 	i32.const	$7=, 0
 	i32.const	$8=, 0
 .LBB0_10:                               # %for.body17
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.const	$push36=, ops
-	i32.add 	$push11=, $7, $pop36
+	i32.const	$push24=, ops
+	i32.add 	$push11=, $7, $pop24
 	i32.load	$push12=, 0($pop11)
-	i32.const	$push35=, correct
-	i32.add 	$push9=, $7, $pop35
+	i32.const	$push23=, correct
+	i32.add 	$push9=, $7, $pop23
 	i32.load	$push10=, 0($pop9)
 	i32.ne  	$push13=, $pop12, $pop10
 	br_if   	2, $pop13       # 2: down to label0
-# BB#11:                                # %for.cond15
+# %bb.11:                               # %for.cond15
                                         #   in Loop: Header=BB0_10 Depth=1
-	i32.const	$push40=, 4
-	i32.add 	$7=, $7, $pop40
-	i32.const	$push39=, 1
-	i32.add 	$push38=, $8, $pop39
-	tee_local	$push37=, $8=, $pop38
-	i32.lt_s	$push14=, $pop37, $0
+	i32.const	$push26=, 1
+	i32.add 	$8=, $8, $pop26
+	i32.const	$push25=, 4
+	i32.add 	$7=, $7, $pop25
+	i32.lt_s	$push14=, $8, $0
 	br_if   	0, $pop14       # 0: up to label6
 .LBB0_12:                               # %for.end25
 	end_loop
 	end_block                       # label1:
-	i32.const	$push41=, 0
-	call    	exit@FUNCTION, $pop41
+	i32.const	$push27=, 0
+	call    	exit@FUNCTION, $pop27
 	unreachable
 .LBB0_13:                               # %if.then21
 	end_block                       # label0:
@@ -166,6 +159,6 @@ num:
 	.size	num, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e660c9b83..77b07ec76 100644
--- a/test/torture-s/20000503-1.c.s
+++ b/test/torture-s/20000503-1.c.s
@@ -7,14 +7,13 @@
 sub:                                    # @sub
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2
-	i32.add 	$push8=, $0, $pop0
-	tee_local	$push7=, $0=, $pop8
+	i32.add 	$0=, $0, $pop0
 	i32.const	$push1=, 0
 	i32.const	$push6=, 0
 	i32.gt_s	$push2=, $0, $pop6
-	i32.select	$push3=, $pop7, $pop1, $pop2
+	i32.select	$push3=, $0, $pop1, $pop2
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $pop3, $pop4
                                         # fallthrough-return: $pop5
@@ -28,7 +27,7 @@ sub:                                    # @sub
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -37,5 +36,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000511-1.c.s b/test/torture-s/20000511-1.c.s
index b0938a35c..888feaf04 100644
--- a/test/torture-s/20000511-1.c.s
+++ b/test/torture-s/20000511-1.c.s
@@ -6,11 +6,11 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -35,6 +35,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7853140a1..0ad522f89 100644
--- a/test/torture-s/20000519-1.c.s
+++ b/test/torture-s/20000519-1.c.s
@@ -8,7 +8,7 @@ bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
@@ -19,7 +19,7 @@ bar:                                    # @bar
 	i32.const	$push3=, 10
 	i32.gt_s	$push1=, $2, $pop3
 	br_if   	0, $pop1        # 0: up to label0
-# BB#2:                                 # %do.end
+# %bb.2:                                # %do.end
 	end_loop
 	i32.add 	$push2=, $2, $0
                                         # fallthrough-return: $pop2
@@ -35,7 +35,7 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
@@ -51,7 +51,7 @@ foo:                                    # @foo
 	i32.const	$push7=, 10
 	i32.gt_s	$push1=, $2, $pop7
 	br_if   	0, $pop1        # 0: up to label1
-# BB#2:                                 # %bar.exit
+# %bb.2:                                # %bar.exit
 	end_loop
 	i32.add 	$push2=, $2, $0
                                         # fallthrough-return: $pop2
@@ -66,14 +66,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push14=, $pop6, $pop8
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop9), $pop13
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i64.const	$push0=, 12884901890
 	i64.store	0($0), $pop0
 	block   	
@@ -82,7 +81,7 @@ main:                                   # @main
 	i32.const	$push3=, 3
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push12=, 0
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $0, $pop10
@@ -98,5 +97,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20000519-2.c.s b/test/torture-s/20000519-2.c.s
index 46d86306c..50a09ffe2 100644
--- a/test/torture-s/20000519-2.c.s
+++ b/test/torture-s/20000519-2.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, x($pop3)
 	i32.const	$push1=, -1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -35,6 +35,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 11ea7f3f7..268b82d18 100644
--- a/test/torture-s/20000523-1.c.s
+++ b/test/torture-s/20000523-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000528-1.c.s b/test/torture-s/20000528-1.c.s
index 9f511b9e3..d94521c33 100644
--- a/test/torture-s/20000528-1.c.s
+++ b/test/torture-s/20000528-1.c.s
@@ -7,21 +7,20 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, l($pop6)
-	tee_local	$push4=, $0=, $pop5
-	i32.store16	s($pop7), $pop4
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$0=, l($pop5)
+	i32.const	$push4=, 0
+	i32.store16	s($pop4), $0
 	block   	
 	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	$push8=, 0
-	call    	exit@FUNCTION, $pop8
+# %bb.1:                                # %if.end
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -50,6 +49,6 @@ s:
 	.size	s, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b62acfc83..fef6210a4 100644
--- a/test/torture-s/20000603-1.c.s
+++ b/test/torture-s/20000603-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4607182418800017408
 	i64.store	0($0), $pop0
 	f64.load	$push1=, 0($1)
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,4 +32,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20000605-1.c.s b/test/torture-s/20000605-1.c.s
index 5f42b6d65..c4279824a 100644
--- a/test/torture-s/20000605-1.c.s
+++ b/test/torture-s/20000605-1.c.s
@@ -7,20 +7,19 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %for.body.lr.ph.i
+# %bb.0:                                # %for.body.lr.ph.i
 	i32.const	$0=, 256
 .LBB0_1:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push3=, -1
-	i32.add 	$push2=, $0, $pop3
-	tee_local	$push1=, $0=, $pop2
-	br_if   	0, $pop1        # 0: up to label0
-# BB#2:                                 # %render_image_rgb_a.exit
+	i32.const	$push1=, -1
+	i32.add 	$0=, $0, $pop1
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %render_image_rgb_a.exit
 	end_loop
 	block   	
 	br_if   	0, $0           # 0: down to label1
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,6 +32,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 bea5f0f29..5fc2270ed 100644
--- a/test/torture-s/20000605-2.c.s
+++ b/test/torture-s/20000605-2.c.s
@@ -7,32 +7,30 @@
 f1:                                     # @f1
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	block   	
 	block   	
-	i32.load	$push9=, 0($0)
-	tee_local	$push8=, $2=, $pop9
 	i32.load	$push0=, 0($1)
-	i32.ge_s	$push1=, $pop8, $pop0
+	i32.ge_s	$push1=, $2, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push10=, 5
-	i32.ge_u	$push2=, $3, $pop10
+	i32.const	$push8=, 5
+	i32.ge_u	$push2=, $3, $pop8
 	br_if   	2, $pop2        # 2: down to label0
-# BB#3:                                 # %for.inc
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.add 	$push3=, $2, $3
-	i32.const	$push14=, 1
-	i32.add 	$push4=, $pop3, $pop14
+	i32.const	$push10=, 1
+	i32.add 	$push4=, $pop3, $pop10
 	i32.store	0($0), $pop4
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $3, $pop13
-	tee_local	$push11=, $3=, $pop12
-	i32.add 	$push5=, $2, $pop11
+	i32.const	$push9=, 1
+	i32.add 	$3=, $3, $pop9
+	i32.add 	$push5=, $2, $3
 	i32.load	$push6=, 0($1)
 	i32.lt_s	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: up to label2
@@ -55,14 +53,13 @@ f1:                                     # @f1
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop2, $pop4
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop5), $pop9
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 1
 	i32.store	0($0), $pop0
 	i32.const	$push1=, 0
@@ -78,6 +75,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 88dd11dad..f8c6d83ca 100644
--- a/test/torture-s/20000605-3.c.s
+++ b/test/torture-s/20000605-3.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %while.cond
+# %bb.0:                                # %cleanup7
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20000622-1.c.s b/test/torture-s/20000622-1.c.s
index 069cfc9fd..2839dc124 100644
--- a/test/torture-s/20000622-1.c.s
+++ b/test/torture-s/20000622-1.c.s
@@ -7,20 +7,20 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 12
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 11
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB0_4:                                # %if.then
@@ -38,7 +38,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -51,16 +51,16 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 11
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 12
 	i32.ne  	$push3=, $2, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %foo.exit
+# %bb.2:                                # %foo.exit
 	return
 .LBB2_3:                                # %if.then.i
 	end_block                       # label1:
@@ -76,7 +76,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -85,6 +85,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7f9871db5..ff31716b6 100644
--- a/test/torture-s/20000703-1.c.s
+++ b/test/torture-s/20000703-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.store	20($0), $1
 	i32.store	24($0), $2
 	i32.const	$push0=, 19
@@ -28,7 +28,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.store	20($0), $1
 	i32.store	24($0), $2
 	i32.const	$push0=, 16
@@ -63,7 +63,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -83,5 +83,5 @@ main:                                   # @main
 	.size	.L.str.1, 18
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000706-1.c.s b/test/torture-s/20000706-1.c.s
index eb7f3b057..37b3c2732 100644
--- a/test/torture-s/20000706-1.c.s
+++ b/test/torture-s/20000706-1.c.s
@@ -6,53 +6,53 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 4($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push6=, 8($0)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false4
+# %bb.3:                                # %lor.lhs.false4
 	i32.load	$push9=, 12($0)
 	i32.const	$push10=, 4
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false6
+# %bb.4:                                # %lor.lhs.false6
 	i32.const	$push13=, 10
 	i32.ne  	$push14=, $5, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false6
+# %bb.5:                                # %lor.lhs.false6
 	i32.const	$push15=, 9
 	i32.ne  	$push16=, $4, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#6:                                 # %lor.lhs.false6
+# %bb.6:                                # %lor.lhs.false6
 	i32.const	$push17=, 8
 	i32.ne  	$push18=, $3, $pop17
 	br_if   	0, $pop18       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false6
+# %bb.7:                                # %lor.lhs.false6
 	i32.const	$push19=, 7
 	i32.ne  	$push20=, $2, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#8:                                 # %lor.lhs.false6
+# %bb.8:                                # %lor.lhs.false6
 	i32.const	$push21=, 6
 	i32.ne  	$push22=, $1, $pop21
 	br_if   	0, $pop22       # 0: down to label0
-# BB#9:                                 # %lor.lhs.false6
+# %bb.9:                                # %lor.lhs.false6
 	i32.load	$push12=, 16($0)
 	i32.const	$push23=, 5
 	i32.ne  	$push24=, $pop12, $pop23
 	br_if   	0, $pop24       # 0: down to label0
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	return
 .LBB0_11:                               # %if.then
 	end_block                       # label0:
@@ -68,33 +68,33 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false.i
+# %bb.1:                                # %lor.lhs.false.i
 	i32.load	$push3=, 4($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false2.i
+# %bb.2:                                # %lor.lhs.false2.i
 	i32.load	$push6=, 8($0)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %lor.lhs.false4.i
+# %bb.3:                                # %lor.lhs.false4.i
 	i32.load	$push9=, 12($0)
 	i32.const	$push10=, 4
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label1
-# BB#4:                                 # %lor.lhs.false6.i
+# %bb.4:                                # %lor.lhs.false6.i
 	i32.load	$push12=, 16($0)
 	i32.const	$push13=, 5
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label1
-# BB#5:                                 # %bar.exit
+# %bb.5:                                # %bar.exit
 	return
 .LBB1_6:                                # %if.then.i
 	end_block                       # label1:
@@ -110,7 +110,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %foo.exit
+# %bb.0:                                # %foo.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -119,6 +119,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0643ea9f5..806e16389 100644
--- a/test/torture-s/20000706-2.c.s
+++ b/test/torture-s/20000706-2.c.s
@@ -6,53 +6,53 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 4($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push6=, 8($0)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false4
+# %bb.3:                                # %lor.lhs.false4
 	i32.load	$push9=, 12($0)
 	i32.const	$push10=, 4
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false6
+# %bb.4:                                # %lor.lhs.false6
 	i32.const	$push13=, 10
 	i32.ne  	$push14=, $5, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false6
+# %bb.5:                                # %lor.lhs.false6
 	i32.const	$push15=, 9
 	i32.ne  	$push16=, $4, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#6:                                 # %lor.lhs.false6
+# %bb.6:                                # %lor.lhs.false6
 	i32.const	$push17=, 8
 	i32.ne  	$push18=, $3, $pop17
 	br_if   	0, $pop18       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false6
+# %bb.7:                                # %lor.lhs.false6
 	i32.const	$push19=, 7
 	i32.ne  	$push20=, $2, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#8:                                 # %lor.lhs.false6
+# %bb.8:                                # %lor.lhs.false6
 	i32.const	$push21=, 6
 	i32.ne  	$push22=, $1, $pop21
 	br_if   	0, $pop22       # 0: down to label0
-# BB#9:                                 # %lor.lhs.false6
+# %bb.9:                                # %lor.lhs.false6
 	i32.load	$push12=, 16($0)
 	i32.const	$push23=, 5
 	i32.ne  	$push24=, $pop12, $pop23
 	br_if   	0, $pop24       # 0: down to label0
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	return
 .LBB0_11:                               # %if.then
 	end_block                       # label0:
@@ -68,33 +68,33 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($1)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false.i
+# %bb.1:                                # %lor.lhs.false.i
 	i32.load	$push3=, 4($1)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false2.i
+# %bb.2:                                # %lor.lhs.false2.i
 	i32.load	$push6=, 8($1)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %lor.lhs.false4.i
+# %bb.3:                                # %lor.lhs.false4.i
 	i32.load	$push9=, 12($1)
 	i32.const	$push10=, 4
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label1
-# BB#4:                                 # %lor.lhs.false6.i
+# %bb.4:                                # %lor.lhs.false6.i
 	i32.load	$push12=, 16($1)
 	i32.const	$push13=, 5
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label1
-# BB#5:                                 # %bar.exit
+# %bb.5:                                # %bar.exit
 	return
 .LBB1_6:                                # %if.then.i
 	end_block                       # label1:
@@ -110,7 +110,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %foo.exit
+# %bb.0:                                # %foo.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -119,6 +119,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 435dfaed4..9a899a380 100644
--- a/test/torture-s/20000706-3.c.s
+++ b/test/torture-s/20000706-3.c.s
@@ -6,7 +6,7 @@
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, 0($0)
 	i32.store	c($pop1), $pop0
@@ -21,18 +21,18 @@ baz:                                    # @baz
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 2
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push0=, c($pop3)
 	i32.const	$push4=, 1
 	i32.ne  	$push5=, $pop0, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB1_3:                                # %if.then
 	end_block                       # label0:
@@ -48,18 +48,18 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	c($pop0), $0
 	block   	
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push3=, 2
 	i32.ne  	$push4=, $1, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %bar.exit
+# %bb.2:                                # %bar.exit
 	return
 .LBB2_3:                                # %if.then.i
 	end_block                       # label1:
@@ -75,7 +75,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	c($pop1), $pop0
@@ -96,6 +96,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a38ebbf35..9d1ef408f 100644
--- a/test/torture-s/20000706-4.c.s
+++ b/test/torture-s/20000706-4.c.s
@@ -6,19 +6,19 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 2
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push4=, c($pop3)
 	i32.load	$push0=, 0($pop4)
 	i32.const	$push5=, 1
 	i32.ne  	$push6=, $pop0, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -35,14 +35,13 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push15=, $pop5, $pop7
-	tee_local	$push14=, $2=, $pop15
-	i32.store	__stack_pointer($pop8), $pop14
+	i32.sub 	$2=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $2
 	i32.const	$push0=, 0
 	i32.const	$push12=, 12
 	i32.add 	$push13=, $2, $pop12
@@ -52,11 +51,11 @@ foo:                                    # @foo
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push3=, 2
 	i32.ne  	$push4=, $1, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %bar.exit
+# %bb.2:                                # %bar.exit
 	i32.const	$push11=, 0
 	i32.const	$push9=, 16
 	i32.add 	$push10=, $2, $pop9
@@ -77,14 +76,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	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.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push0=, 0
 	i32.const	$push5=, 12
 	i32.add 	$push6=, $0, $pop5
@@ -106,6 +104,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 df8477916..f6665367c 100644
--- a/test/torture-s/20000706-5.c.s
+++ b/test/torture-s/20000706-5.c.s
@@ -7,30 +7,29 @@
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push13=, c($pop0)
-	tee_local	$push12=, $1=, $pop13
-	i32.load	$push1=, 0($pop12)
+	i32.load	$1=, c($pop0)
+	block   	
+	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push4=, 4($1)
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i32.const	$push8=, 4
 	i32.ne  	$push9=, $0, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false3
+# %bb.3:                                # %lor.lhs.false3
 	i32.load	$push7=, 8($1)
 	i32.const	$push10=, 3
 	i32.ne  	$push11=, $pop7, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -46,7 +45,7 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	c($pop0), $0
 	block   	
@@ -54,21 +53,21 @@ foo:                                    # @foo
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false.i
+# %bb.1:                                # %lor.lhs.false.i
 	i32.load	$push4=, 4($0)
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false3.i
+# %bb.2:                                # %lor.lhs.false3.i
 	i32.const	$push8=, 4
 	i32.ne  	$push9=, $1, $pop8
 	br_if   	0, $pop9        # 0: down to label1
-# BB#3:                                 # %lor.lhs.false3.i
+# %bb.3:                                # %lor.lhs.false3.i
 	i32.load	$push7=, 8($0)
 	i32.const	$push10=, 3
 	i32.ne  	$push11=, $pop7, $pop10
 	br_if   	0, $pop11       # 0: down to label1
-# BB#4:                                 # %bar.exit
+# %bb.4:                                # %bar.exit
 	return
 .LBB1_5:                                # %if.then.i
 	end_block                       # label1:
@@ -85,14 +84,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push13=, $pop6, $pop8
-	tee_local	$push12=, $0=, $pop13
-	i32.store	__stack_pointer($pop9), $pop12
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 3
@@ -122,6 +120,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fc199b557..4fdb00e50 100644
--- a/test/torture-s/20000707-1.c.s
+++ b/test/torture-s/20000707-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 4
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,13 +27,13 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 4($0)
 	i32.const	$push1=, 4
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %foo.exit
+# %bb.1:                                # %foo.exit
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -49,7 +49,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %bar.exit
+# %bb.0:                                # %bar.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -58,6 +58,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2572bb953..4f4d98efe 100644
--- a/test/torture-s/20000715-1.c.s
+++ b/test/torture-s/20000715-1.c.s
@@ -5,7 +5,7 @@
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -16,7 +16,7 @@ test1:                                  # @test1
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -27,7 +27,7 @@ test2:                                  # @test2
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -38,7 +38,7 @@ test3:                                  # @test3
 	.globl	test4
 	.type	test4,@function
 test4:                                  # @test4
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	y($pop1), $pop0
@@ -55,7 +55,7 @@ test4:                                  # @test4
 	.globl	test5
 	.type	test5,@function
 test5:                                  # @test5
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	y($pop1), $pop0
@@ -72,7 +72,7 @@ test5:                                  # @test5
 	.globl	test6
 	.type	test6,@function
 test6:                                  # @test6
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	y($pop1), $pop0
@@ -90,7 +90,7 @@ test6:                                  # @test6
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	y($pop1), $pop0
@@ -123,5 +123,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000715-2.c.s b/test/torture-s/20000715-2.c.s
index 9fe17d804..39ed9d75d 100644
--- a/test/torture-s/20000715-2.c.s
+++ b/test/torture-s/20000715-2.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 4
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -34,5 +34,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000717-1.c.s b/test/torture-s/20000717-1.c.s
index df6d9b21d..13718d550 100644
--- a/test/torture-s/20000717-1.c.s
+++ b/test/torture-s/20000717-1.c.s
@@ -8,18 +8,17 @@ bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($1)
 	block   	
-	i32.load	$push5=, 0($1)
-	tee_local	$push4=, $2=, $pop5
 	i32.load	$push0=, 4($1)
-	i32.eq  	$push1=, $pop4, $pop0
+	i32.eq  	$push1=, $2, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push2=, 8($1)
 	i32.eq  	$push3=, $2, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return  	$1
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -37,18 +36,17 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	block   	
-	i32.load	$push5=, 0($0)
-	tee_local	$push4=, $2=, $pop5
 	i32.load	$push1=, 4($0)
-	i32.eq  	$push2=, $pop4, $pop1
+	i32.eq  	$push2=, $2, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 8($0)
 	i32.eq  	$push3=, $2, $pop0
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %bar.exit
+# %bb.2:                                # %bar.exit
 	return  	$0
 .LBB1_3:                                # %if.then.i
 	end_block                       # label1:
@@ -65,14 +63,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push12=, $pop5, $pop7
-	tee_local	$push11=, $0=, $pop12
-	i32.store	__stack_pointer($pop8), $pop11
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -99,6 +96,6 @@ main:                                   # @main
 	.size	.Lmain.t, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1dda61eda..8111d7778 100644
--- a/test/torture-s/20000717-2.c.s
+++ b/test/torture-s/20000717-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000717-3.c.s b/test/torture-s/20000717-3.c.s
index 1f5da6486..816ee1d72 100644
--- a/test/torture-s/20000717-3.c.s
+++ b/test/torture-s/20000717-3.c.s
@@ -8,7 +8,7 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$1=, c($pop3)
 	i32.load	$push0=, 0($0)
@@ -27,14 +27,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, c($pop3)
 	i32.const	$push1=, -1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -56,6 +56,6 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c90535f2a..8a16bc740 100644
--- a/test/torture-s/20000717-4.c.s
+++ b/test/torture-s/20000717-4.c.s
@@ -6,7 +6,7 @@
 	.type	x,@function
 x:                                      # @x
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, s+8($pop0)
                                         # fallthrough-return: $pop1
@@ -20,7 +20,7 @@ x:                                      # @x
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,4 +37,4 @@ s:
 	.size	s, 100
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20000717-5.c.s b/test/torture-s/20000717-5.c.s
index 753bc4039..37d494415 100644
--- a/test/torture-s/20000717-5.c.s
+++ b/test/torture-s/20000717-5.c.s
@@ -7,35 +7,35 @@
 bar:                                    # @bar
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($3)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 4($3)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.const	$push7=, 6
 	i32.ne  	$push8=, $2, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false2
+# %bb.3:                                # %lor.lhs.false2
 	i32.const	$push9=, 5
 	i32.ne  	$push10=, $1, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false2
+# %bb.4:                                # %lor.lhs.false2
 	i32.const	$push11=, 4
 	i32.ne  	$push12=, $0, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false2
+# %bb.5:                                # %lor.lhs.false2
 	i32.load	$push6=, 8($3)
 	i32.const	$push13=, 3
 	i32.ne  	$push14=, $pop6, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	return  	$3
 .LBB0_7:                                # %if.then
 	end_block                       # label0:
@@ -52,35 +52,35 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push1=, 0($0)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 4($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop0, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false2.i
+# %bb.2:                                # %lor.lhs.false2.i
 	i32.const	$push7=, 6
 	i32.ne  	$push8=, $3, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %lor.lhs.false2.i
+# %bb.3:                                # %lor.lhs.false2.i
 	i32.const	$push9=, 5
 	i32.ne  	$push10=, $2, $pop9
 	br_if   	0, $pop10       # 0: down to label1
-# BB#4:                                 # %lor.lhs.false2.i
+# %bb.4:                                # %lor.lhs.false2.i
 	i32.const	$push11=, 4
 	i32.ne  	$push12=, $1, $pop11
 	br_if   	0, $pop12       # 0: down to label1
-# BB#5:                                 # %lor.lhs.false2.i
+# %bb.5:                                # %lor.lhs.false2.i
 	i32.load	$push6=, 8($0)
 	i32.const	$push13=, 3
 	i32.ne  	$push14=, $pop6, $pop13
 	br_if   	0, $pop14       # 0: down to label1
-# BB#6:                                 # %bar.exit
+# %bb.6:                                # %bar.exit
 	return  	$0
 .LBB1_7:                                # %if.then.i
 	end_block                       # label1:
@@ -97,14 +97,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push15=, $pop8, $pop10
-	tee_local	$push14=, $0=, $pop15
-	i32.store	__stack_pointer($pop11), $pop14
+	i32.sub 	$0=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $0
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -134,6 +133,6 @@ main:                                   # @main
 	.size	.Lmain.t, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4859c701e..0a4080b7a 100644
--- a/test/torture-s/20000722-1.c.s
+++ b/test/torture-s/20000722-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -19,7 +19,7 @@ main:                                   # @main
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %foo.exit
+# %bb.0:                                # %foo.exit
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -31,13 +31,13 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 4($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 4
 	i32.add 	$push4=, $0, $pop3
 	i32.const	$push5=, 2
@@ -52,6 +52,6 @@ foo:                                    # @foo
 	.size	foo, .Lfunc_end2-foo
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5363043fe..f4cc945b6 100644
--- a/test/torture-s/20000726-1.c.s
+++ b/test/torture-s/20000726-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ main:                                   # @main
 	.type	adjust_xy,@function
 adjust_xy:                              # @adjust_xy
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.store16	0($0), $pop0
                                         # fallthrough-return
@@ -29,5 +29,5 @@ adjust_xy:                              # @adjust_xy
 	.size	adjust_xy, .Lfunc_end1-adjust_xy
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000731-1.c.s b/test/torture-s/20000731-1.c.s
index 91c56c8a9..da812baa7 100644
--- a/test/torture-s/20000731-1.c.s
+++ b/test/torture-s/20000731-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x0p0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -18,7 +18,7 @@ foo:                                    # @foo
 	.globl	do_sibcall
 	.type	do_sibcall,@function
 do_sibcall:                             # @do_sibcall
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -30,7 +30,7 @@ do_sibcall:                             # @do_sibcall
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000731-2.c.s b/test/torture-s/20000731-2.c.s
index 26db9f30f..a67b64d6c 100644
--- a/test/torture-s/20000731-2.c.s
+++ b/test/torture-s/20000731-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000801-1.c.s b/test/torture-s/20000801-1.c.s
index 5a908665c..78165b566 100644
--- a/test/torture-s/20000801-1.c.s
+++ b/test/torture-s/20000801-1.c.s
@@ -7,37 +7,33 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 1
 	i32.lt_s	$push0=, $1, $pop4
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# %bb.1:                                # %while.body.preheader
 	i32.add 	$2=, $0, $1
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push16=, 3
-	i32.add 	$push15=, $0, $pop16
-	tee_local	$push14=, $1=, $pop15
-	i32.load8_u	$3=, 0($pop14)
+	i32.const	$push8=, 3
+	i32.add 	$1=, $0, $pop8
+	i32.load8_u	$4=, 0($1)
 	i32.load8_u	$push1=, 0($0)
 	i32.store8	0($1), $pop1
-	i32.store8	0($0), $3
-	i32.const	$push13=, 2
-	i32.add 	$push12=, $0, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.load8_u	$3=, 0($pop11)
-	i32.const	$push10=, 1
-	i32.add 	$push9=, $0, $pop10
-	tee_local	$push8=, $4=, $pop9
-	i32.load8_u	$push2=, 0($pop8)
+	i32.store8	0($0), $4
+	i32.const	$push7=, 2
+	i32.add 	$1=, $0, $pop7
+	i32.load8_u	$3=, 0($1)
+	i32.const	$push6=, 1
+	i32.add 	$4=, $0, $pop6
+	i32.load8_u	$push2=, 0($4)
 	i32.store8	0($1), $pop2
 	i32.store8	0($4), $3
-	i32.const	$push7=, 4
-	i32.add 	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	i32.lt_u	$push3=, $pop5, $2
+	i32.const	$push5=, 4
+	i32.add 	$0=, $0, $pop5
+	i32.lt_u	$push3=, $0, $2
 	br_if   	0, $pop3        # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
@@ -53,39 +49,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, __stack_pointer($pop4)
-	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop3, $pop5
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop6), $pop10
-	i32.const	$push9=, 0
-	i32.store	12($0), $pop9
-	i32.const	$push8=, 0
-	i32.store8	14($0), $pop8
-	i32.const	$push0=, 1
-	i32.store16	12($0), $pop0
-	block   	
-	i32.load	$push1=, 12($0)
-	i32.const	$push7=, 1
-	i32.ne  	$push2=, $pop1, $pop7
-	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %if.end
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
-	unreachable
-.LBB1_2:                                # %if.then
-	end_block                       # label2:
-	call    	abort@FUNCTION
+# %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 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
-	.functype	abort, void
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000801-2.c.s b/test/torture-s/20000801-2.c.s
index 8d94cb272..5c4a14534 100644
--- a/test/torture-s/20000801-2.c.s
+++ b/test/torture-s/20000801-2.c.s
@@ -7,16 +7,15 @@
 test:                                   # @test
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push3=, $0
-	br_if   	0, $pop3        # 0: down to label0
+	i32.eqz 	$push1=, $0
+	br_if   	0, $pop1        # 0: down to label0
 .LBB0_1:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.load	$push2=, 0($0)
-	tee_local	$push1=, $0=, $pop2
-	br_if   	0, $pop1        # 0: up to label1
+	i32.load	$0=, 0($0)
+	br_if   	0, $0           # 0: up to label1
 .LBB0_2:                                # %while.end
 	end_loop
 	end_block                       # label0:
@@ -32,7 +31,7 @@ test:                                   # @test
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +44,7 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -59,14 +58,13 @@ baz:                                    # @baz
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop2, $pop4
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop5), $pop10
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 0
 	i32.store	8($0), $pop0
 	i32.const	$push6=, 8
@@ -78,10 +76,9 @@ main:                                   # @main
 .LBB3_1:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.load	$push13=, 0($0)
-	tee_local	$push12=, $0=, $pop13
-	br_if   	0, $pop12       # 0: up to label2
-# BB#2:                                 # %if.end
+	i32.load	$0=, 0($0)
+	br_if   	0, $0           # 0: up to label2
+# %bb.2:                                # %if.end
 	end_loop
 	i32.const	$push1=, 0
 	call    	exit@FUNCTION, $pop1
@@ -91,5 +88,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000801-3.c.s b/test/torture-s/20000801-3.c.s
index 613ec8681..c1f16b87f 100644
--- a/test/torture-s/20000801-3.c.s
+++ b/test/torture-s/20000801-3.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, s+4($pop3)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -36,6 +36,6 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 19b6117b1..94a415332 100644
--- a/test/torture-s/20000801-4.c.s
+++ b/test/torture-s/20000801-4.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,14 +20,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	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.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push0=, 0
 	i32.const	$push5=, 14
 	i32.add 	$push6=, $0, $pop5
@@ -49,5 +48,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000808-1.c.s b/test/torture-s/20000808-1.c.s
index 1c4079eb0..d1f77f440 100644
--- a/test/torture-s/20000808-1.c.s
+++ b/test/torture-s/20000808-1.c.s
@@ -5,7 +5,7 @@
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -17,60 +17,60 @@ bar:                                    # @bar
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push1=, 4($0)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push4=, 0($1)
 	i32.const	$push5=, -1
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false5
+# %bb.3:                                # %lor.lhs.false5
 	i32.load	$push7=, 4($1)
 	br_if   	0, $pop7        # 0: down to label0
-# BB#4:                                 # %lor.lhs.false8
+# %bb.4:                                # %lor.lhs.false8
 	i32.load	$push8=, 0($2)
 	i32.const	$push9=, 1
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false11
+# %bb.5:                                # %lor.lhs.false11
 	i32.load	$push11=, 4($2)
 	i32.const	$push26=, -1
 	i32.ne  	$push12=, $pop11, $pop26
 	br_if   	0, $pop12       # 0: down to label0
-# BB#6:                                 # %lor.lhs.false14
+# %bb.6:                                # %lor.lhs.false14
 	i32.load	$push13=, 0($3)
 	i32.const	$push27=, -1
 	i32.ne  	$push14=, $pop13, $pop27
 	br_if   	0, $pop14       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false17
+# %bb.7:                                # %lor.lhs.false17
 	i32.load	$push15=, 4($3)
 	i32.const	$push16=, 1
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#8:                                 # %lor.lhs.false20
+# %bb.8:                                # %lor.lhs.false20
 	i32.load	$push18=, 0($4)
 	br_if   	0, $pop18       # 0: down to label0
-# BB#9:                                 # %lor.lhs.false23
+# %bb.9:                                # %lor.lhs.false23
 	i32.load	$push19=, 4($4)
 	i32.const	$push20=, -1
 	i32.ne  	$push21=, $pop19, $pop20
 	br_if   	0, $pop21       # 0: down to label0
-# BB#10:                                # %lor.lhs.false26
+# %bb.10:                               # %lor.lhs.false26
 	i32.load	$push22=, 0($5)
 	i32.const	$push23=, 1
 	i32.ne  	$push24=, $pop22, $pop23
 	br_if   	0, $pop24       # 0: down to label0
-# BB#11:                                # %lor.lhs.false29
+# %bb.11:                               # %lor.lhs.false29
 	i32.load	$push25=, 4($5)
 	br_if   	0, $pop25       # 0: down to label0
-# BB#12:                                # %if.end
+# %bb.12:                               # %if.end
 	return
 .LBB1_13:                               # %if.then
 	end_block                       # label0:
@@ -85,7 +85,7 @@ f:                                      # @f
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %f.exit
+# %bb.0:                                # %f.exit
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -97,7 +97,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -106,6 +106,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0ef524c2d..05f7eb398 100644
--- a/test/torture-s/20000815-1.c.s
+++ b/test/torture-s/20000815-1.c.s
@@ -7,65 +7,61 @@
 invalidate_memory:                      # @invalidate_memory
 	.param  	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.load8_u	$push8=, 0($0)
-	tee_local	$push7=, $0=, $pop8
-	i32.const	$push1=, 4
-	i32.and 	$2=, $pop7, $pop1
-	i32.const	$push2=, 8
-	i32.and 	$1=, $0, $pop2
-	i32.const	$4=, 0
+# %bb.0:                                # %entry
+	i32.load8_u	$0=, 0($0)
+	i32.const	$push0=, 4
+	i32.and 	$2=, $0, $pop0
+	i32.const	$push1=, 8
+	i32.and 	$1=, $0, $pop1
+	i32.const	$3=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
 	block   	
 	loop    	                # label1:
+	i32.const	$push8=, 2
+	i32.shl 	$push2=, $3, $pop8
+	i32.const	$push7=, table
+	i32.add 	$push3=, $pop2, $pop7
+	i32.load	$4=, 0($pop3)
 	block   	
-	i32.const	$push12=, 2
-	i32.shl 	$push3=, $4, $pop12
-	i32.const	$push11=, table
-	i32.add 	$push4=, $pop3, $pop11
-	i32.load	$push10=, 0($pop4)
-	tee_local	$push9=, $0=, $pop10
-	i32.eqz 	$push17=, $pop9
-	br_if   	0, $pop17       # 0: down to label2
+	i32.eqz 	$push11=, $4
+	br_if   	0, $pop11       # 0: down to label2
 .LBB0_2:                                # %for.body6
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label3:
-	copy_local	$push14=, $0
-	tee_local	$push13=, $3=, $pop14
-	i32.load	$0=, 4($pop13)
+	copy_local	$0=, $4
+	i32.load	$4=, 4($0)
 	block   	
-	i32.load8_u	$push5=, 36($3)
-	i32.eqz 	$push18=, $pop5
-	br_if   	0, $pop18       # 0: down to label4
-# BB#3:                                 # %land.lhs.true
+	i32.load8_u	$push4=, 36($0)
+	i32.eqz 	$push12=, $pop4
+	br_if   	0, $pop12       # 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
+# %bb.4:                                # %lor.lhs.false
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.eqz 	$push19=, $2
-	br_if   	0, $pop19       # 0: down to label4
-# BB#5:                                 # %land.lhs.true10
+	i32.eqz 	$push13=, $2
+	br_if   	0, $pop13       # 0: down to label4
+# %bb.5:                                # %land.lhs.true10
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.load8_u	$push6=, 37($3)
-	br_if   	4, $pop6        # 4: down to label0
+	i32.load8_u	$push5=, 37($0)
+	br_if   	4, $pop5        # 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
+	br_if   	0, $4           # 0: up to label3
 .LBB0_7:                                # %for.inc15
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
 	end_block                       # label2:
-	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
+	i32.const	$push10=, 1
+	i32.add 	$3=, $3, $pop10
+	i32.const	$push9=, 31
+	i32.lt_u	$push6=, $3, $pop9
+	br_if   	0, $pop6        # 0: up to label1
+# %bb.8:                                # %for.end16
 	end_loop
 	return
 .LBB0_9:                                # %if.then
@@ -83,7 +79,7 @@ invalidate_memory:                      # @invalidate_memory
 cse_rtx_addr_varies_p:                  # @cse_rtx_addr_varies_p
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -96,7 +92,7 @@ cse_rtx_addr_varies_p:                  # @cse_rtx_addr_varies_p
 	.type	remove_from_table,@function
 remove_from_table:                      # @remove_from_table
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -110,47 +106,45 @@ remove_from_table:                      # @remove_from_table
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $3
 	i32.const	$push0=, 40
 	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
+	i64.const	$push31=, 0
+	i64.store	0($pop4), $pop31
 	i32.const	$push5=, 24
 	i32.add 	$push6=, $3, $pop5
-	i64.const	$push32=, 0
-	i64.store	0($pop6), $pop32
+	i64.const	$push30=, 0
+	i64.store	0($pop6), $pop30
 	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
+	i64.const	$push29=, 0
+	i64.store	0($pop8), $pop29
+	i64.const	$push28=, 0
+	i64.store	8($3), $pop28
 	i32.const	$1=, 0
-	i32.const	$push29=, 0
+	i32.const	$push27=, 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.store	table($pop27), $pop23
+	i32.const	$push26=, 1
+	i32.store8	44($3), $pop26
 	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:
+	copy_local	$2=, $pop25
+	block   	
+	block   	
+	br_if   	0, $2           # 0: down to label6
+# %bb.1:
 	i32.const	$4=, 4
 	br      	1               # 1: down to label5
 .LBB3_2:
@@ -171,83 +165,78 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	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                       # 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
+	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
                                         #   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	$push33=, 2
+	i32.shl 	$push13=, $1, $pop33
+	i32.const	$push32=, table
+	i32.add 	$push14=, $pop13, $pop32
+	i32.load	$2=, 0($pop14)
+	i32.eqz 	$push36=, $2
+	br_if   	8, $pop36       # 8: down to label10
+# %bb.5:                                #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$4=, 0
 	br      	11              # 11: up to label7
-.LBB3_8:                                # %for.body6.i
+.LBB3_6:                                # %for.body6.i
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label18:
 	i32.load	$0=, 4($2)
 	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.eqz 	$push37=, $pop9
+	br_if   	5, $pop37       # 5: down to label12
+# %bb.7:                                #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$4=, 1
 	br      	10              # 10: up to label7
-.LBB3_10:                               # %land.lhs.true10.i
+.LBB3_8:                                # %land.lhs.true10.i
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label17:
 	i32.load8_u	$push10=, 37($2)
 	br_if   	7, $pop10       # 7: down to label9
-# BB#11:                                #   in Loop: Header=BB3_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$4=, 3
 	br      	9               # 9: up to label7
-.LBB3_12:                               # %for.inc.i
+.LBB3_10:                               # %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
-	br      	3               # 3: down to label12
-.LBB3_13:                               # %invalidate_memory.exit
+# %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
 	end_block                       # label15:
+	i32.const	$push35=, 1
+	i32.add 	$1=, $1, $pop35
+	i32.const	$push34=, 30
+	i32.le_u	$push11=, $1, $pop34
+	br_if   	6, $pop11       # 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
+	end_block                       # label14:
 	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:
+.LBB3_15:                               # %if.then.i
+	end_block                       # label13:
 	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=, 4
+	i32.const	$4=, 3
 	br      	4               # 4: up to label7
 .LBB3_17:                               #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label11:
@@ -263,7 +252,7 @@ main:                                   # @main
 	br      	1               # 1: up to label7
 .LBB3_20:                               #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label8:
-	i32.const	$4=, 5
+	i32.const	$4=, 6
 	br      	0               # 0: up to label7
 .LBB3_21:
 	end_loop
@@ -279,5 +268,5 @@ table:
 	.size	table, 128
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20000818-1.c.s b/test/torture-s/20000818-1.c.s
index 29081034f..a76186360 100644
--- a/test/torture-s/20000818-1.c.s
+++ b/test/torture-s/20000818-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ main:                                   # @main
 	.type	yylex,@function
 yylex:                                  # @yylex
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,5 +37,5 @@ temporary_obstack:
 	.size	temporary_obstack, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20000819-1.c.s b/test/torture-s/20000819-1.c.s
index da5d55986..f499be3f5 100644
--- a/test/torture-s/20000819-1.c.s
+++ b/test/torture-s/20000819-1.c.s
@@ -6,16 +6,15 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push0=, 0
+	i32.sub 	$1=, $pop0, $1
 	block   	
 	block   	
-	i32.const	$push0=, 0
-	i32.sub 	$push10=, $pop0, $1
-	tee_local	$push9=, $1=, $pop10
 	i32.const	$push8=, 0
-	i32.gt_s	$push1=, $pop9, $pop8
+	i32.gt_s	$push1=, $1, $pop8
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push2=, 2
 	i32.shl 	$push3=, $1, $pop2
 	i32.add 	$1=, $0, $pop3
@@ -23,15 +22,14 @@ foo:                                    # @foo
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	i32.load	$push4=, 0($1)
-	i32.const	$push11=, 1
-	i32.le_s	$push5=, $pop4, $pop11
+	i32.const	$push9=, 1
+	i32.le_s	$push5=, $pop4, $pop9
 	br_if   	2, $pop5        # 2: down to label0
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push14=, 4
-	i32.add 	$push13=, $1, $pop14
-	tee_local	$push12=, $1=, $pop13
-	i32.le_u	$push6=, $pop12, $0
+	i32.const	$push10=, 4
+	i32.add 	$1=, $1, $pop10
+	i32.le_u	$push6=, $1, $0
 	br_if   	0, $pop6        # 0: up to label2
 .LBB0_4:                                # %for.end
 	end_loop
@@ -52,7 +50,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, a+4
 	i32.const	$push0=, 1
 	call    	foo@FUNCTION, $pop1, $pop0
@@ -73,6 +71,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9827741ba..765e776e9 100644
--- a/test/torture-s/20000910-1.c.s
+++ b/test/torture-s/20000910-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ main:                                   # @main
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -32,7 +32,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -44,11 +44,11 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB3_2:                                # %if.then
 	end_block                       # label0:
@@ -59,6 +59,6 @@ baz:                                    # @baz
 	.size	baz, .Lfunc_end3-baz
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 508daa06a..1f1f067bb 100644
--- a/test/torture-s/20000910-2.c.s
+++ b/test/torture-s/20000910-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push7=, 0
@@ -15,14 +15,14 @@ main:                                   # @main
 	i32.call	$push1=, strchr@FUNCTION, $pop0, $pop6
 	i32.eqz 	$push10=, $pop1
 	br_if   	0, $pop10       # 0: down to label1
-# BB#1:                                 # %if.then.i
+# %bb.1:                                # %if.then.i
 	i32.const	$push9=, 0
 	i32.load	$push2=, list+4($pop9)
 	i32.const	$push8=, 42
 	i32.call	$push3=, strchr@FUNCTION, $pop2, $pop8
 	i32.eqz 	$push11=, $pop3
 	br_if   	1, $pop11       # 1: down to label0
-# BB#2:                                 # %foo.exit
+# %bb.2:                                # %foo.exit
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_3:                                # %if.then2.i
@@ -60,7 +60,7 @@ list:
 	.size	list, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c94cbf138..56b21d216 100644
--- a/test/torture-s/20000914-1.c.s
+++ b/test/torture-s/20000914-1.c.s
@@ -7,7 +7,7 @@
 blah:                                   # @blah
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,13 +21,13 @@ blah:                                   # @blah
 convert_like_real:                      # @convert_like_real
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 8($0)
 	i32.const	$push1=, 222
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %sw.bb
+# %bb.1:                                # %sw.bb
 	return  	$0
 .LBB1_2:                                # %sw.epilog
 	end_block                       # label0:
@@ -44,12 +44,11 @@ convert_like_real:                      # @convert_like_real
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
-	i32.call	$push4=, malloc@FUNCTION, $pop0
-	tee_local	$push3=, $0=, $pop4
+	i32.call	$0=, malloc@FUNCTION, $pop0
 	i32.const	$push1=, 222
-	i32.store	8($pop3), $pop1
+	i32.store	8($0), $pop1
 	i32.call	$drop=, convert_like_real@FUNCTION, $0
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
@@ -59,7 +58,7 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0bc20e578..b28b3668d 100644
--- a/test/torture-s/20000917-1.c.s
+++ b/test/torture-s/20000917-1.c.s
@@ -6,7 +6,7 @@
 	.type	one,@function
 one:                                    # @one
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.store	8($0), $pop0
 	i64.const	$push1=, 4294967297
@@ -22,7 +22,7 @@ one:                                    # @one
 	.type	zero,@function
 zero:                                   # @zero
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	8($0), $pop0
 	i64.const	$push1=, 0
@@ -38,7 +38,7 @@ zero:                                   # @zero
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -47,5 +47,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001009-1.c.s b/test/torture-s/20001009-1.c.s
index f9c31b38e..cdc41819d 100644
--- a/test/torture-s/20001009-1.c.s
+++ b/test/torture-s/20001009-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,4 +32,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20001009-2.c.s b/test/torture-s/20001009-2.c.s
index 6d765403b..87fff919c 100644
--- a/test/torture-s/20001009-2.c.s
+++ b/test/torture-s/20001009-2.c.s
@@ -7,26 +7,25 @@
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, b($pop3)
-	i32.eqz 	$push9=, $pop0
-	br_if   	0, $pop9        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push7=, $pop0
+	br_if   	0, $pop7        # 0: down to label0
+# %bb.1:                                # %for.body.preheader
 	i32.const	$0=, 1
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	#APP
 	#NO_APP
-	i32.const	$push8=, 0
-	i32.const	$push7=, 0
-	i32.load	$push1=, b($pop7)
-	i32.const	$push6=, -1
-	i32.add 	$push5=, $pop1, $pop6
-	tee_local	$push4=, $1=, $pop5
-	i32.store	b($pop8), $pop4
+	i32.const	$push6=, 0
+	i32.load	$push1=, b($pop6)
+	i32.const	$push5=, -1
+	i32.add 	$1=, $pop1, $pop5
+	i32.const	$push4=, 0
+	i32.store	b($pop4), $1
 	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %if.end
 	end_loop
@@ -44,32 +43,31 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, b($pop2)
-	i32.eqz 	$push9=, $pop0
-	br_if   	0, $pop9        # 0: down to label2
-# BB#1:                                 # %for.body.i.preheader
+	i32.eqz 	$push7=, $pop0
+	br_if   	0, $pop7        # 0: down to label2
+# %bb.1:                                # %for.body.i.preheader
 	i32.const	$0=, 1
 .LBB1_2:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
 	#APP
 	#NO_APP
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push1=, b($pop6)
-	i32.const	$push5=, -1
-	i32.add 	$push4=, $pop1, $pop5
-	tee_local	$push3=, $1=, $pop4
-	i32.store	b($pop7), $pop3
+	i32.const	$push5=, 0
+	i32.load	$push1=, b($pop5)
+	i32.const	$push4=, -1
+	i32.add 	$1=, $pop1, $pop4
+	i32.const	$push3=, 0
+	i32.store	b($pop3), $1
 	br_if   	0, $1           # 0: up to label3
 .LBB1_3:                                # %foo.exit
 	end_loop
 	end_block                       # label2:
-	i32.const	$push8=, 0
-                                        # fallthrough-return: $pop8
+	i32.const	$push6=, 0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -84,4 +82,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20001011-1.c.s b/test/torture-s/20001011-1.c.s
index 46e013363..5632feca0 100644
--- a/test/torture-s/20001011-1.c.s
+++ b/test/torture-s/20001011-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, strcmp@FUNCTION, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,5 +35,5 @@ main:                                   # @main
 	.size	.L.str, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/20001013-1.c.s b/test/torture-s/20001013-1.c.s
index 810082bdd..8b050df19 100644
--- a/test/torture-s/20001013-1.c.s
+++ b/test/torture-s/20001013-1.c.s
@@ -7,13 +7,13 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 255
 	i32.and 	$push1=, $1, $pop0
 	i32.ne  	$push2=, $pop1, $1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push7=, 0($0)
 	i32.const	$push5=, 0
 	i32.load	$push4=, 4($0)
@@ -34,7 +34,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push6=, 0
 	i32.load	$push2=, z($pop6)
@@ -44,7 +44,7 @@ main:                                   # @main
 	i32.sub 	$push1=, $pop5, $pop0
 	i32.le_s	$push3=, $pop2, $pop1
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 0
 	call    	exit@FUNCTION, $pop7
 	unreachable
@@ -67,6 +67,6 @@ z:
 	.size	z, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 62c4ce71e..b26c0b0fa 100644
--- a/test/torture-s/20001017-1.c.s
+++ b/test/torture-s/20001017-1.c.s
@@ -6,11 +6,11 @@
 	.type	bug,@function
 bug:                                    # @bug
 	.param  	i32, i32, i32, i32, i32, f64, i32, i32, i32, i32, f64, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $11, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ bug:                                    # @bug
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,5 +34,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20001017-2.c.s b/test/torture-s/20001017-2.c.s
index 7cb94bf68..ba7cfd90c 100644
--- a/test/torture-s/20001017-2.c.s
+++ b/test/torture-s/20001017-2.c.s
@@ -6,23 +6,23 @@
 	.type	fn_4parms,@function
 fn_4parms:                              # @fn_4parms
 	.param  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($1)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 0($2)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push6=, 0($3)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -38,7 +38,7 @@ fn_4parms:                              # @fn_4parms
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %fn_4parms.exit
+# %bb.0:                                # %fn_4parms.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -46,5 +46,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20001024-1.c.s b/test/torture-s/20001024-1.c.s
index 989f348b7..f82d93009 100644
--- a/test/torture-s/20001024-1.c.s
+++ b/test/torture-s/20001024-1.c.s
@@ -7,26 +7,26 @@
 bar:                                    # @bar
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($1)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push1=, 4($1)
 	i32.const	$push2=, 250000
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push4=, 8($1)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false5
+# %bb.3:                                # %lor.lhs.false5
 	i32.const	$push5=, 12
 	i32.add 	$push6=, $1, $pop5
 	i32.load	$push7=, 0($pop6)
 	i32.const	$push8=, 250000
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return  	$1
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -41,7 +41,7 @@ bar:                                    # @bar
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %bar.exit
+# %bb.0:                                # %bar.exit
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -53,7 +53,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -62,6 +62,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 52d373288..0d4ab02d9 100644
--- a/test/torture-s/20001026-1.c.s
+++ b/test/torture-s/20001026-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20001027-1.c.s b/test/torture-s/20001027-1.c.s
index b8cda8a74..8fb233f92 100644
--- a/test/torture-s/20001027-1.c.s
+++ b/test/torture-s/20001027-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.const	$push0=, 1
 	i32.store	x($pop8), $pop0
@@ -20,7 +20,7 @@ main:                                   # @main
 	i32.const	$push5=, 2
 	i32.ne  	$push4=, $pop3, $pop5
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -51,6 +51,6 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 69e5e7ae2..b4e876662 100644
--- a/test/torture-s/20001031-1.c.s
+++ b/test/torture-s/20001031-1.c.s
@@ -6,12 +6,12 @@
 	.type	t1,@function
 t1:                                     # @t1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 4100
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ t1:                                     # @t1
 	.type	t2,@function
 t2:                                     # @t2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4096
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -40,12 +40,12 @@ t2:                                     # @t2
 	.type	t3,@function
 t3:                                     # @t3
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 2147487743
 	i64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label1:
@@ -61,7 +61,7 @@ t3:                                     # @t3
 	.type	t4,@function
 t4:                                     # @t4
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4096
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -74,7 +74,7 @@ t4:                                     # @t4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -83,6 +83,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001101.c.s b/test/torture-s/20001101.c.s
index d4610e8c5..4adad8f77 100644
--- a/test/torture-s/20001101.c.s
+++ b/test/torture-s/20001101.c.s
@@ -7,7 +7,7 @@
 dummy:                                  # @dummy
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.store	0($1), $pop0
 	i32.const	$push1=, 1
@@ -24,7 +24,7 @@ dummy:                                  # @dummy
 	.type	bogus,@function
 bogus:                                  # @bogus
 	.param  	i32, i32, i32
-# BB#0:                                 # %if.end5
+# %bb.0:                                # %if.end5
 	i32.load8_u	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.or  	$push2=, $pop0, $pop1
@@ -33,7 +33,7 @@ bogus:                                  # @bogus
 	i32.const	$push3=, 7
 	i32.ne  	$push4=, $1, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end8
+# %bb.1:                                # %if.end8
 	return
 .LBB1_2:                                # %if.then7
 	end_block                       # label0:
@@ -49,7 +49,7 @@ bogus:                                  # @bogus
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -58,6 +58,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3cc913cde..d6d1c5ba6 100644
--- a/test/torture-s/20001108-1.c.s
+++ b/test/torture-s/20001108-1.c.s
@@ -7,7 +7,7 @@
 signed_poly:                            # @signed_poly
 	.param  	i64, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 32
 	i64.shl 	$push1=, $0, $pop0
 	i64.const	$push6=, 32
@@ -27,7 +27,7 @@ signed_poly:                            # @signed_poly
 unsigned_poly:                          # @unsigned_poly
 	.param  	i64, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4294967295
 	i64.and 	$push1=, $0, $pop0
 	i64.extend_u/i32	$push2=, $1
@@ -44,7 +44,7 @@ unsigned_poly:                          # @unsigned_poly
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -53,5 +53,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001111-1.c.s b/test/torture-s/20001111-1.c.s
index 79ce24376..d0758a463 100644
--- a/test/torture-s/20001111-1.c.s
+++ b/test/torture-s/20001111-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 52783
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
@@ -24,7 +24,7 @@ foo:                                    # @foo
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -36,13 +36,13 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load8_u	$push0=, next_buffer($pop2)
 	i32.eqz 	$push5=, $pop0
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_2:                                # %if.end4
@@ -65,6 +65,6 @@ next_buffer:
 	.size	next_buffer, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7fc9cb5da..07508cb8c 100644
--- a/test/torture-s/20001112-1.c.s
+++ b/test/torture-s/20001112-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001121-1.c.s b/test/torture-s/20001121-1.c.s
index 56a5ee01b..49b633e0a 100644
--- a/test/torture-s/20001121-1.c.s
+++ b/test/torture-s/20001121-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	f64.load	$push1=, d($pop0)
                                         # fallthrough-return: $pop1
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,7 +33,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -51,5 +51,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001124-1.c.s b/test/torture-s/20001124-1.c.s
index 6bd6b6cc5..685848238 100644
--- a/test/torture-s/20001124-1.c.s
+++ b/test/torture-s/20001124-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 9
 	i32.store8	s+4($pop1), $pop0
@@ -34,21 +34,20 @@ main:                                   # @main
 	.type	do_isofs_readdir,@function # -- Begin function do_isofs_readdir
 do_isofs_readdir:                       # @do_isofs_readdir
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i64.load	$0=, f($pop7)
 	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
+	i64.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %cleanup
+# %bb.1:                                # %cleanup
 	return
 .LBB1_2:                                # %if.then12
 	end_block                       # label0:
-	i32.const	$push10=, 0
-	i32.load	$push2=, i+8($pop10)
+	i32.const	$push8=, 0
+	i32.load	$push2=, i+8($pop8)
 	i64.load8_u	$push3=, 4($pop2)
 	i64.shr_s	$push4=, $0, $pop3
 	i32.wrap/i64	$push5=, $pop4
@@ -62,10 +61,10 @@ do_isofs_readdir:                       # @do_isofs_readdir
 	.type	isofs_bread,@function   # -- Begin function isofs_bread
 isofs_bread:                            # @isofs_bread
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	br_if   	0, $0           # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -105,6 +104,6 @@ f:
 	.size	f, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 821cf79d3..832b649b5 100644
--- a/test/torture-s/20001130-1.c.s
+++ b/test/torture-s/20001130-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20001130-2.c.s b/test/torture-s/20001130-2.c.s
index e2f88b40c..57aadfa3d 100644
--- a/test/torture-s/20001130-2.c.s
+++ b/test/torture-s/20001130-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001203-1.c.s b/test/torture-s/20001203-1.c.s
index 10db8b704..988fc1023 100644
--- a/test/torture-s/20001203-1.c.s
+++ b/test/torture-s/20001203-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001203-2.c.s b/test/torture-s/20001203-2.c.s
index c6d17882f..09ae7c031 100644
--- a/test/torture-s/20001203-2.c.s
+++ b/test/torture-s/20001203-2.c.s
@@ -8,79 +8,68 @@ create_array_type:                      # @create_array_type
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.eqz 	$push51=, $0
-	br_if   	0, $pop51       # 0: down to label1
-# BB#1:                                 # %if.end
+	i32.eqz 	$push29=, $0
+	br_if   	0, $pop29       # 0: down to label1
+# %bb.1:                                # %if.end
 	i32.const	$push0=, 1
 	i32.store16	8($0), $pop0
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 3
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.store	0($0), $pop3
+	i32.load	$1=, 4($0)
 	block   	
-	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.eqz 	$push30=, $1
+	br_if   	0, $pop30       # 0: down to label2
+# %bb.2:                                # %cond.true
+	i32.const	$push27=, 16
+	i32.add 	$4=, $1, $pop27
+	i32.load	$3=, 0($4)
 	i32.const	$push4=, 20
 	i32.add 	$push5=, $1, $pop4
-	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.load	$2=, 0($pop5)
+	i32.sub 	$push6=, $2, $3
 	i32.const	$push7=, 15
 	i32.le_s	$push8=, $pop6, $pop7
 	br_if   	2, $pop8        # 2: down to label0
-# BB#3:                                 # %if.end9
-	i32.const	$push42=, 16
-	i32.add 	$push41=, $3, $pop42
-	tee_local	$push40=, $3=, $pop41
-	i32.store	0($4), $pop40
-	block   	
+# %bb.3:                                # %if.end9
+	i32.const	$push28=, 16
+	i32.add 	$3=, $3, $pop28
+	i32.store	0($4), $3
 	i32.const	$push9=, 12
-	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
+	i32.add 	$4=, $1, $pop9
+	i32.load	$6=, 0($4)
+	block   	
+	i32.ne  	$push10=, $3, $6
 	br_if   	0, $pop10       # 0: down to label3
-# BB#4:                                 # %if.then14
+# %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.end15
 	end_block                       # label3:
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $1, $pop24
 	i32.const	$push14=, 24
 	i32.add 	$push15=, $1, $pop14
-	i32.load	$push50=, 0($pop15)
-	tee_local	$push49=, $5=, $pop50
-	i32.add 	$push18=, $pop49, $3
+	i32.load	$5=, 0($pop15)
+	i32.add 	$push18=, $5, $3
 	i32.const	$push16=, -1
 	i32.xor 	$push17=, $5, $pop16
-	i32.and 	$push48=, $pop18, $pop17
-	tee_local	$push47=, $3=, $pop48
+	i32.and 	$3=, $pop18, $pop17
 	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.load	$5=, 0($pop20)
+	i32.sub 	$push21=, $3, $5
+	i32.sub 	$push22=, $2, $5
 	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.select	$2=, $2, $3, $pop23
+	i32.const	$push24=, 16
+	i32.add 	$push25=, $1, $pop24
+	i32.store	0($pop25), $2
+	i32.store	0($4), $2
 	i32.store	12($0), $6
 	return  	$0
 .LBB0_6:
@@ -106,7 +95,7 @@ create_array_type:                      # @create_array_type
 	.type	alloc_type,@function
 alloc_type:                             # @alloc_type
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -119,7 +108,7 @@ alloc_type:                             # @alloc_type
 	.type	get_discrete_bounds,@function
 get_discrete_bounds:                    # @get_discrete_bounds
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	0($0), $pop0
 	i64.const	$push1=, 2
@@ -135,7 +124,7 @@ get_discrete_bounds:                    # @get_discrete_bounds
 	.type	_obstack_newchunk,@function
 _obstack_newchunk:                      # @_obstack_newchunk
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -149,7 +138,7 @@ _obstack_newchunk:                      # @_obstack_newchunk
 xmalloc:                                # @xmalloc
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -162,7 +151,7 @@ xmalloc:                                # @xmalloc
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -171,6 +160,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end5-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 cf283cb09..48bbe6f53 100644
--- a/test/torture-s/20001221-1.c.s
+++ b/test/torture-s/20001221-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20001228-1.c.s b/test/torture-s/20001228-1.c.s
index 712307386..25052b7a4 100644
--- a/test/torture-s/20001228-1.c.s
+++ b/test/torture-s/20001228-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo1,@function
 foo1:                                   # @foo1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,14 +20,13 @@ foo1:                                   # @foo1
 foo2:                                   # @foo2
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push6=, $pop2, $pop4
-	tee_local	$push5=, $0=, $pop6
+	i32.sub 	$0=, $pop2, $pop4
 	i32.const	$push0=, 1
-	i32.store	12($pop5), $pop0
+	i32.store	12($0), $pop0
 	i32.load8_s	$push1=, 12($0)
                                         # fallthrough-return: $pop1
 	.endfunc
@@ -41,14 +40,13 @@ foo2:                                   # @foo2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop4, $pop6
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop7), $pop9
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push0=, 1
 	i32.store	12($0), $pop0
 	block   	
@@ -56,7 +54,7 @@ main:                                   # @main
 	i32.const	$push8=, 1
 	i32.ne  	$push2=, $pop1, $pop8
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	call    	exit@FUNCTION, $pop3
 	unreachable
@@ -69,6 +67,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 839aa660e..7c7e1472a 100644
--- a/test/torture-s/20001229-1.c.s
+++ b/test/torture-s/20001229-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -17,7 +17,7 @@ foo:                                    # @foo
 	.globl	showinfo
 	.type	showinfo,@function
 showinfo:                               # @showinfo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -29,7 +29,7 @@ showinfo:                               # @showinfo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -38,5 +38,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010106-1.c.s b/test/torture-s/20010106-1.c.s
index 3cc558c70..e30dea40a 100644
--- a/test/torture-s/20010106-1.c.s
+++ b/test/torture-s/20010106-1.c.s
@@ -7,17 +7,16 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push6=, 2
+	i32.add 	$0=, $0, $pop6
 	block   	
-	i32.const	$push8=, 2
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
 	i32.const	$push0=, 7
-	i32.ge_u	$push1=, $pop6, $pop0
+	i32.ge_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %switch.lookup
-	i32.const	$push9=, 2
-	i32.shl 	$push2=, $0, $pop9
+# %bb.1:                                # %switch.lookup
+	i32.const	$push7=, 2
+	i32.shl 	$push2=, $0, $pop7
 	i32.const	$push3=, .Lswitch.table.f
 	i32.add 	$push4=, $pop2, $pop3
 	i32.load	$push5=, 0($pop4)
@@ -36,7 +35,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -58,6 +57,6 @@ main:                                   # @main
 	.size	.Lswitch.table.f, 28
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 74d502720..f3b922427 100644
--- a/test/torture-s/20010114-1.c.s
+++ b/test/torture-s/20010114-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010116-1.c.s b/test/torture-s/20010116-1.c.s
index fd210a0b1..c1dc6a612 100644
--- a/test/torture-s/20010116-1.c.s
+++ b/test/torture-s/20010116-1.c.s
@@ -6,19 +6,18 @@
 	.type	find,@function
 find:                                   # @find
 	.param  	i32, i32
-# BB#0:                                 # %for.cond
+# %bb.0:                                # %for.cond
+	i32.sub 	$1=, $1, $0
 	block   	
-	i32.sub 	$push0=, $1, $0
-	i32.const	$push1=, 12
-	i32.div_s	$push2=, $pop0, $pop1
-	i32.const	$push3=, 2
-	i32.shr_s	$push7=, $pop2, $pop3
-	tee_local	$push6=, $1=, $pop7
-	i32.const	$push4=, 1
-	i32.lt_s	$push5=, $pop6, $pop4
-	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %for.body
-	call    	ok@FUNCTION, $1
+	i32.const	$push0=, 37
+	i32.lt_s	$push1=, $1, $pop0
+	br_if   	0, $pop1        # 0: down to label0
+# %bb.1:                                # %for.body
+	i32.const	$push2=, 12
+	i32.div_u	$push3=, $1, $pop2
+	i32.const	$push4=, 2
+	i32.shr_u	$push5=, $pop3, $pop4
+	call    	ok@FUNCTION, $pop5
 	unreachable
 .LBB0_2:                                # %for.end
 	end_block                       # label0:
@@ -34,12 +33,12 @@ find:                                   # @find
 	.type	ok,@function
 ok:                                     # @ok
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -57,7 +56,7 @@ ok:                                     # @ok
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	call    	ok@FUNCTION, $pop0
 	unreachable
@@ -66,6 +65,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5c6d74d98..657f9c548 100644
--- a/test/torture-s/20010118-1.c.s
+++ b/test/torture-s/20010118-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,13 +18,14 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	f64
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.ne  	$push1=, $pop0, $1
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push2=, 4
 	i32.add 	$push3=, $0, $pop2
 	i32.load	$push4=, 0($pop3)
@@ -36,25 +37,51 @@ bar:                                    # @bar
 	i32.store	12($0), $4
 	i32.load	$push6=, 16($0)
 	f64.convert_s/i32	$push7=, $pop6
-	f64.const	$push8=, 0x0p0
-	f64.mul 	$push9=, $pop7, $pop8
-	f64.const	$push10=, 0x1p-1
-	f64.mul 	$push11=, $pop9, $pop10
-	i32.trunc_s/f64	$push12=, $pop11
-	i32.add 	$push13=, $pop12, $1
-	i32.store	0($0), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.load	$push16=, 20($0)
-	f64.convert_s/i32	$push17=, $pop16
-	f64.const	$push23=, 0x0p0
-	f64.mul 	$push18=, $pop17, $pop23
-	f64.const	$push22=, 0x1p-1
-	f64.mul 	$push19=, $pop18, $pop22
-	i32.trunc_s/f64	$push20=, $pop19
-	i32.add 	$push21=, $pop20, $2
-	i32.store	0($pop15), $pop21
-.LBB1_3:                                # %if.end
+	f64.const	$push22=, 0x0p0
+	f64.mul 	$push8=, $pop7, $pop22
+	f64.const	$push21=, 0x1p-1
+	f64.mul 	$5=, $pop8, $pop21
+	block   	
+	block   	
+	f64.abs 	$push15=, $5
+	f64.const	$push16=, 0x1p31
+	f64.lt  	$push17=, $pop15, $pop16
+	br_if   	0, $pop17       # 0: down to label3
+# %bb.3:                                # %if.then
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label2
+.LBB1_4:                                # %if.then
+	end_block                       # label3:
+	i32.trunc_s/f64	$3=, $5
+.LBB1_5:                                # %if.then
+	end_block                       # label2:
+	i32.add 	$push9=, $3, $1
+	i32.store	0($0), $pop9
+	i32.const	$push10=, 4
+	i32.add 	$1=, $0, $pop10
+	i32.load	$push11=, 20($0)
+	f64.convert_s/i32	$push12=, $pop11
+	f64.const	$push24=, 0x0p0
+	f64.mul 	$push13=, $pop12, $pop24
+	f64.const	$push23=, 0x1p-1
+	f64.mul 	$5=, $pop13, $pop23
+	block   	
+	block   	
+	f64.abs 	$push18=, $5
+	f64.const	$push19=, 0x1p31
+	f64.lt  	$push20=, $pop18, $pop19
+	br_if   	0, $pop20       # 0: down to label5
+# %bb.6:                                # %if.then
+	i32.const	$0=, -2147483648
+	br      	1               # 1: down to label4
+.LBB1_7:                                # %if.then
+	end_block                       # label5:
+	i32.trunc_s/f64	$0=, $5
+.LBB1_8:                                # %if.then
+	end_block                       # label4:
+	i32.add 	$push14=, $0, $2
+	i32.store	0($1), $pop14
+.LBB1_9:                                # %if.end
 	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
@@ -67,7 +94,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -76,5 +103,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010119-1.c.s b/test/torture-s/20010119-1.c.s
index 945268cd8..760147242 100644
--- a/test/torture-s/20010119-1.c.s
+++ b/test/torture-s/20010119-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -30,7 +30,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010123-1.c.s b/test/torture-s/20010123-1.c.s
index 96e7b7548..fd77cf29f 100644
--- a/test/torture-s/20010123-1.c.s
+++ b/test/torture-s/20010123-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010129-1.c.s b/test/torture-s/20010129-1.c.s
index ba1dd8f74..779f29afc 100644
--- a/test/torture-s/20010129-1.c.s
+++ b/test/torture-s/20010129-1.c.s
@@ -8,16 +8,15 @@ baz1:                                   # @baz1
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load	$push4=, baz1.l($pop5)
-	tee_local	$push3=, $1=, $pop4
+	i32.load	$1=, baz1.l($pop0)
+	i32.const	$push3=, 0
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop3, $pop1
-	i32.store	baz1.l($pop0), $pop2
-	copy_local	$push6=, $1
-                                        # fallthrough-return: $pop6
+	i32.add 	$push2=, $1, $pop1
+	i32.store	baz1.l($pop3), $pop2
+	copy_local	$push4=, $1
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	baz1, .Lfunc_end0-baz1
@@ -29,7 +28,7 @@ baz1:                                   # @baz1
 baz2:                                   # @baz2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -43,11 +42,11 @@ baz2:                                   # @baz2
 baz3:                                   # @baz3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push1=, $0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, 1
 	return  	$pop0
 .LBB2_2:                                # %if.then
@@ -66,45 +65,43 @@ foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push28=, 0
-	i32.const	$push27=, 0
-	i32.load	$push26=, baz1.l($pop27)
-	tee_local	$push25=, $11=, $pop26
+# %bb.0:                                # %entry
+	i32.const	$push26=, 0
+	i32.load	$11=, baz1.l($pop26)
+	i32.const	$push25=, 0
 	i32.const	$push24=, 1
-	i32.add 	$push3=, $pop25, $pop24
-	i32.store	baz1.l($pop28), $pop3
+	i32.add 	$push3=, $11, $pop24
+	i32.store	baz1.l($pop25), $pop3
 	block   	
 	block   	
 	i32.ge_s	$push4=, $11, $1
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %if.then.lr.ph
-	i32.const	$push5=, 13834
-	i32.and 	$push6=, $2, $pop5
-	i32.const	$push35=, 0
-	i32.ne  	$push7=, $pop6, $pop35
+# %bb.1:                                # %if.then.lr.ph
 	i32.const	$push8=, 128
 	i32.and 	$push9=, $2, $pop8
 	i32.eqz 	$push10=, $pop9
-	i32.const	$push34=, 0
-	i32.load	$push11=, bar($pop34)
+	i32.const	$push31=, 0
+	i32.load	$push11=, bar($pop31)
 	i32.eqz 	$push12=, $pop11
-	i32.or  	$push33=, $pop10, $pop12
-	tee_local	$push32=, $4=, $pop33
-	i32.or  	$5=, $pop7, $pop32
+	i32.or  	$4=, $pop10, $pop12
+	i32.const	$push5=, 13834
+	i32.and 	$push6=, $2, $pop5
+	i32.const	$push30=, 0
+	i32.ne  	$push7=, $pop6, $pop30
+	i32.or  	$5=, $pop7, $4
 	i32.const	$push15=, 16
 	i32.and 	$3=, $2, $pop15
-	i32.const	$push31=, 2
-	i32.and 	$push1=, $2, $pop31
-	i32.const	$push30=, 0
-	i32.ne  	$8=, $pop1, $pop30
+	i32.const	$push29=, 2
+	i32.and 	$push1=, $2, $pop29
+	i32.const	$push28=, 0
+	i32.ne  	$8=, $pop1, $pop28
 	i32.const	$push14=, 16384
 	i32.and 	$push0=, $2, $pop14
 	i32.eqz 	$9=, $pop0
 	i32.const	$push13=, 13832
 	i32.and 	$push2=, $2, $pop13
-	i32.const	$push29=, 0
-	i32.ne  	$10=, $pop2, $pop29
+	i32.const	$push27=, 0
+	i32.ne  	$10=, $pop2, $pop27
 	i32.const	$2=, 0
 .LBB3_2:                                # %if.then
                                         # =>This Inner Loop Header: Depth=1
@@ -113,14 +110,14 @@ foo:                                    # @foo
 	block   	
 	block   	
 	i32.or  	$push16=, $2, $3
-	i32.eqz 	$push44=, $pop16
-	br_if   	0, $pop44       # 0: down to label6
-# BB#3:                                 # %if.end17
+	i32.eqz 	$push38=, $pop16
+	br_if   	0, $pop38       # 0: down to label6
+# %bb.3:                                # %if.end17
                                         #   in Loop: Header=BB3_2 Depth=1
-	i32.const	$push36=, 1
-	i32.select	$6=, $2, $pop36, $2
+	i32.const	$push32=, 1
+	i32.select	$6=, $2, $pop32, $2
 	br_if   	1, $3           # 1: down to label5
-# BB#4:                                 # %land.lhs.true25
+# %bb.4:                                # %land.lhs.true25
                                         #   in Loop: Header=BB3_2 Depth=1
 	copy_local	$2=, $6
 	br_if   	2, $5           # 2: down to label4
@@ -134,31 +131,30 @@ foo:                                    # @foo
 	end_block                       # label5:
 	i32.eqz 	$7=, $2
 	copy_local	$2=, $6
-	i32.const	$push37=, 1
-	i32.xor 	$push17=, $7, $pop37
+	i32.const	$push33=, 1
+	i32.xor 	$push17=, $7, $pop33
 	i32.or  	$push18=, $9, $pop17
 	i32.and 	$push19=, $8, $pop18
 	i32.or  	$push20=, $10, $pop19
 	i32.or  	$push21=, $4, $pop20
-	i32.eqz 	$push45=, $pop21
-	br_if   	3, $pop45       # 3: down to label1
+	i32.eqz 	$push39=, $pop21
+	br_if   	3, $pop39       # 3: down to label1
 .LBB3_7:                                # %while.cond.backedge
                                         #   in Loop: Header=BB3_2 Depth=1
 	end_block                       # label4:
-	i32.const	$push42=, 0
-	i32.const	$push41=, 2
-	i32.add 	$push22=, $11, $pop41
-	i32.store	baz1.l($pop42), $pop22
-	i32.const	$push40=, 1
-	i32.add 	$push39=, $11, $pop40
-	tee_local	$push38=, $11=, $pop39
-	i32.lt_s	$push23=, $pop38, $1
+	i32.const	$push36=, 0
+	i32.const	$push35=, 2
+	i32.add 	$push22=, $11, $pop35
+	i32.store	baz1.l($pop36), $pop22
+	i32.const	$push34=, 1
+	i32.add 	$11=, $11, $pop34
+	i32.lt_s	$push23=, $11, $1
 	br_if   	0, $pop23       # 0: up to label3
 .LBB3_8:                                # %while.end
 	end_loop
 	end_block                       # label2:
-	i32.const	$push43=, 0
-	return  	$pop43
+	i32.const	$push37=, 0
+	return  	$pop37
 .LBB3_9:                                # %for.body
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -174,14 +170,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push12=, $pop3, $pop5
-	tee_local	$push11=, $0=, $pop12
-	i32.store	__stack_pointer($pop6), $pop11
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push0=, 0
 	i32.const	$push7=, 12
 	i32.add 	$push8=, $0, $pop7
@@ -215,6 +210,6 @@ bar:
 	.size	bar, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c6760a744..9f68f101b 100644
--- a/test/torture-s/20010206-1.c.s
+++ b/test/torture-s/20010206-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 26
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010221-1.c.s b/test/torture-s/20010221-1.c.s
index 85f6e2cca..af69bf4d6 100644
--- a/test/torture-s/20010221-1.c.s
+++ b/test/torture-s/20010221-1.c.s
@@ -7,32 +7,30 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
+	i32.const	$push6=, 0
+	i32.load	$0=, n($pop6)
 	block   	
-	i32.const	$push8=, 0
-	i32.load	$push7=, n($pop8)
-	tee_local	$push6=, $0=, $pop7
 	i32.const	$push5=, 1
-	i32.lt_s	$push0=, $pop6, $pop5
+	i32.lt_s	$push0=, $0, $pop5
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$1=, 45
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.select	$1=, $2, $1, $2
-	i32.const	$push11=, 1
-	i32.add 	$push10=, $2, $pop11
-	tee_local	$push9=, $2=, $pop10
-	i32.lt_s	$push1=, $pop9, $0
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
+	i32.lt_s	$push1=, $2, $0
 	br_if   	0, $pop1        # 0: up to label1
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#4:                                 # %if.end5
+# %bb.4:                                # %if.end5
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -54,6 +52,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c3dd64d35..f11759dc6 100644
--- a/test/torture-s/20010222-1.c.s
+++ b/test/torture-s/20010222-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push10=, 0
 	i32.load	$push1=, a+4($pop10)
@@ -20,7 +20,7 @@ main:                                   # @main
 	i32.const	$push7=, 12
 	i32.lt_u	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -43,6 +43,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 45b303ef9..8f9c365f6 100644
--- a/test/torture-s/20010224-1.c.s
+++ b/test/torture-s/20010224-1.c.s
@@ -6,52 +6,48 @@
 	.type	ba_compute_psd,@function
 ba_compute_psd:                         # @ba_compute_psd
 	.param  	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push22=, 1
-	i32.shl 	$push21=, $0, $pop22
-	tee_local	$push20=, $2=, $pop21
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push16=, 1
+	i32.shl 	$2=, $0, $pop16
 	i32.const	$push1=, masktab
-	i32.add 	$push2=, $pop20, $pop1
+	i32.add 	$push2=, $2, $pop1
 	i32.load16_s	$push3=, 0($pop2)
-	i32.const	$push19=, 1
-	i32.shl 	$push4=, $pop3, $pop19
+	i32.const	$push15=, 1
+	i32.shl 	$push4=, $pop3, $pop15
 	i32.const	$push5=, bndpsd
-	i32.add 	$push18=, $pop4, $pop5
-	tee_local	$push17=, $1=, $pop18
+	i32.add 	$1=, $pop4, $pop5
 	i32.const	$push6=, psd
 	i32.add 	$push7=, $2, $pop6
-	i32.load16_u	$push16=, 0($pop7)
-	tee_local	$push15=, $4=, $pop16
-	i32.store16	0($pop17), $pop15
+	i32.load16_u	$3=, 0($pop7)
+	i32.store16	0($1), $3
 	block   	
 	i32.const	$push14=, 2
 	i32.gt_s	$push8=, $0, $pop14
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push9=, -1
-	i32.add 	$3=, $0, $pop9
+	i32.add 	$0=, $0, $pop9
 	i32.const	$push10=, psd+2
-	i32.add 	$0=, $2, $pop10
+	i32.add 	$2=, $2, $pop10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	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	$push26=, 1
-	i32.add 	$push25=, $3, $pop26
-	tee_local	$push24=, $3=, $pop25
-	i32.const	$push23=, 2
-	i32.lt_s	$push13=, $pop24, $pop23
+	i32.load16_u	$push12=, 0($2)
+	i32.const	$push20=, 65535
+	i32.and 	$push11=, $3, $pop20
+	i32.add 	$3=, $pop12, $pop11
+	i32.const	$push19=, 1
+	i32.add 	$0=, $0, $pop19
+	i32.const	$push18=, 2
+	i32.add 	$push0=, $2, $pop18
+	copy_local	$2=, $pop0
+	i32.const	$push17=, 2
+	i32.lt_s	$push13=, $0, $pop17
 	br_if   	0, $pop13       # 0: up to label1
-# BB#3:                                 # %for.cond.for.end_crit_edge
+# %bb.3:                                # %for.cond.for.end_crit_edge
 	end_loop
-	i32.store16	0($1), $4
+	i32.store16	0($1), $3
 .LBB0_4:                                # %for.end
 	end_block                       # label0:
                                         # fallthrough-return
@@ -66,7 +62,7 @@ ba_compute_psd:                         # @ba_compute_psd
 logadd:                                 # @logadd
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$push1=, 0($1)
 	i32.load16_u	$push0=, 0($0)
 	i32.add 	$push2=, $pop1, $pop0
@@ -85,7 +81,7 @@ logadd:                                 # @logadd
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push20=, 0
 	i32.load16_s	$push0=, masktab($pop20)
 	i32.const	$push1=, 1
@@ -110,7 +106,7 @@ main:                                   # @main
 	i32.const	$push13=, 140
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push21=, 0
 	return  	$pop21
 .LBB2_2:                                # %if.then
@@ -164,5 +160,5 @@ bndpsd:
 	.size	bndpsd, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20010325-1.c.s b/test/torture-s/20010325-1.c.s
index b5362c476..5aa957c11 100644
--- a/test/torture-s/20010325-1.c.s
+++ b/test/torture-s/20010325-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010329-1.c.s b/test/torture-s/20010329-1.c.s
index c31299427..4fb0b2a61 100644
--- a/test/torture-s/20010329-1.c.s
+++ b/test/torture-s/20010329-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010403-1.c.s b/test/torture-s/20010403-1.c.s
index c745ff759..a7d994ad1 100644
--- a/test/torture-s/20010403-1.c.s
+++ b/test/torture-s/20010403-1.c.s
@@ -6,7 +6,7 @@
 	.type	a,@function
 a:                                      # @a
 	.param  	i32, i32
-# BB#0:                                 # %c.exit
+# %bb.0:                                # %c.exit
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ a:                                      # @a
 	.type	b,@function
 b:                                      # @b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $pop0, $pop1
@@ -34,11 +34,11 @@ b:                                      # @b
 	.type	c,@function
 c:                                      # @c
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eq  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
@@ -54,7 +54,7 @@ c:                                      # @c
 	.type	d,@function
 d:                                      # @d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -66,7 +66,7 @@ d:                                      # @d
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -84,6 +84,6 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 affee1d16..81efd4d93 100644
--- a/test/torture-s/20010409-1.c.s
+++ b/test/torture-s/20010409-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 25
 	i32.mul 	$push1=, $2, $pop0
@@ -25,10 +25,10 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	br_if   	0, $1           # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -47,7 +47,7 @@ bar:                                    # @bar
 test:                                   # @test
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 5000
 	i32.store	c($pop1), $pop0
@@ -69,7 +69,7 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, a
 	i32.store	d($pop1), $pop0
@@ -127,6 +127,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b7bbfd5a4..499fd436b 100644
--- a/test/torture-s/20010422-1.c.s
+++ b/test/torture-s/20010422-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 4
 	i32.const	$push2=, 8
 	i32.const	$push0=, 5
@@ -24,7 +24,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010518-1.c.s b/test/torture-s/20010518-1.c.s
index c18250eda..87b2e4775 100644
--- a/test/torture-s/20010518-1.c.s
+++ b/test/torture-s/20010518-1.c.s
@@ -7,7 +7,7 @@
 add:                                    # @add
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $1, $0
 	i32.add 	$push1=, $pop0, $2
 	i32.add 	$push2=, $pop1, $3
@@ -31,7 +31,7 @@ add:                                    # @add
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -40,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010518-2.c.s b/test/torture-s/20010518-2.c.s
index c967a2769..28b269a52 100644
--- a/test/torture-s/20010518-2.c.s
+++ b/test/torture-s/20010518-2.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push29=, 0
+# %bb.0:                                # %entry
 	i32.const	$push27=, 0
 	i32.load	$push26=, __stack_pointer($pop27)
 	i32.const	$push28=, 48
-	i32.sub 	$push35=, $pop26, $pop28
-	tee_local	$push34=, $0=, $pop35
-	i32.store	__stack_pointer($pop29), $pop34
+	i32.sub 	$0=, $pop26, $pop28
+	i32.const	$push29=, 0
+	i32.store	__stack_pointer($pop29), $0
 	i32.const	$push33=, 2
 	i32.store	24($0), $pop33
 	i32.const	$push0=, 1
@@ -50,27 +49,27 @@ main:                                   # @main
 	i32.const	$push30=, 1
 	i32.ne  	$push13=, $pop12, $pop30
 	br_if   	0, $pop13       # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push14=, 40($0)
-	i32.const	$push36=, 2
-	i32.ne  	$push15=, $pop14, $pop36
+	i32.const	$push34=, 2
+	i32.ne  	$push15=, $pop14, $pop34
 	br_if   	0, $pop15       # 0: down to label0
-# BB#2:                                 # %lor.lhs.false9
+# %bb.2:                                # %lor.lhs.false9
 	i32.load16_u	$push17=, 38($0)
 	i32.const	$push16=, 3
 	i32.ne  	$push18=, $pop17, $pop16
 	br_if   	0, $pop18       # 0: down to label0
-# BB#3:                                 # %lor.lhs.false14
+# %bb.3:                                # %lor.lhs.false14
 	i32.load16_u	$push20=, 36($0)
 	i32.const	$push19=, 4
 	i32.ne  	$push21=, $pop20, $pop19
 	br_if   	0, $pop21       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false19
+# %bb.4:                                # %lor.lhs.false19
 	i32.load8_u	$push23=, 31($0)
 	i32.const	$push22=, 99
 	i32.ne  	$push24=, $pop23, $pop22
 	br_if   	0, $pop24       # 0: down to label0
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	i32.const	$push25=, 0
 	call    	exit@FUNCTION, $pop25
 	unreachable
@@ -83,6 +82,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6a2dc61ed..ec249233d 100644
--- a/test/torture-s/20010520-1.c.s
+++ b/test/torture-s/20010520-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010604-1.c.s b/test/torture-s/20010604-1.c.s
index 14c074356..25cd8b307 100644
--- a/test/torture-s/20010604-1.c.s
+++ b/test/torture-s/20010604-1.c.s
@@ -7,21 +7,21 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $6, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.eqz 	$push4=, $3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.eqz 	$push5=, $4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.eqz 	$push6=, $5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.add 	$push2=, $1, $0
 	i32.add 	$push3=, $pop2, $2
 	return  	$pop3
@@ -39,7 +39,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -48,6 +48,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 57a48c912..93ccccecc 100644
--- a/test/torture-s/20010605-2.c.s
+++ b/test/torture-s/20010605-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %baz.exit
+# %bb.0:                                # %baz.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,18 +20,18 @@ main:                                   # @main
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.load	$push0=, 0($0)
 	f64.const	$push1=, 0x1p0
 	f64.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	f64.load	$push3=, 8($0)
 	f64.const	$push4=, 0x1p1
 	f64.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB1_3:                                # %if.then
 	end_block                       # label0:
@@ -47,18 +47,18 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.load	$push0=, 0($0)
 	f32.const	$push1=, 0x1.8p1
 	f32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	f32.load	$push3=, 4($0)
 	f32.const	$push4=, 0x1p2
 	f32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB2_3:                                # %if.then
 	end_block                       # label1:
@@ -74,7 +74,7 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.load	$push3=, 0($0)
 	i32.const	$push0=, 8
@@ -84,7 +84,7 @@ baz:                                    # @baz
 	i64.const	$push4=, 4612037862148276224
 	i32.call	$push5=, __netf2@FUNCTION, $pop3, $pop2, $pop12, $pop4
 	br_if   	0, $pop5        # 0: down to label2
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i64.load	$push9=, 16($0)
 	i32.const	$push6=, 24
 	i32.add 	$push7=, $0, $pop6
@@ -93,7 +93,7 @@ baz:                                    # @baz
 	i64.const	$push10=, 4612108230892453888
 	i32.call	$push11=, __eqtf2@FUNCTION, $pop9, $pop8, $pop13, $pop10
 	br_if   	0, $pop11       # 0: down to label2
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB3_3:                                # %if.then
 	end_block                       # label2:
@@ -104,6 +104,6 @@ baz:                                    # @baz
 	.size	baz, .Lfunc_end3-baz
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ecd032be8..3b02944e1 100644
--- a/test/torture-s/20010711-1.c.s
+++ b/test/torture-s/20010711-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -27,5 +27,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010717-1.c.s b/test/torture-s/20010717-1.c.s
index 881f9eb93..7acc28993 100644
--- a/test/torture-s/20010717-1.c.s
+++ b/test/torture-s/20010717-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20010723-1.c.s b/test/torture-s/20010723-1.c.s
index 051500deb..3bafdcf5b 100644
--- a/test/torture-s/20010723-1.c.s
+++ b/test/torture-s/20010723-1.c.s
@@ -6,7 +6,7 @@
 	.type	test,@function
 test:                                   # @test
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010904-1.c.s b/test/torture-s/20010904-1.c.s
index 64552ff79..d8c2cab91 100644
--- a/test/torture-s/20010904-1.c.s
+++ b/test/torture-s/20010904-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -24,5 +24,5 @@ y:
 	.size	y, 2112
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010904-2.c.s b/test/torture-s/20010904-2.c.s
index 93e1a211f..528ae5500 100644
--- a/test/torture-s/20010904-2.c.s
+++ b/test/torture-s/20010904-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -24,5 +24,5 @@ y:
 	.size	y, 2112
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20010910-1.c.s b/test/torture-s/20010910-1.c.s
index 969c8868b..80445c066 100644
--- a/test/torture-s/20010910-1.c.s
+++ b/test/torture-s/20010910-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond3.4
+# %bb.0:                                # %for.cond3.4
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20010915-1.c.s b/test/torture-s/20010915-1.c.s
index 22a9eb038..5ac7bcbd4 100644
--- a/test/torture-s/20010915-1.c.s
+++ b/test/torture-s/20010915-1.c.s
@@ -8,14 +8,13 @@ main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 32
-	i32.sub 	$push21=, $pop11, $pop13
-	tee_local	$push20=, $2=, $pop21
-	i32.store	__stack_pointer($pop14), $pop20
+	i32.sub 	$2=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $2
 	i32.const	$push2=, 16
 	i32.add 	$push3=, $2, $pop2
 	i32.const	$push19=, 0
@@ -35,13 +34,13 @@ main:                                   # @main
 	i32.const	$push7=, 2
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push23=, 0
-	i32.load	$push0=, o($pop23)
-	i32.const	$push22=, 5
-	i32.ne  	$push9=, $pop0, $pop22
+# %bb.1:                                # %entry
+	i32.const	$push21=, 0
+	i32.load	$push0=, o($pop21)
+	i32.const	$push20=, 5
+	i32.ne  	$push9=, $pop0, $pop20
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push10=, 0
 	call    	exit@FUNCTION, $pop10
 	unreachable
@@ -61,124 +60,115 @@ x:                                      # @x
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 3
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 0
-	i32.load	$push32=, o($pop2)
-	tee_local	$push31=, $4=, $pop32
-	i32.ge_s	$push3=, $pop31, $0
+	i32.load	$3=, o($pop2)
+	i32.ge_s	$push3=, $3, $0
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %land.lhs.true2
+# %bb.2:                                # %land.lhs.true2
 	i32.const	$push4=, 2
-	i32.shl 	$push5=, $4, $pop4
-	i32.add 	$push36=, $1, $pop5
-	tee_local	$push35=, $2=, $pop36
-	i32.load	$push34=, 0($pop35)
-	tee_local	$push33=, $5=, $pop34
-	i32.eqz 	$push69=, $pop33
-	br_if   	0, $pop69       # 0: down to label1
-# BB#3:                                 # %if.then
+	i32.shl 	$push5=, $3, $pop4
+	i32.add 	$2=, $1, $pop5
+	i32.load	$5=, 0($2)
+	i32.eqz 	$push51=, $5
+	br_if   	0, $pop51       # 0: down to label1
+# %bb.3:                                # %if.then
 	i32.const	$push6=, .L.str
 	i32.call	$push7=, strcmp@FUNCTION, $5, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#4:                                 # %lor.lhs.false.i
+# %bb.4:                                # %lor.lhs.false.i
 	i32.const	$push8=, 0
-	i32.const	$push39=, 0
-	i32.load	$push38=, check($pop39)
-	tee_local	$push37=, $3=, $pop38
+	i32.load	$4=, check($pop8)
+	i32.const	$push31=, 0
 	i32.const	$push9=, 1
-	i32.add 	$push10=, $pop37, $pop9
-	i32.store	check($pop8), $pop10
+	i32.add 	$push10=, $4, $pop9
+	i32.store	check($pop31), $pop10
 	i32.const	$push11=, 2
-	i32.ge_s	$push12=, $3, $pop11
+	i32.ge_s	$push12=, $4, $pop11
 	br_if   	0, $pop12       # 0: down to label1
-# BB#5:                                 # %s.exit
+# %bb.5:                                # %s.exit
 	i32.const	$push13=, .L.str
 	i32.call	$push14=, strcmp@FUNCTION, $5, $pop13
 	br_if   	0, $pop14       # 0: down to label1
-# BB#6:                                 # %lor.lhs.false.i45
-	i32.const	$push41=, 0
+# %bb.6:                                # %lor.lhs.false.i45
+	i32.const	$push33=, 0
 	i32.const	$push15=, 2
-	i32.add 	$push16=, $3, $pop15
-	i32.store	check($pop41), $pop16
-	i32.const	$push40=, 1
-	i32.ge_s	$push17=, $3, $pop40
+	i32.add 	$push16=, $4, $pop15
+	i32.store	check($pop33), $pop16
+	i32.const	$push32=, 1
+	i32.ge_s	$push17=, $4, $pop32
 	br_if   	0, $pop17       # 0: down to label1
-# BB#7:                                 # %s.exit48
-	i32.const	$push44=, 0
-	i32.const	$push43=, 0
-	i32.store	u($pop44), $pop43
+# %bb.7:                                # %s.exit48
+	i32.const	$push36=, 0
+	i32.const	$push35=, 0
+	i32.store	u($pop36), $pop35
 	i32.load	$push19=, 0($2)
-	i32.const	$push42=, 1
-	i32.add 	$push18=, $5, $pop42
+	i32.const	$push34=, 1
+	i32.add 	$push18=, $5, $pop34
 	i32.eq  	$push20=, $pop19, $pop18
 	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
+# %bb.8:                                # %if.end19
+	i32.const	$push38=, 1
+	i32.add 	$5=, $3, $pop38
+	i32.const	$push37=, 0
+	i32.store	o($pop37), $5
 	block   	
 	i32.ge_s	$push21=, $5, $0
 	br_if   	0, $pop21       # 0: down to label2
-# BB#9:                                 # %while.body.lr.ph
+# %bb.9:                                # %while.body.lr.ph
 	i32.const	$push22=, 2
 	i32.shl 	$push23=, $5, $pop22
 	i32.add 	$3=, $1, $pop23
-	i32.const	$push49=, 0
-	i32.load8_u	$4=, r.c.0($pop49)
+	i32.const	$push39=, 0
+	i32.load8_u	$4=, r.c.0($pop39)
 .LBB1_10:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	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.load	$2=, 0($3)
+	i32.load8_u	$push25=, 0($2)
+	i32.const	$push40=, 255
+	i32.and 	$push24=, $4, $pop40
 	i32.ne  	$push26=, $pop25, $pop24
 	br_if   	2, $pop26       # 2: down to label1
-# BB#11:                                # %lor.lhs.false.i50
+# %bb.11:                               # %lor.lhs.false.i50
                                         #   in Loop: Header=BB1_10 Depth=1
-	i32.load8_u	$push27=, 1($1)
+	i32.load8_u	$push27=, 1($2)
 	br_if   	2, $pop27       # 2: down to label1
-# BB#12:                                # %lor.lhs.false.i50
+# %bb.12:                               # %lor.lhs.false.i50
                                         #   in Loop: Header=BB1_10 Depth=1
-	i32.const	$push56=, 0
-	i32.load	$push55=, r.cnt($pop56)
-	tee_local	$push54=, $1=, $pop55
-	i32.const	$push53=, 4
-	i32.ge_s	$push28=, $pop54, $pop53
+	i32.const	$push42=, 0
+	i32.load	$2=, r.cnt($pop42)
+	i32.const	$push41=, 4
+	i32.ge_s	$push28=, $2, $pop41
 	br_if   	2, $pop28       # 2: down to label1
-# BB#13:                                # %r.exit
+# %bb.13:                               # %r.exit
                                         #   in Loop: Header=BB1_10 Depth=1
-	i32.const	$push67=, 0
-	i32.const	$push66=, 1
-	i32.add 	$push29=, $1, $pop66
-	i32.store	r.cnt($pop67), $pop29
-	i32.const	$push65=, 0
-	i32.const	$push64=, 1
-	i32.add 	$push63=, $4, $pop64
-	tee_local	$push62=, $4=, $pop63
-	i32.store8	r.c.0($pop65), $pop62
-	i32.const	$push61=, 0
-	i32.const	$push60=, 1
-	i32.add 	$push59=, $5, $pop60
-	tee_local	$push58=, $5=, $pop59
-	i32.store	o($pop61), $pop58
-	i32.const	$push57=, 4
-	i32.add 	$3=, $3, $pop57
+	i32.const	$push49=, 0
+	i32.const	$push48=, 1
+	i32.add 	$push29=, $2, $pop48
+	i32.store	r.cnt($pop49), $pop29
+	i32.const	$push47=, 1
+	i32.add 	$4=, $4, $pop47
+	i32.const	$push46=, 0
+	i32.store8	r.c.0($pop46), $4
+	i32.const	$push45=, 1
+	i32.add 	$5=, $5, $pop45
+	i32.const	$push44=, 0
+	i32.store	o($pop44), $5
+	i32.const	$push43=, 4
+	i32.add 	$3=, $3, $pop43
 	i32.lt_s	$push30=, $5, $0
 	br_if   	0, $pop30       # 0: up to label3
 .LBB1_14:                               # %cleanup
 	end_loop
 	end_block                       # label2:
-	i32.const	$push68=, 0
-	return  	$pop68
+	i32.const	$push50=, 0
+	return  	$pop50
 .LBB1_15:                               # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -195,28 +185,27 @@ s:                                      # @s
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, strcmp@FUNCTION, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label4
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push10=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, check($pop9)
-	tee_local	$push7=, $2=, $pop8
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push8=, 0
+	i32.load	$2=, check($pop8)
+	i32.const	$push7=, 0
 	i32.const	$push6=, 1
-	i32.add 	$push2=, $pop7, $pop6
-	i32.store	check($pop10), $pop2
+	i32.add 	$push2=, $2, $pop6
+	i32.store	check($pop7), $pop2
 	i32.const	$push3=, 2
 	i32.ge_s	$push4=, $2, $pop3
 	br_if   	0, $pop4        # 0: down to label4
-# BB#2:                                 # %if.end
-	i32.const	$push12=, 1
-	i32.add 	$push5=, $0, $pop12
+# %bb.2:                                # %if.end
+	i32.const	$push10=, 1
+	i32.add 	$push5=, $0, $pop10
 	i32.store	0($1), $pop5
-	i32.const	$push11=, 0
-	return  	$pop11
+	i32.const	$push9=, 0
+	return  	$pop9
 .LBB2_3:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
@@ -232,7 +221,7 @@ s:                                      # @s
 m:                                      # @m
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -247,35 +236,33 @@ r:                                      # @r
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load8_u	$1=, 0($0)
 	block   	
-	i32.load8_u	$push11=, 0($0)
-	tee_local	$push10=, $1=, $pop11
 	i32.const	$push9=, 0
 	i32.load8_u	$push0=, r.c.0($pop9)
-	i32.ne  	$push1=, $pop10, $pop0
+	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label5
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load8_u	$push2=, 1($0)
 	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
+# %bb.2:                                # %lor.lhs.false
+	i32.const	$push10=, 0
+	i32.load	$0=, r.cnt($pop10)
 	i32.const	$push3=, 4
-	i32.ge_s	$push4=, $pop12, $pop3
+	i32.ge_s	$push4=, $0, $pop3
 	br_if   	0, $pop4        # 0: down to label5
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push7=, 0
 	i32.const	$push5=, 1
 	i32.add 	$push6=, $0, $pop5
 	i32.store	r.cnt($pop7), $pop6
-	i32.const	$push17=, 0
-	i32.const	$push16=, 1
-	i32.add 	$push8=, $1, $pop16
-	i32.store8	r.c.0($pop17), $pop8
-	i32.const	$push15=, 1
-	return  	$pop15
+	i32.const	$push13=, 0
+	i32.const	$push12=, 1
+	i32.add 	$push8=, $1, $pop12
+	i32.store8	r.c.0($pop13), $pop8
+	i32.const	$push11=, 1
+	return  	$pop11
 .LBB4_4:                                # %if.then
 	end_block                       # label5:
 	call    	abort@FUNCTION
@@ -371,7 +358,7 @@ r.c.0:
 	.size	r.c.0, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 96a6bd9ee..e1b80a47e 100644
--- a/test/torture-s/20010924-1.c.s
+++ b/test/torture-s/20010924-1.c.s
@@ -7,86 +7,85 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push37=, 0
 	i32.load8_u	$push0=, a1($pop37)
 	i32.const	$push1=, 52
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push40=, 0
-	i32.load	$push39=, a1+4($pop40)
-	tee_local	$push38=, $0=, $pop39
-	i32.load8_u	$push3=, 0($pop38)
+# %bb.1:                                # %if.end
+	i32.const	$push38=, 0
+	i32.load	$0=, a1+4($pop38)
+	i32.load8_u	$push3=, 0($0)
 	i32.const	$push4=, 54
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.load8_u	$push6=, 1($0)
 	i32.const	$push7=, 50
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end12
+# %bb.3:                                # %if.end12
 	i32.load8_u	$push9=, 2($0)
 	br_if   	0, $pop9        # 0: down to label0
-# BB#4:                                 # %if.end18
-	i32.const	$push41=, 0
-	i32.load8_u	$push10=, a2($pop41)
+# %bb.4:                                # %if.end18
+	i32.const	$push39=, 0
+	i32.load8_u	$push10=, a2($pop39)
 	i32.const	$push11=, 118
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#5:                                 # %if.end23
-	i32.const	$push42=, 0
-	i32.load8_u	$push13=, a2+1($pop42)
+# %bb.5:                                # %if.end23
+	i32.const	$push40=, 0
+	i32.load8_u	$push13=, a2+1($pop40)
 	i32.const	$push14=, 99
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#6:                                 # %if.end28
-	i32.const	$push43=, 0
-	i32.load8_u	$push16=, a2+2($pop43)
+# %bb.6:                                # %if.end28
+	i32.const	$push41=, 0
+	i32.load8_u	$push16=, a2+2($pop41)
 	i32.const	$push17=, 113
 	i32.ne  	$push18=, $pop16, $pop17
 	br_if   	0, $pop18       # 0: down to label0
-# BB#7:                                 # %if.end33
-	i32.const	$push44=, 0
-	i32.load8_u	$push19=, a3($pop44)
+# %bb.7:                                # %if.end33
+	i32.const	$push42=, 0
+	i32.load8_u	$push19=, a3($pop42)
 	i32.const	$push20=, 111
 	i32.ne  	$push21=, $pop19, $pop20
 	br_if   	0, $pop21       # 0: down to label0
-# BB#8:                                 # %if.end38
-	i32.const	$push45=, 0
-	i32.load8_u	$push22=, a3+1($pop45)
+# %bb.8:                                # %if.end38
+	i32.const	$push43=, 0
+	i32.load8_u	$push22=, a3+1($pop43)
 	i32.const	$push23=, 119
 	i32.ne  	$push24=, $pop22, $pop23
 	br_if   	0, $pop24       # 0: down to label0
-# BB#9:                                 # %if.end43
-	i32.const	$push46=, 0
-	i32.load8_u	$push25=, a3+2($pop46)
+# %bb.9:                                # %if.end43
+	i32.const	$push44=, 0
+	i32.load8_u	$push25=, a3+2($pop44)
 	i32.const	$push26=, 120
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#10:                                # %if.end48
-	i32.const	$push47=, 0
-	i32.load8_u	$push28=, a4($pop47)
+# %bb.10:                               # %if.end48
+	i32.const	$push45=, 0
+	i32.load8_u	$push28=, a4($pop45)
 	i32.const	$push29=, 57
 	i32.ne  	$push30=, $pop28, $pop29
 	br_if   	0, $pop30       # 0: down to label0
-# BB#11:                                # %if.end53
-	i32.const	$push48=, 0
-	i32.load8_u	$push31=, a4+1($pop48)
+# %bb.11:                               # %if.end53
+	i32.const	$push46=, 0
+	i32.load8_u	$push31=, a4+1($pop46)
 	i32.const	$push32=, 101
 	i32.ne  	$push33=, $pop31, $pop32
 	br_if   	0, $pop33       # 0: down to label0
-# BB#12:                                # %if.end58
-	i32.const	$push49=, 0
-	i32.load8_u	$push34=, a4+2($pop49)
+# %bb.12:                               # %if.end58
+	i32.const	$push47=, 0
+	i32.load8_u	$push34=, a4+2($pop47)
 	i32.const	$push35=, 98
 	i32.ne  	$push36=, $pop34, $pop35
 	br_if   	0, $pop36       # 0: down to label0
-# BB#13:                                # %if.end63
-	i32.const	$push50=, 0
-	return  	$pop50
+# %bb.13:                               # %if.end63
+	i32.const	$push48=, 0
+	return  	$pop48
 .LBB0_14:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -140,5 +139,5 @@ a4:
 	.size	a4, 3
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20010925-1.c.s b/test/torture-s/20010925-1.c.s
index 1c790764c..57d1fee39 100644
--- a/test/torture-s/20010925-1.c.s
+++ b/test/torture-s/20010925-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load16_u	$push1=, src+8($pop6)
@@ -29,11 +29,11 @@ main:                                   # @main
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push2=, $2
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.call	$drop=, memcpy@FUNCTION, $0, $1, $2
 	i32.const	$push0=, 0
 	return  	$pop0
@@ -64,5 +64,5 @@ src:
 	.size	src, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011008-3.c.s b/test/torture-s/20011008-3.c.s
index 012515e50..e42b77302 100644
--- a/test/torture-s/20011008-3.c.s
+++ b/test/torture-s/20011008-3.c.s
@@ -7,7 +7,7 @@
 log_compare:                            # @log_compare
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -22,18 +22,17 @@ __db_txnlist_lsnadd:                    # @__db_txnlist_lsnadd
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$5=, 0
+# %bb.0:                                # %entry
+	i32.const	$push7=, 1
+	i32.and 	$4=, $3, $pop7
+	i32.const	$3=, 0
 	i32.const	$push0=, 12
-	i32.add 	$4=, $1, $pop0
+	i32.add 	$5=, $1, $pop0
 	i32.const	$6=, 1
 	block   	
 	block   	
-	i32.const	$push9=, 1
-	i32.and 	$push8=, $3, $pop9
-	tee_local	$push7=, $3=, $pop8
-	br_if   	0, $pop7        # 0: down to label1
-# BB#1:
+	br_if   	0, $4           # 0: down to label1
+# %bb.1:
 	i32.const	$7=, 1
 	br      	1               # 1: down to label0
 .LBB1_2:
@@ -55,27 +54,27 @@ __db_txnlist_lsnadd:                    # @__db_txnlist_lsnadd
 .LBB1_4:                                # %for.body
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label8:
-	i32.const	$push10=, 1
-	i32.add 	$5=, $5, $pop10
+	i32.const	$push8=, 1
+	i32.add 	$3=, $3, $pop8
 	i32.const	$6=, 1
-	i32.eqz 	$push11=, $3
-	br_if   	3, $pop11       # 3: down to label4
-# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.eqz 	$push9=, $4
+	br_if   	3, $pop9        # 3: down to label4
+# %bb.5:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$7=, 0
 	br      	5               # 5: up to label2
 .LBB1_6:                                # %cond.false
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label7:
-	i32.load	$6=, 0($4)
-# BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.load	$6=, 0($5)
+# %bb.7:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$7=, 1
 	br      	4               # 4: up to label2
 .LBB1_8:                                # %cond.end
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label6:
-	i32.lt_s	$push1=, $5, $6
+	i32.lt_s	$push1=, $3, $6
 	br_if   	2, $pop1        # 2: down to label3
-# BB#9:                                 #   in Loop: Header=BB1_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$7=, 2
 	br      	3               # 3: up to label2
 .LBB1_10:                               # %for.end35
@@ -85,7 +84,7 @@ __db_txnlist_lsnadd:                    # @__db_txnlist_lsnadd
 	i32.load	$push4=, 0($pop3)
 	i64.load	$push5=, 0($pop4):p2align=2
 	i64.store	0($2):p2align=2, $pop5
-	i32.add 	$push6=, $0, $5
+	i32.add 	$push6=, $0, $3
 	return  	$pop6
 .LBB1_11:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label4:
@@ -107,7 +106,7 @@ __db_txnlist_lsnadd:                    # @__db_txnlist_lsnadd
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# %bb.0:                                # %if.end6
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -116,5 +115,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011019-1.c.s b/test/torture-s/20011019-1.c.s
index de2f0b69f..0c6771340 100644
--- a/test/torture-s/20011019-1.c.s
+++ b/test/torture-s/20011019-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, y($pop0)
 	i32.const	$push2=, x+4
@@ -24,7 +24,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, x+4
 	i32.store	y($pop1), $pop0
@@ -54,5 +54,5 @@ x:
 	.size	x, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011024-1.c.s b/test/torture-s/20011024-1.c.s
index 83a602cfe..eacefef5a 100644
--- a/test/torture-s/20011024-1.c.s
+++ b/test/torture-s/20011024-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.const	$push0=, 6513249
 	i32.store	buf($pop6), $pop0
@@ -15,7 +15,7 @@ main:                                   # @main
 	i32.const	$push1=, .L.str
 	i32.call	$push3=, strcmp@FUNCTION, $pop2, $pop1
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %foo.exit
+# %bb.1:                                # %foo.exit
 	i32.const	$push11=, 0
 	i32.const	$push10=, 0
 	i32.load8_u	$push4=, .L.str.1+8($pop10)
@@ -55,6 +55,6 @@ buf:
 	.size	.L.str.1, 9
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3cf75fa12..9b480eb22 100644
--- a/test/torture-s/20011109-1.c.s
+++ b/test/torture-s/20011109-1.c.s
@@ -5,7 +5,7 @@
 	.globl	fail1
 	.type	fail1,@function
 fail1:                                  # @fail1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -17,7 +17,7 @@ fail1:                                  # @fail1
 	.globl	fail2
 	.type	fail2,@function
 fail2:                                  # @fail2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -29,7 +29,7 @@ fail2:                                  # @fail2
 	.globl	fail3
 	.type	fail3,@function
 fail3:                                  # @fail3
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -41,7 +41,7 @@ fail3:                                  # @fail3
 	.globl	fail4
 	.type	fail4,@function
 fail4:                                  # @fail4
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -54,49 +54,51 @@ fail4:                                  # @fail4
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
+	i32.const	$push0=, 1
+	i32.ne  	$push1=, $0, $pop0
+	br_if   	0, $pop1        # 0: down to label0
+# %bb.1:                                # %sw.epilog9
+	return
+.LBB4_2:                                # %entry
+	end_block                       # label0:
+	i32.const	$push2=, 6
+	i32.add 	$0=, $0, $pop2
 	block   	
+	i32.const	$push3=, 11
+	i32.gt_u	$push4=, $0, $pop3
+	br_if   	0, $pop4        # 0: down to label1
+# %bb.3:                                # %entry
 	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 label3
-# BB#1:                                 # %entry
 	block   	
 	block   	
-	br_table 	$0, 3, 2, 2, 2, 2, 2, 4, 0, 5, 1, 1, 1, 3 # 3: down to label2
-                                        # 2: down to label3
+	br_table 	$0, 1, 4, 4, 4, 4, 4, 2, 4, 3, 0, 0, 0, 1 # 1: down to label4
                                         # 4: down to label1
+                                        # 2: down to label3
+                                        # 3: down to label2
                                         # 0: down to label5
-                                        # 5: down to label0
-                                        # 1: down to label4
-.LBB4_2:                                # %sw.epilog9
+.LBB4_4:                                # %sw.bb3
 	end_block                       # label5:
-	return
-.LBB4_3:                                # %sw.bb3
-	end_block                       # label4:
 	call    	fail3@FUNCTION
 	unreachable
-.LBB4_4:                                # %sw.default
-	end_block                       # label3:
-	call    	fail4@FUNCTION
-	unreachable
 .LBB4_5:                                # %sw.bb
-	end_block                       # label2:
+	end_block                       # label4:
 	call    	fail1@FUNCTION
 	unreachable
 .LBB4_6:                                # %sw.bb1
-	end_block                       # label1:
+	end_block                       # label3:
 	call    	fail2@FUNCTION
 	unreachable
 .LBB4_7:                                # %sw.bb7
-	end_block                       # label0:
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
+.LBB4_8:                                # %sw.default
+	end_block                       # label1:
+	call    	fail4@FUNCTION
+	unreachable
 	.endfunc
 .Lfunc_end4:
 	.size	foo, .Lfunc_end4-foo
@@ -107,7 +109,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -116,6 +118,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end5-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ca5bf77bf..e33281d69 100644
--- a/test/torture-s/20011109-2.c.s
+++ b/test/torture-s/20011109-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011113-1.c.s b/test/torture-s/20011113-1.c.s
index 4801efd7b..5e121570c 100644
--- a/test/torture-s/20011113-1.c.s
+++ b/test/torture-s/20011113-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
@@ -15,21 +15,21 @@ foo:                                    # @foo
 	i32.const	$push5=, 21
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push9=, 12
 	i32.add 	$push10=, $0, $pop9
 	i32.load	$push0=, 0($pop10)
 	i32.const	$push11=, 22
 	i32.ne  	$push12=, $pop0, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $0, $pop7
 	i32.load	$push1=, 0($pop8)
 	i32.const	$push13=, 23
 	i32.ne  	$push14=, $pop1, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#3:                                 # %bar.exit
+# %bb.3:                                # %bar.exit
 	i32.const	$push15=, 0
 	return  	$pop15
 .LBB0_4:                                # %if.then.i
@@ -47,23 +47,23 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 21
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 4($0)
 	i32.const	$push4=, 22
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false4
+# %bb.2:                                # %lor.lhs.false4
 	i32.load	$push6=, 8($0)
 	i32.const	$push7=, 23
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB1_4:                                # %if.then
@@ -81,7 +81,7 @@ bar:                                    # @bar
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
@@ -89,21 +89,21 @@ baz:                                    # @baz
 	i32.const	$push5=, 21
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push9=, 12
 	i32.add 	$push10=, $0, $pop9
 	i32.load	$push0=, 0($pop10)
 	i32.const	$push11=, 22
 	i32.ne  	$push12=, $pop0, $pop11
 	br_if   	0, $pop12       # 0: down to label2
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $0, $pop7
 	i32.load	$push1=, 0($pop8)
 	i32.const	$push13=, 23
 	i32.ne  	$push14=, $pop1, $pop13
 	br_if   	0, $pop14       # 0: down to label2
-# BB#3:                                 # %bar.exit
+# %bb.3:                                # %bar.exit
 	i32.const	$push15=, 0
 	return  	$pop15
 .LBB2_4:                                # %if.then.i
@@ -120,7 +120,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, t
 	i32.call	$drop=, baz@FUNCTION, $pop0
 	i32.const	$push2=, t
@@ -149,6 +149,6 @@ t:
 	.size	t, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4ca246c37..e4f186f85 100644
--- a/test/torture-s/20011114-1.c.s
+++ b/test/torture-s/20011114-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_s	$push0=, 1($0)
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011115-1.c.s b/test/torture-s/20011115-1.c.s
index f52addda5..02b60d43f 100644
--- a/test/torture-s/20011115-1.c.s
+++ b/test/torture-s/20011115-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011121-1.c.s b/test/torture-s/20011121-1.c.s
index 860e47e74..931c00d7f 100644
--- a/test/torture-s/20011121-1.c.s
+++ b/test/torture-s/20011121-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -24,5 +24,5 @@ s1:
 	.size	s1, 76
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011126-1.c.s b/test/torture-s/20011126-1.c.s
index 4190cdd2c..6f29d09fc 100644
--- a/test/torture-s/20011126-1.c.s
+++ b/test/torture-s/20011126-1.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, a($pop3)
 	i32.const	$push1=, -1
 	i32.le_s	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end5
+# %bb.1:                                # %if.end5
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then4
@@ -34,5 +34,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20011126-2.c.s b/test/torture-s/20011126-2.c.s
index fc5da685b..1031170bc 100644
--- a/test/torture-s/20011126-2.c.s
+++ b/test/torture-s/20011126-2.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$5=, .L.str
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
@@ -34,7 +34,7 @@ main:                                   # @main
 	i32.const	$push18=, 97
 	i32.ne  	$push1=, $pop0, $pop18
 	br_if   	0, $pop1        # 0: up to label2
-# BB#3:                                 # %while.cond2.i.preheader
+# %bb.3:                                # %while.cond2.i.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	copy_local	$7=, $5
 .LBB0_4:                                # %while.cond2.i
@@ -42,60 +42,57 @@ main:                                   # @main
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label3:
+	i32.const	$push21=, 1
+	i32.add 	$1=, $7, $pop21
 	i32.load8_u	$4=, 1($7)
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $7, $pop23
-	tee_local	$push21=, $1=, $pop22
-	copy_local	$7=, $pop21
+	copy_local	$7=, $1
 	i32.const	$push20=, 120
 	i32.eq  	$push2=, $4, $pop20
 	br_if   	0, $pop2        # 0: up to label3
-# BB#5:                                 # %while.cond2.i
+# %bb.5:                                # %while.cond2.i
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push24=, 98
-	i32.eq  	$push3=, $4, $pop24
+	i32.const	$push22=, 98
+	i32.eq  	$push3=, $4, $pop22
 	br_if   	1, $pop3        # 1: down to label1
-# BB#6:                                 # %if.end.i
+# %bb.6:                                # %if.end.i
                                         #   in Loop: Header=BB0_2 Depth=2
 	i32.ge_u	$push5=, $5, $1
 	br_if   	0, $pop5        # 0: up to label2
-# BB#7:                                 # %while.body14.lr.ph.i
+# %bb.7:                                # %while.body14.lr.ph.i
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push30=, 97
-	i32.store8	0($6), $pop30
-	i32.const	$push29=, -1
-	i32.add 	$push28=, $1, $pop29
-	tee_local	$push27=, $0=, $pop28
+	i32.const	$push26=, 97
+	i32.store8	0($6), $pop26
+	i32.const	$push25=, -1
+	i32.add 	$0=, $1, $pop25
 	i32.gt_u	$push6=, $5, $0
-	i32.select	$push7=, $5, $pop27, $pop6
+	i32.select	$push7=, $5, $0, $pop6
 	i32.add 	$2=, $6, $pop7
-	i32.const	$push26=, 1
-	i32.add 	$7=, $5, $pop26
-	i32.const	$push25=, 0
-	i32.sub 	$3=, $pop25, $5
+	i32.const	$push24=, 1
+	i32.add 	$7=, $5, $pop24
+	i32.const	$push23=, 0
+	i32.sub 	$3=, $pop23, $5
 	block   	
 	block   	
 	i32.ge_u	$push8=, $5, $0
 	br_if   	0, $pop8        # 0: down to label5
-# BB#8:                                 # %while.body14.while.body14_crit_edge.i.preheader
+# %bb.8:                                # %while.body14.while.body14_crit_edge.i.preheader
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push31=, 1
-	i32.add 	$4=, $6, $pop31
+	i32.const	$push27=, 1
+	i32.add 	$4=, $6, $pop27
 .LBB0_9:                                # %while.body14.while.body14_crit_edge.i
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label6:
 	i32.load8_u	$push9=, 0($7)
 	i32.store8	0($4), $pop9
-	i32.const	$push35=, 1
-	i32.add 	$4=, $4, $pop35
+	i32.const	$push29=, 1
+	i32.add 	$4=, $4, $pop29
+	i32.const	$push28=, 1
+	i32.add 	$5=, $7, $pop28
 	i32.lt_u	$1=, $7, $0
-	i32.const	$push34=, 1
-	i32.add 	$push33=, $7, $pop34
-	tee_local	$push32=, $5=, $pop33
-	copy_local	$7=, $pop32
+	copy_local	$7=, $5
 	br_if   	0, $1           # 0: up to label6
 	br      	2               # 2: down to label4
 .LBB0_10:                               #   in Loop: Header=BB0_1 Depth=1
@@ -125,4 +122,4 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20011128-1.c.s b/test/torture-s/20011128-1.c.s
index 8d830845b..7debead90 100644
--- a/test/torture-s/20011128-1.c.s
+++ b/test/torture-s/20011128-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011217-1.c.s b/test/torture-s/20011217-1.c.s
index 8098dfb04..cdb01e436 100644
--- a/test/torture-s/20011217-1.c.s
+++ b/test/torture-s/20011217-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011219-1.c.s b/test/torture-s/20011219-1.c.s
index 91c1804fa..9e0a2ea44 100644
--- a/test/torture-s/20011219-1.c.s
+++ b/test/torture-s/20011219-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -20,15 +20,15 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-                                        # implicit-def: %vreg14
+# %bb.0:                                # %entry
+                                        # implicit-def: %14
 	block   	
 	i32.const	$push0=, -10
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 4
 	i32.gt_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %sw.epilog.sink.split
+# %bb.1:                                # %sw.epilog.sink.split
 	i32.load	$2=, 0($1)
 .LBB1_2:                                # %sw.epilog
 	end_block                       # label0:
@@ -44,7 +44,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -53,5 +53,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20011223-1.c.s b/test/torture-s/20011223-1.c.s
index f8bf2d19e..f56f25eb5 100644
--- a/test/torture-s/20011223-1.c.s
+++ b/test/torture-s/20011223-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020103-1.c.s b/test/torture-s/20020103-1.c.s
index 189b962b4..7d7e1cd1c 100644
--- a/test/torture-s/20020103-1.c.s
+++ b/test/torture-s/20020103-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -65536
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -36,7 +36,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -45,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020107-1.c.s b/test/torture-s/20020107-1.c.s
index b912c20d5..dcbedd268 100644
--- a/test/torture-s/20020107-1.c.s
+++ b/test/torture-s/20020107-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	i32.const	$push0=, 2
@@ -24,7 +24,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, buf
 	#APP
 	#NO_APP
@@ -46,11 +46,11 @@ main:                                   # @main
 	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
@@ -69,6 +69,6 @@ buf:
 	.size	buf, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9943994c6..1c54f6280 100644
--- a/test/torture-s/20020108-1.c.s
+++ b/test/torture-s/20020108-1.c.s
@@ -7,7 +7,7 @@
 ashift_qi_0:                            # @ashift_qi_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ ashift_qi_0:                            # @ashift_qi_0
 ashift_qi_1:                            # @ashift_qi_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 254
@@ -38,7 +38,7 @@ ashift_qi_1:                            # @ashift_qi_1
 ashift_qi_2:                            # @ashift_qi_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 252
@@ -55,7 +55,7 @@ ashift_qi_2:                            # @ashift_qi_2
 ashift_qi_3:                            # @ashift_qi_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 248
@@ -72,7 +72,7 @@ ashift_qi_3:                            # @ashift_qi_3
 ashift_qi_4:                            # @ashift_qi_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 240
@@ -89,7 +89,7 @@ ashift_qi_4:                            # @ashift_qi_4
 ashift_qi_5:                            # @ashift_qi_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 224
@@ -106,7 +106,7 @@ ashift_qi_5:                            # @ashift_qi_5
 ashift_qi_6:                            # @ashift_qi_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 192
@@ -123,7 +123,7 @@ ashift_qi_6:                            # @ashift_qi_6
 ashift_qi_7:                            # @ashift_qi_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 128
@@ -140,7 +140,7 @@ ashift_qi_7:                            # @ashift_qi_7
 lshiftrt_qi_0:                          # @lshiftrt_qi_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -154,7 +154,7 @@ lshiftrt_qi_0:                          # @lshiftrt_qi_0
 lshiftrt_qi_1:                          # @lshiftrt_qi_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -169,7 +169,7 @@ lshiftrt_qi_1:                          # @lshiftrt_qi_1
 lshiftrt_qi_2:                          # @lshiftrt_qi_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -184,7 +184,7 @@ lshiftrt_qi_2:                          # @lshiftrt_qi_2
 lshiftrt_qi_3:                          # @lshiftrt_qi_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -199,7 +199,7 @@ lshiftrt_qi_3:                          # @lshiftrt_qi_3
 lshiftrt_qi_4:                          # @lshiftrt_qi_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -214,7 +214,7 @@ lshiftrt_qi_4:                          # @lshiftrt_qi_4
 lshiftrt_qi_5:                          # @lshiftrt_qi_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -229,7 +229,7 @@ lshiftrt_qi_5:                          # @lshiftrt_qi_5
 lshiftrt_qi_6:                          # @lshiftrt_qi_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -244,7 +244,7 @@ lshiftrt_qi_6:                          # @lshiftrt_qi_6
 lshiftrt_qi_7:                          # @lshiftrt_qi_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -259,7 +259,7 @@ lshiftrt_qi_7:                          # @lshiftrt_qi_7
 ashiftrt_qi_0:                          # @ashiftrt_qi_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -273,7 +273,7 @@ ashiftrt_qi_0:                          # @ashiftrt_qi_0
 ashiftrt_qi_1:                          # @ashiftrt_qi_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -288,7 +288,7 @@ ashiftrt_qi_1:                          # @ashiftrt_qi_1
 ashiftrt_qi_2:                          # @ashiftrt_qi_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -303,7 +303,7 @@ ashiftrt_qi_2:                          # @ashiftrt_qi_2
 ashiftrt_qi_3:                          # @ashiftrt_qi_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -318,7 +318,7 @@ ashiftrt_qi_3:                          # @ashiftrt_qi_3
 ashiftrt_qi_4:                          # @ashiftrt_qi_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -333,7 +333,7 @@ ashiftrt_qi_4:                          # @ashiftrt_qi_4
 ashiftrt_qi_5:                          # @ashiftrt_qi_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -348,7 +348,7 @@ ashiftrt_qi_5:                          # @ashiftrt_qi_5
 ashiftrt_qi_6:                          # @ashiftrt_qi_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -363,7 +363,7 @@ ashiftrt_qi_6:                          # @ashiftrt_qi_6
 ashiftrt_qi_7:                          # @ashiftrt_qi_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -378,7 +378,7 @@ ashiftrt_qi_7:                          # @ashiftrt_qi_7
 ashift_hi_0:                            # @ashift_hi_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -392,7 +392,7 @@ ashift_hi_0:                            # @ashift_hi_0
 ashift_hi_1:                            # @ashift_hi_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65534
@@ -409,7 +409,7 @@ ashift_hi_1:                            # @ashift_hi_1
 ashift_hi_2:                            # @ashift_hi_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65532
@@ -426,7 +426,7 @@ ashift_hi_2:                            # @ashift_hi_2
 ashift_hi_3:                            # @ashift_hi_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65528
@@ -443,7 +443,7 @@ ashift_hi_3:                            # @ashift_hi_3
 ashift_hi_4:                            # @ashift_hi_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65520
@@ -460,7 +460,7 @@ ashift_hi_4:                            # @ashift_hi_4
 ashift_hi_5:                            # @ashift_hi_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65504
@@ -477,7 +477,7 @@ ashift_hi_5:                            # @ashift_hi_5
 ashift_hi_6:                            # @ashift_hi_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65472
@@ -494,7 +494,7 @@ ashift_hi_6:                            # @ashift_hi_6
 ashift_hi_7:                            # @ashift_hi_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65408
@@ -511,7 +511,7 @@ ashift_hi_7:                            # @ashift_hi_7
 ashift_hi_8:                            # @ashift_hi_8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65280
@@ -528,7 +528,7 @@ ashift_hi_8:                            # @ashift_hi_8
 ashift_hi_9:                            # @ashift_hi_9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65024
@@ -545,7 +545,7 @@ ashift_hi_9:                            # @ashift_hi_9
 ashift_hi_10:                           # @ashift_hi_10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 64512
@@ -562,7 +562,7 @@ ashift_hi_10:                           # @ashift_hi_10
 ashift_hi_11:                           # @ashift_hi_11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 11
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 63488
@@ -579,7 +579,7 @@ ashift_hi_11:                           # @ashift_hi_11
 ashift_hi_12:                           # @ashift_hi_12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 61440
@@ -596,7 +596,7 @@ ashift_hi_12:                           # @ashift_hi_12
 ashift_hi_13:                           # @ashift_hi_13
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 57344
@@ -613,7 +613,7 @@ ashift_hi_13:                           # @ashift_hi_13
 ashift_hi_14:                           # @ashift_hi_14
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 14
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 49152
@@ -630,7 +630,7 @@ ashift_hi_14:                           # @ashift_hi_14
 ashift_hi_15:                           # @ashift_hi_15
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 32768
@@ -647,7 +647,7 @@ ashift_hi_15:                           # @ashift_hi_15
 lshiftrt_hi_0:                          # @lshiftrt_hi_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -661,7 +661,7 @@ lshiftrt_hi_0:                          # @lshiftrt_hi_0
 lshiftrt_hi_1:                          # @lshiftrt_hi_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -676,7 +676,7 @@ lshiftrt_hi_1:                          # @lshiftrt_hi_1
 lshiftrt_hi_2:                          # @lshiftrt_hi_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -691,7 +691,7 @@ lshiftrt_hi_2:                          # @lshiftrt_hi_2
 lshiftrt_hi_3:                          # @lshiftrt_hi_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -706,7 +706,7 @@ lshiftrt_hi_3:                          # @lshiftrt_hi_3
 lshiftrt_hi_4:                          # @lshiftrt_hi_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -721,7 +721,7 @@ lshiftrt_hi_4:                          # @lshiftrt_hi_4
 lshiftrt_hi_5:                          # @lshiftrt_hi_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -736,7 +736,7 @@ lshiftrt_hi_5:                          # @lshiftrt_hi_5
 lshiftrt_hi_6:                          # @lshiftrt_hi_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -751,7 +751,7 @@ lshiftrt_hi_6:                          # @lshiftrt_hi_6
 lshiftrt_hi_7:                          # @lshiftrt_hi_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -766,7 +766,7 @@ lshiftrt_hi_7:                          # @lshiftrt_hi_7
 lshiftrt_hi_8:                          # @lshiftrt_hi_8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -781,7 +781,7 @@ lshiftrt_hi_8:                          # @lshiftrt_hi_8
 lshiftrt_hi_9:                          # @lshiftrt_hi_9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -796,7 +796,7 @@ lshiftrt_hi_9:                          # @lshiftrt_hi_9
 lshiftrt_hi_10:                         # @lshiftrt_hi_10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -811,7 +811,7 @@ lshiftrt_hi_10:                         # @lshiftrt_hi_10
 lshiftrt_hi_11:                         # @lshiftrt_hi_11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 11
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -826,7 +826,7 @@ lshiftrt_hi_11:                         # @lshiftrt_hi_11
 lshiftrt_hi_12:                         # @lshiftrt_hi_12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -841,7 +841,7 @@ lshiftrt_hi_12:                         # @lshiftrt_hi_12
 lshiftrt_hi_13:                         # @lshiftrt_hi_13
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -856,7 +856,7 @@ lshiftrt_hi_13:                         # @lshiftrt_hi_13
 lshiftrt_hi_14:                         # @lshiftrt_hi_14
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 14
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -871,7 +871,7 @@ lshiftrt_hi_14:                         # @lshiftrt_hi_14
 lshiftrt_hi_15:                         # @lshiftrt_hi_15
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -886,7 +886,7 @@ lshiftrt_hi_15:                         # @lshiftrt_hi_15
 ashiftrt_hi_0:                          # @ashiftrt_hi_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -900,7 +900,7 @@ ashiftrt_hi_0:                          # @ashiftrt_hi_0
 ashiftrt_hi_1:                          # @ashiftrt_hi_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -915,7 +915,7 @@ ashiftrt_hi_1:                          # @ashiftrt_hi_1
 ashiftrt_hi_2:                          # @ashiftrt_hi_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -930,7 +930,7 @@ ashiftrt_hi_2:                          # @ashiftrt_hi_2
 ashiftrt_hi_3:                          # @ashiftrt_hi_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -945,7 +945,7 @@ ashiftrt_hi_3:                          # @ashiftrt_hi_3
 ashiftrt_hi_4:                          # @ashiftrt_hi_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -960,7 +960,7 @@ ashiftrt_hi_4:                          # @ashiftrt_hi_4
 ashiftrt_hi_5:                          # @ashiftrt_hi_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -975,7 +975,7 @@ ashiftrt_hi_5:                          # @ashiftrt_hi_5
 ashiftrt_hi_6:                          # @ashiftrt_hi_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -990,7 +990,7 @@ ashiftrt_hi_6:                          # @ashiftrt_hi_6
 ashiftrt_hi_7:                          # @ashiftrt_hi_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1005,7 +1005,7 @@ ashiftrt_hi_7:                          # @ashiftrt_hi_7
 ashiftrt_hi_8:                          # @ashiftrt_hi_8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1020,7 +1020,7 @@ ashiftrt_hi_8:                          # @ashiftrt_hi_8
 ashiftrt_hi_9:                          # @ashiftrt_hi_9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1035,7 +1035,7 @@ ashiftrt_hi_9:                          # @ashiftrt_hi_9
 ashiftrt_hi_10:                         # @ashiftrt_hi_10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1050,7 +1050,7 @@ ashiftrt_hi_10:                         # @ashiftrt_hi_10
 ashiftrt_hi_11:                         # @ashiftrt_hi_11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 11
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1065,7 +1065,7 @@ ashiftrt_hi_11:                         # @ashiftrt_hi_11
 ashiftrt_hi_12:                         # @ashiftrt_hi_12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1080,7 +1080,7 @@ ashiftrt_hi_12:                         # @ashiftrt_hi_12
 ashiftrt_hi_13:                         # @ashiftrt_hi_13
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1095,7 +1095,7 @@ ashiftrt_hi_13:                         # @ashiftrt_hi_13
 ashiftrt_hi_14:                         # @ashiftrt_hi_14
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 14
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1110,7 +1110,7 @@ ashiftrt_hi_14:                         # @ashiftrt_hi_14
 ashiftrt_hi_15:                         # @ashiftrt_hi_15
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1125,7 +1125,7 @@ ashiftrt_hi_15:                         # @ashiftrt_hi_15
 ashift_si_0:                            # @ashift_si_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -1139,7 +1139,7 @@ ashift_si_0:                            # @ashift_si_0
 ashift_si_1:                            # @ashift_si_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1154,7 +1154,7 @@ ashift_si_1:                            # @ashift_si_1
 ashift_si_2:                            # @ashift_si_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1169,7 +1169,7 @@ ashift_si_2:                            # @ashift_si_2
 ashift_si_3:                            # @ashift_si_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1184,7 +1184,7 @@ ashift_si_3:                            # @ashift_si_3
 ashift_si_4:                            # @ashift_si_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1199,7 +1199,7 @@ ashift_si_4:                            # @ashift_si_4
 ashift_si_5:                            # @ashift_si_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1214,7 +1214,7 @@ ashift_si_5:                            # @ashift_si_5
 ashift_si_6:                            # @ashift_si_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1229,7 +1229,7 @@ ashift_si_6:                            # @ashift_si_6
 ashift_si_7:                            # @ashift_si_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1244,7 +1244,7 @@ ashift_si_7:                            # @ashift_si_7
 ashift_si_8:                            # @ashift_si_8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1259,7 +1259,7 @@ ashift_si_8:                            # @ashift_si_8
 ashift_si_9:                            # @ashift_si_9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1274,7 +1274,7 @@ ashift_si_9:                            # @ashift_si_9
 ashift_si_10:                           # @ashift_si_10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1289,7 +1289,7 @@ ashift_si_10:                           # @ashift_si_10
 ashift_si_11:                           # @ashift_si_11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 11
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1304,7 +1304,7 @@ ashift_si_11:                           # @ashift_si_11
 ashift_si_12:                           # @ashift_si_12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1319,7 +1319,7 @@ ashift_si_12:                           # @ashift_si_12
 ashift_si_13:                           # @ashift_si_13
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1334,7 +1334,7 @@ ashift_si_13:                           # @ashift_si_13
 ashift_si_14:                           # @ashift_si_14
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 14
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1349,7 +1349,7 @@ ashift_si_14:                           # @ashift_si_14
 ashift_si_15:                           # @ashift_si_15
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1364,7 +1364,7 @@ ashift_si_15:                           # @ashift_si_15
 ashift_si_16:                           # @ashift_si_16
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1379,7 +1379,7 @@ ashift_si_16:                           # @ashift_si_16
 ashift_si_17:                           # @ashift_si_17
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1394,7 +1394,7 @@ ashift_si_17:                           # @ashift_si_17
 ashift_si_18:                           # @ashift_si_18
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 18
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1409,7 +1409,7 @@ ashift_si_18:                           # @ashift_si_18
 ashift_si_19:                           # @ashift_si_19
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 19
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1424,7 +1424,7 @@ ashift_si_19:                           # @ashift_si_19
 ashift_si_20:                           # @ashift_si_20
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 20
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1439,7 +1439,7 @@ ashift_si_20:                           # @ashift_si_20
 ashift_si_21:                           # @ashift_si_21
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 21
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1454,7 +1454,7 @@ ashift_si_21:                           # @ashift_si_21
 ashift_si_22:                           # @ashift_si_22
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 22
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1469,7 +1469,7 @@ ashift_si_22:                           # @ashift_si_22
 ashift_si_23:                           # @ashift_si_23
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 23
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1484,7 +1484,7 @@ ashift_si_23:                           # @ashift_si_23
 ashift_si_24:                           # @ashift_si_24
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1499,7 +1499,7 @@ ashift_si_24:                           # @ashift_si_24
 ashift_si_25:                           # @ashift_si_25
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 25
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1514,7 +1514,7 @@ ashift_si_25:                           # @ashift_si_25
 ashift_si_26:                           # @ashift_si_26
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 26
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1529,7 +1529,7 @@ ashift_si_26:                           # @ashift_si_26
 ashift_si_27:                           # @ashift_si_27
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 27
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1544,7 +1544,7 @@ ashift_si_27:                           # @ashift_si_27
 ashift_si_28:                           # @ashift_si_28
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 28
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1559,7 +1559,7 @@ ashift_si_28:                           # @ashift_si_28
 ashift_si_29:                           # @ashift_si_29
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1574,7 +1574,7 @@ ashift_si_29:                           # @ashift_si_29
 ashift_si_30:                           # @ashift_si_30
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 30
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1589,7 +1589,7 @@ ashift_si_30:                           # @ashift_si_30
 ashift_si_31:                           # @ashift_si_31
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1604,7 +1604,7 @@ ashift_si_31:                           # @ashift_si_31
 lshiftrt_si_0:                          # @lshiftrt_si_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -1618,7 +1618,7 @@ lshiftrt_si_0:                          # @lshiftrt_si_0
 lshiftrt_si_1:                          # @lshiftrt_si_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1633,7 +1633,7 @@ lshiftrt_si_1:                          # @lshiftrt_si_1
 lshiftrt_si_2:                          # @lshiftrt_si_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1648,7 +1648,7 @@ lshiftrt_si_2:                          # @lshiftrt_si_2
 lshiftrt_si_3:                          # @lshiftrt_si_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1663,7 +1663,7 @@ lshiftrt_si_3:                          # @lshiftrt_si_3
 lshiftrt_si_4:                          # @lshiftrt_si_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1678,7 +1678,7 @@ lshiftrt_si_4:                          # @lshiftrt_si_4
 lshiftrt_si_5:                          # @lshiftrt_si_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1693,7 +1693,7 @@ lshiftrt_si_5:                          # @lshiftrt_si_5
 lshiftrt_si_6:                          # @lshiftrt_si_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1708,7 +1708,7 @@ lshiftrt_si_6:                          # @lshiftrt_si_6
 lshiftrt_si_7:                          # @lshiftrt_si_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1723,7 +1723,7 @@ lshiftrt_si_7:                          # @lshiftrt_si_7
 lshiftrt_si_8:                          # @lshiftrt_si_8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1738,7 +1738,7 @@ lshiftrt_si_8:                          # @lshiftrt_si_8
 lshiftrt_si_9:                          # @lshiftrt_si_9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1753,7 +1753,7 @@ lshiftrt_si_9:                          # @lshiftrt_si_9
 lshiftrt_si_10:                         # @lshiftrt_si_10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1768,7 +1768,7 @@ lshiftrt_si_10:                         # @lshiftrt_si_10
 lshiftrt_si_11:                         # @lshiftrt_si_11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 11
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1783,7 +1783,7 @@ lshiftrt_si_11:                         # @lshiftrt_si_11
 lshiftrt_si_12:                         # @lshiftrt_si_12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1798,7 +1798,7 @@ lshiftrt_si_12:                         # @lshiftrt_si_12
 lshiftrt_si_13:                         # @lshiftrt_si_13
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1813,7 +1813,7 @@ lshiftrt_si_13:                         # @lshiftrt_si_13
 lshiftrt_si_14:                         # @lshiftrt_si_14
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 14
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1828,7 +1828,7 @@ lshiftrt_si_14:                         # @lshiftrt_si_14
 lshiftrt_si_15:                         # @lshiftrt_si_15
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1843,7 +1843,7 @@ lshiftrt_si_15:                         # @lshiftrt_si_15
 lshiftrt_si_16:                         # @lshiftrt_si_16
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1858,7 +1858,7 @@ lshiftrt_si_16:                         # @lshiftrt_si_16
 lshiftrt_si_17:                         # @lshiftrt_si_17
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 17
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1873,7 +1873,7 @@ lshiftrt_si_17:                         # @lshiftrt_si_17
 lshiftrt_si_18:                         # @lshiftrt_si_18
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 18
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1888,7 +1888,7 @@ lshiftrt_si_18:                         # @lshiftrt_si_18
 lshiftrt_si_19:                         # @lshiftrt_si_19
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 19
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1903,7 +1903,7 @@ lshiftrt_si_19:                         # @lshiftrt_si_19
 lshiftrt_si_20:                         # @lshiftrt_si_20
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 20
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1918,7 +1918,7 @@ lshiftrt_si_20:                         # @lshiftrt_si_20
 lshiftrt_si_21:                         # @lshiftrt_si_21
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 21
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1933,7 +1933,7 @@ lshiftrt_si_21:                         # @lshiftrt_si_21
 lshiftrt_si_22:                         # @lshiftrt_si_22
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 22
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1948,7 +1948,7 @@ lshiftrt_si_22:                         # @lshiftrt_si_22
 lshiftrt_si_23:                         # @lshiftrt_si_23
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 23
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1963,7 +1963,7 @@ lshiftrt_si_23:                         # @lshiftrt_si_23
 lshiftrt_si_24:                         # @lshiftrt_si_24
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1978,7 +1978,7 @@ lshiftrt_si_24:                         # @lshiftrt_si_24
 lshiftrt_si_25:                         # @lshiftrt_si_25
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 25
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -1993,7 +1993,7 @@ lshiftrt_si_25:                         # @lshiftrt_si_25
 lshiftrt_si_26:                         # @lshiftrt_si_26
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 26
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2008,7 +2008,7 @@ lshiftrt_si_26:                         # @lshiftrt_si_26
 lshiftrt_si_27:                         # @lshiftrt_si_27
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 27
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2023,7 +2023,7 @@ lshiftrt_si_27:                         # @lshiftrt_si_27
 lshiftrt_si_28:                         # @lshiftrt_si_28
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 28
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2038,7 +2038,7 @@ lshiftrt_si_28:                         # @lshiftrt_si_28
 lshiftrt_si_29:                         # @lshiftrt_si_29
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2053,7 +2053,7 @@ lshiftrt_si_29:                         # @lshiftrt_si_29
 lshiftrt_si_30:                         # @lshiftrt_si_30
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 30
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2068,7 +2068,7 @@ lshiftrt_si_30:                         # @lshiftrt_si_30
 lshiftrt_si_31:                         # @lshiftrt_si_31
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2083,7 +2083,7 @@ lshiftrt_si_31:                         # @lshiftrt_si_31
 ashiftrt_si_0:                          # @ashiftrt_si_0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -2097,7 +2097,7 @@ ashiftrt_si_0:                          # @ashiftrt_si_0
 ashiftrt_si_1:                          # @ashiftrt_si_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2112,7 +2112,7 @@ ashiftrt_si_1:                          # @ashiftrt_si_1
 ashiftrt_si_2:                          # @ashiftrt_si_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2127,7 +2127,7 @@ ashiftrt_si_2:                          # @ashiftrt_si_2
 ashiftrt_si_3:                          # @ashiftrt_si_3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2142,7 +2142,7 @@ ashiftrt_si_3:                          # @ashiftrt_si_3
 ashiftrt_si_4:                          # @ashiftrt_si_4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2157,7 +2157,7 @@ ashiftrt_si_4:                          # @ashiftrt_si_4
 ashiftrt_si_5:                          # @ashiftrt_si_5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2172,7 +2172,7 @@ ashiftrt_si_5:                          # @ashiftrt_si_5
 ashiftrt_si_6:                          # @ashiftrt_si_6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2187,7 +2187,7 @@ ashiftrt_si_6:                          # @ashiftrt_si_6
 ashiftrt_si_7:                          # @ashiftrt_si_7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2202,7 +2202,7 @@ ashiftrt_si_7:                          # @ashiftrt_si_7
 ashiftrt_si_8:                          # @ashiftrt_si_8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2217,7 +2217,7 @@ ashiftrt_si_8:                          # @ashiftrt_si_8
 ashiftrt_si_9:                          # @ashiftrt_si_9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2232,7 +2232,7 @@ ashiftrt_si_9:                          # @ashiftrt_si_9
 ashiftrt_si_10:                         # @ashiftrt_si_10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2247,7 +2247,7 @@ ashiftrt_si_10:                         # @ashiftrt_si_10
 ashiftrt_si_11:                         # @ashiftrt_si_11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 11
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2262,7 +2262,7 @@ ashiftrt_si_11:                         # @ashiftrt_si_11
 ashiftrt_si_12:                         # @ashiftrt_si_12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2277,7 +2277,7 @@ ashiftrt_si_12:                         # @ashiftrt_si_12
 ashiftrt_si_13:                         # @ashiftrt_si_13
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2292,7 +2292,7 @@ ashiftrt_si_13:                         # @ashiftrt_si_13
 ashiftrt_si_14:                         # @ashiftrt_si_14
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 14
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2307,7 +2307,7 @@ ashiftrt_si_14:                         # @ashiftrt_si_14
 ashiftrt_si_15:                         # @ashiftrt_si_15
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2322,7 +2322,7 @@ ashiftrt_si_15:                         # @ashiftrt_si_15
 ashiftrt_si_16:                         # @ashiftrt_si_16
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2337,7 +2337,7 @@ ashiftrt_si_16:                         # @ashiftrt_si_16
 ashiftrt_si_17:                         # @ashiftrt_si_17
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 17
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2352,7 +2352,7 @@ ashiftrt_si_17:                         # @ashiftrt_si_17
 ashiftrt_si_18:                         # @ashiftrt_si_18
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 18
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2367,7 +2367,7 @@ ashiftrt_si_18:                         # @ashiftrt_si_18
 ashiftrt_si_19:                         # @ashiftrt_si_19
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 19
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2382,7 +2382,7 @@ ashiftrt_si_19:                         # @ashiftrt_si_19
 ashiftrt_si_20:                         # @ashiftrt_si_20
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 20
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2397,7 +2397,7 @@ ashiftrt_si_20:                         # @ashiftrt_si_20
 ashiftrt_si_21:                         # @ashiftrt_si_21
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 21
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2412,7 +2412,7 @@ ashiftrt_si_21:                         # @ashiftrt_si_21
 ashiftrt_si_22:                         # @ashiftrt_si_22
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 22
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2427,7 +2427,7 @@ ashiftrt_si_22:                         # @ashiftrt_si_22
 ashiftrt_si_23:                         # @ashiftrt_si_23
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 23
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2442,7 +2442,7 @@ ashiftrt_si_23:                         # @ashiftrt_si_23
 ashiftrt_si_24:                         # @ashiftrt_si_24
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2457,7 +2457,7 @@ ashiftrt_si_24:                         # @ashiftrt_si_24
 ashiftrt_si_25:                         # @ashiftrt_si_25
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 25
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2472,7 +2472,7 @@ ashiftrt_si_25:                         # @ashiftrt_si_25
 ashiftrt_si_26:                         # @ashiftrt_si_26
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 26
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2487,7 +2487,7 @@ ashiftrt_si_26:                         # @ashiftrt_si_26
 ashiftrt_si_27:                         # @ashiftrt_si_27
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 27
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2502,7 +2502,7 @@ ashiftrt_si_27:                         # @ashiftrt_si_27
 ashiftrt_si_28:                         # @ashiftrt_si_28
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 28
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2517,7 +2517,7 @@ ashiftrt_si_28:                         # @ashiftrt_si_28
 ashiftrt_si_29:                         # @ashiftrt_si_29
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2532,7 +2532,7 @@ ashiftrt_si_29:                         # @ashiftrt_si_29
 ashiftrt_si_30:                         # @ashiftrt_si_30
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 30
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2547,7 +2547,7 @@ ashiftrt_si_30:                         # @ashiftrt_si_30
 ashiftrt_si_31:                         # @ashiftrt_si_31
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -2561,7 +2561,7 @@ ashiftrt_si_31:                         # @ashiftrt_si_31
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end1211
+# %bb.0:                                # %if.end1211
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -2570,5 +2570,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end168-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020118-1.c.s b/test/torture-s/20020118-1.c.s
index 02238627d..5dd7e8e5c 100644
--- a/test/torture-s/20020118-1.c.s
+++ b/test/torture-s/20020118-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push0=, q($pop13)
 	i32.const	$push1=, 2
@@ -60,7 +60,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -87,5 +87,5 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020127-1.c.s b/test/torture-s/20020127-1.c.s
index aad28fa2e..b29590587 100644
--- a/test/torture-s/20020127-1.c.s
+++ b/test/torture-s/20020127-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_u	$push1=, $0, $pop0
 	i32.const	$push2=, -1
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -34,5 +34,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020129-1.c.s b/test/torture-s/20020129-1.c.s
index a473f8bc4..415e60def 100644
--- a/test/torture-s/20020129-1.c.s
+++ b/test/torture-s/20020129-1.c.s
@@ -7,17 +7,17 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$2=, 28($1)
 	block   	
 	block   	
 	block   	
 	i32.load	$push0=, 28($0)
-	i32.eqz 	$push20=, $pop0
-	br_if   	0, $pop20       # 0: down to label2
-# BB#1:                                 # %if.end
-	i32.eqz 	$push21=, $2
-	br_if   	1, $pop21       # 1: down to label1
+	i32.eqz 	$push18=, $pop0
+	br_if   	0, $pop18       # 0: down to label2
+# %bb.1:                                # %if.end
+	i32.eqz 	$push19=, $2
+	br_if   	1, $pop19       # 1: down to label1
 	br      	2               # 2: down to label0
 .LBB0_2:                                # %if.then
 	end_block                       # label2:
@@ -28,29 +28,28 @@ foo:                                    # @foo
 	i32.add 	$push3=, $1, $pop13
 	i32.const	$push4=, 0
 	i32.store	0($pop3), $pop4
-	i32.eqz 	$push22=, $2
-	br_if   	0, $pop22       # 0: down to label1
+	i32.eqz 	$push20=, $2
+	br_if   	0, $pop20       # 0: down to label1
 .LBB0_3:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
 	i32.store	4($2), $0
-	i32.load	$push15=, 0($2)
-	tee_local	$push14=, $2=, $pop15
-	br_if   	0, $pop14       # 0: up to label3
+	i32.load	$2=, 0($2)
+	br_if   	0, $2           # 0: up to label3
 .LBB0_4:                                # %if.end7
 	end_loop
 	end_block                       # label1:
 	i32.load	$2=, 12($1)
 	block   	
 	i32.load	$push5=, 12($0)
-	i32.const	$push16=, -1
-	i32.eq  	$push6=, $pop5, $pop16
+	i32.const	$push14=, -1
+	i32.eq  	$push6=, $pop5, $pop14
 	br_if   	0, $pop6        # 0: down to label4
-# BB#5:                                 # %if.end22
-	i32.const	$push17=, -1
-	i32.ne  	$push7=, $2, $pop17
+# %bb.5:                                # %if.end22
+	i32.const	$push15=, -1
+	i32.ne  	$push7=, $2, $pop15
 	br_if   	1, $pop7        # 1: down to label0
-# BB#6:                                 # %if.end27
+# %bb.6:                                # %if.end27
 	return
 .LBB0_7:                                # %if.end22.thread
 	end_block                       # label4:
@@ -61,10 +60,10 @@ foo:                                    # @foo
 	i32.store	0($pop10), $2
 	i32.const	$push11=, 0
 	i32.store	16($1), $pop11
-	i32.const	$push19=, 12
-	i32.add 	$push12=, $1, $pop19
-	i32.const	$push18=, -1
-	i32.store	0($pop12), $pop18
+	i32.const	$push17=, 12
+	i32.add 	$push12=, $1, $pop17
+	i32.const	$push16=, -1
+	i32.store	0($pop12), $pop16
 	return
 .LBB0_8:                                # %if.then6
 	end_block                       # label0:
@@ -80,7 +79,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 6
 	i32.store	y($pop1), $pop0
@@ -119,6 +118,6 @@ x:
 	.size	x, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 528ea45de..d16f70e09 100644
--- a/test/torture-s/20020201-1.c.s
+++ b/test/torture-s/20020201-1.c.s
@@ -7,83 +7,78 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i64
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load8_u	$push38=, cx($pop0)
-	tee_local	$push37=, $0=, $pop38
+	i32.load8_u	$0=, cx($pop0)
+	block   	
 	i32.const	$push1=, -6
-	i32.add 	$push2=, $pop37, $pop1
+	i32.add 	$push2=, $0, $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	$push39=, 6
-	i32.rem_u	$push4=, $0, $pop39
+# %bb.1:                                # %if.end
+	i32.const	$push37=, 6
+	i32.rem_u	$push4=, $0, $pop37
 	i32.const	$push5=, 1
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end10
+# %bb.2:                                # %if.end10
 	i32.const	$push7=, 0
-	i32.load16_u	$push42=, sx($pop7)
-	tee_local	$push41=, $0=, $pop42
+	i32.load16_u	$0=, sx($pop7)
 	i32.const	$push8=, -12
-	i32.add 	$push9=, $pop41, $pop8
-	i32.const	$push40=, 6
-	i32.ge_u	$push10=, $pop9, $pop40
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push38=, 6
+	i32.ge_u	$push10=, $pop9, $pop38
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %if.end18
-	i32.const	$push43=, 6
-	i32.rem_u	$push11=, $0, $pop43
+# %bb.3:                                # %if.end18
+	i32.const	$push39=, 6
+	i32.rem_u	$push11=, $0, $pop39
 	i32.const	$push12=, 2
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#4:                                 # %if.end26
+# %bb.4:                                # %if.end26
 	i32.const	$push14=, 0
-	i32.load	$push46=, ix($pop14)
-	tee_local	$push45=, $0=, $pop46
+	i32.load	$0=, ix($pop14)
 	i32.const	$push15=, -18
-	i32.add 	$push16=, $pop45, $pop15
-	i32.const	$push44=, 6
-	i32.ge_u	$push17=, $pop16, $pop44
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push40=, 6
+	i32.ge_u	$push17=, $pop16, $pop40
 	br_if   	0, $pop17       # 0: down to label0
-# BB#5:                                 # %if.end31
-	i32.const	$push47=, 6
-	i32.rem_u	$push18=, $0, $pop47
+# %bb.5:                                # %if.end31
+	i32.const	$push41=, 6
+	i32.rem_u	$push18=, $0, $pop41
 	i32.const	$push19=, 3
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#6:                                 # %if.end36
+# %bb.6:                                # %if.end36
 	i32.const	$push21=, 0
-	i32.load	$push50=, lx($pop21)
-	tee_local	$push49=, $0=, $pop50
+	i32.load	$0=, lx($pop21)
 	i32.const	$push22=, -24
-	i32.add 	$push23=, $pop49, $pop22
-	i32.const	$push48=, 6
-	i32.ge_u	$push24=, $pop23, $pop48
+	i32.add 	$push23=, $0, $pop22
+	i32.const	$push42=, 6
+	i32.ge_u	$push24=, $pop23, $pop42
 	br_if   	0, $pop24       # 0: down to label0
-# BB#7:                                 # %if.end41
-	i32.const	$push51=, 6
-	i32.rem_u	$push25=, $0, $pop51
+# %bb.7:                                # %if.end41
+	i32.const	$push43=, 6
+	i32.rem_u	$push25=, $0, $pop43
 	i32.const	$push26=, 4
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#8:                                 # %if.end46
+# %bb.8:                                # %if.end46
 	i32.const	$push28=, 0
-	i64.load	$push54=, Lx($pop28)
-	tee_local	$push53=, $1=, $pop54
+	i64.load	$1=, Lx($pop28)
 	i64.const	$push29=, -30
-	i64.add 	$push30=, $pop53, $pop29
-	i64.const	$push52=, 6
-	i64.ge_u	$push31=, $pop30, $pop52
+	i64.add 	$push30=, $1, $pop29
+	i64.const	$push44=, 6
+	i64.ge_u	$push31=, $pop30, $pop44
 	br_if   	0, $pop31       # 0: down to label0
-# BB#9:                                 # %if.end51
-	i64.const	$push55=, 6
-	i64.rem_u	$push32=, $1, $pop55
+# %bb.9:                                # %if.end51
+	i64.const	$push45=, 6
+	i64.rem_u	$push32=, $1, $pop45
 	i64.const	$push33=, 5
 	i64.ne  	$push34=, $pop32, $pop33
 	br_if   	0, $pop34       # 0: down to label0
-# BB#10:                                # %if.end56
+# %bb.10:                               # %if.end56
 	i32.const	$push35=, 0
 	call    	exit@FUNCTION, $pop35
 	unreachable
@@ -140,6 +135,6 @@ Lx:
 	.size	Lx, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e6e63490f..1c39b5f9e 100644
--- a/test/torture-s/20020206-1.c.s
+++ b/test/torture-s/20020206-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.store	8($0), $pop0
 	i64.const	$push1=, 223338299568
@@ -22,23 +22,23 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 176
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 4($0)
 	i32.const	$push4=, 52
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i32.load	$push6=, 8($0)
 	i32.const	$push7=, 31
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB1_4:                                # %if.then
 	end_block                       # label0:
@@ -55,14 +55,13 @@ baz:                                    # @baz
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $0=, $pop8
-	i32.store	__stack_pointer($pop6), $pop7
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push0=, 31
 	i32.store	8($0), $pop0
 	i64.const	$push1=, 223338299568
@@ -76,6 +75,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 77d8bef1b..0544237ae 100644
--- a/test/torture-s/20020206-2.c.s
+++ b/test/torture-s/20020206-2.c.s
@@ -6,14 +6,14 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 16
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push2=, 2064
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,7 +30,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %for.cond.1
+# %bb.0:                                # %for.cond.1
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,6 +39,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ab70c7e8f..dc6e10403 100644
--- a/test/torture-s/20020213-1.c.s
+++ b/test/torture-s/20020213-1.c.s
@@ -6,24 +6,22 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, b($pop12)
-	tee_local	$push10=, $0=, $pop11
+	i32.load	$0=, b($pop0)
 	i32.const	$push1=, -1
-	i32.add 	$push9=, $pop10, $pop1
-	tee_local	$push8=, $1=, $pop9
+	i32.add 	$1=, $0, $pop1
+	i32.const	$push8=, 0
 	i32.const	$push2=, 2241
 	i32.const	$push7=, 2241
 	i32.lt_s	$push3=, $1, $pop7
-	i32.select	$push4=, $pop8, $pop2, $pop3
-	i32.store	a+4($pop0), $pop4
+	i32.select	$push4=, $1, $pop2, $pop3
+	i32.store	a+4($pop8), $pop4
 	block   	
 	i32.const	$push5=, 2242
 	i32.le_s	$push6=, $0, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -40,7 +38,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2241
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -53,7 +51,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %foo.exit
+# %bb.0:                                # %foo.exit
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3384
 	i32.store	b($pop1), $pop0
@@ -85,5 +83,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20020215-1.c.s b/test/torture-s/20020215-1.c.s
index e12c43455..4dc823132 100644
--- a/test/torture-s/20020215-1.c.s
+++ b/test/torture-s/20020215-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($1)
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $pop0, $pop1
@@ -30,7 +30,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020216-1.c.s b/test/torture-s/20020216-1.c.s
index 42e37181c..44e22ce14 100644
--- a/test/torture-s/20020216-1.c.s
+++ b/test/torture-s/20020216-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, c($pop0)
 	i32.const	$push2=, 65535
@@ -24,7 +24,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 0
 	i32.load8_s	$push0=, c($pop5)
@@ -33,7 +33,7 @@ main:                                   # @main
 	i32.const	$push4=, 65535
 	i32.ne  	$push3=, $pop2, $pop4
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
 	unreachable
@@ -54,6 +54,6 @@ c:
 	.size	c, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f33a8b8c2..a72363ac2 100644
--- a/test/torture-s/20020219-1.c.s
+++ b/test/torture-s/20020219-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -9223372036854775808
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020225-1.c.s b/test/torture-s/20020225-1.c.s
index 63f5da613..050114228 100644
--- a/test/torture-s/20020225-1.c.s
+++ b/test/torture-s/20020225-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483647
 	i32.and 	$push1=, $1, $pop0
 	i32.add 	$push2=, $pop1, $0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020225-2.c.s b/test/torture-s/20020225-2.c.s
index 3d24c36e3..a914336b5 100644
--- a/test/torture-s/20020225-2.c.s
+++ b/test/torture-s/20020225-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020226-1.c.s b/test/torture-s/20020226-1.c.s
index 6ced74add..f7f3a7c9b 100644
--- a/test/torture-s/20020226-1.c.s
+++ b/test/torture-s/20020226-1.c.s
@@ -7,169 +7,157 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.load8_u	$push103=, uc($pop2)
-	tee_local	$push102=, $0=, $pop103
+	i32.load	$1=, shift1($pop2)
+	i32.const	$push97=, 0
+	i32.load8_u	$0=, uc($pop97)
 	i32.const	$push4=, 8
-	i32.const	$push101=, 0
-	i32.load	$push100=, shift1($pop101)
-	tee_local	$push99=, $1=, $pop100
-	i32.sub 	$push98=, $pop4, $pop99
-	tee_local	$push97=, $2=, $pop98
-	i32.shl 	$push5=, $pop102, $pop97
+	i32.sub 	$2=, $pop4, $1
+	block   	
+	i32.shl 	$push5=, $0, $2
 	i32.shr_u	$push3=, $0, $1
 	i32.or  	$push6=, $pop5, $pop3
 	i32.const	$push96=, 835
 	i32.ne  	$push7=, $pop6, $pop96
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 4
 	i32.shr_u	$push10=, $0, $pop8
-	i32.const	$push105=, 4
-	i32.shl 	$push9=, $0, $pop105
+	i32.const	$push99=, 4
+	i32.shl 	$push9=, $0, $pop99
 	i32.or  	$push11=, $pop10, $pop9
-	i32.const	$push104=, 835
-	i32.ne  	$push12=, $pop11, $pop104
+	i32.const	$push98=, 835
+	i32.ne  	$push12=, $pop11, $pop98
 	br_if   	0, $pop12       # 0: down to label0
-# BB#2:                                 # %if.end11
-	i32.const	$push14=, 0
-	i32.load16_u	$push110=, us($pop14)
-	tee_local	$push109=, $3=, $pop110
-	i32.shr_u	$push16=, $pop109, $1
+# %bb.2:                                # %if.end11
 	i32.const	$push13=, 16
-	i32.sub 	$push108=, $pop13, $1
-	tee_local	$push107=, $4=, $pop108
-	i32.shl 	$push15=, $3, $pop107
+	i32.sub 	$4=, $pop13, $1
+	i32.const	$push14=, 0
+	i32.load16_u	$3=, us($pop14)
+	i32.shr_u	$push16=, $3, $1
+	i32.shl 	$push15=, $3, $4
 	i32.or  	$push17=, $pop16, $pop15
-	i32.const	$push106=, 19087651
-	i32.ne  	$push18=, $pop17, $pop106
+	i32.const	$push100=, 19087651
+	i32.ne  	$push18=, $pop17, $pop100
 	br_if   	0, $pop18       # 0: down to label0
-# BB#3:                                 # %if.end21
+# %bb.3:                                # %if.end21
 	i32.const	$push21=, 4
 	i32.shr_u	$push22=, $3, $pop21
 	i32.const	$push19=, 12
 	i32.shl 	$push20=, $3, $pop19
 	i32.or  	$push23=, $pop22, $pop20
-	i32.const	$push111=, 19087651
-	i32.ne  	$push24=, $pop23, $pop111
+	i32.const	$push101=, 19087651
+	i32.ne  	$push24=, $pop23, $pop101
 	br_if   	0, $pop24       # 0: down to label0
-# BB#4:                                 # %if.end30
+# %bb.4:                                # %if.end30
 	i32.const	$push26=, 0
-	i32.load	$push114=, ui($pop26)
-	tee_local	$push113=, $5=, $pop114
-	i32.rotr	$push27=, $pop113, $1
-	i32.const	$push112=, 1073742115
-	i32.ne  	$push28=, $pop27, $pop112
+	i32.load	$5=, ui($pop26)
+	i32.rotr	$push27=, $5, $1
+	i32.const	$push102=, 1073742115
+	i32.ne  	$push28=, $pop27, $pop102
 	br_if   	0, $pop28       # 0: down to label0
-# BB#5:                                 # %if.end38
+# %bb.5:                                # %if.end38
 	i32.const	$push29=, 28
 	i32.rotl	$push30=, $5, $pop29
-	i32.const	$push115=, 1073742115
-	i32.ne  	$push31=, $pop30, $pop115
+	i32.const	$push103=, 1073742115
+	i32.ne  	$push31=, $pop30, $pop103
 	br_if   	0, $pop31       # 0: down to label0
-# BB#6:                                 # %if.end45
-	i32.const	$push32=, 0
-	i32.load	$push120=, ul($pop32)
-	tee_local	$push119=, $7=, $pop120
-	i32.shr_u	$push34=, $pop119, $1
+# %bb.6:                                # %if.end45
 	i32.const	$push25=, 32
-	i32.sub 	$push118=, $pop25, $1
-	tee_local	$push117=, $6=, $pop118
-	i32.shl 	$push33=, $7, $pop117
+	i32.sub 	$6=, $pop25, $1
+	i32.const	$push32=, 0
+	i32.load	$7=, ul($pop32)
+	i32.shr_u	$push34=, $7, $1
+	i32.shl 	$push33=, $7, $6
 	i32.or  	$push35=, $pop34, $pop33
-	i32.const	$push116=, -2128394905
-	i32.ne  	$push36=, $pop35, $pop116
+	i32.const	$push104=, -2128394905
+	i32.ne  	$push36=, $pop35, $pop104
 	br_if   	0, $pop36       # 0: down to label0
-# BB#7:                                 # %if.end53
+# %bb.7:                                # %if.end53
 	i32.const	$push37=, 28
 	i32.rotl	$push38=, $7, $pop37
-	i32.const	$push121=, -2128394905
-	i32.ne  	$push39=, $pop38, $pop121
+	i32.const	$push105=, -2128394905
+	i32.ne  	$push39=, $pop38, $pop105
 	br_if   	0, $pop39       # 0: down to label0
-# BB#8:                                 # %if.end60
+# %bb.8:                                # %if.end60
+	i64.extend_u/i32	$9=, $1
 	i32.const	$push40=, 0
-	i64.load	$push126=, ull($pop40)
-	tee_local	$push125=, $8=, $pop126
-	i64.extend_u/i32	$push124=, $1
-	tee_local	$push123=, $9=, $pop124
-	i64.rotr	$push41=, $pop125, $pop123
-	i64.const	$push122=, 5124095577148911
-	i64.ne  	$push42=, $pop41, $pop122
+	i64.load	$8=, ull($pop40)
+	i64.rotr	$push41=, $8, $9
+	i64.const	$push106=, 5124095577148911
+	i64.ne  	$push42=, $pop41, $pop106
 	br_if   	0, $pop42       # 0: down to label0
-# BB#9:                                 # %if.end69
+# %bb.9:                                # %if.end69
 	i64.const	$push45=, 60
 	i64.rotl	$push46=, $8, $pop45
-	i64.const	$push127=, 5124095577148911
-	i64.ne  	$push47=, $pop46, $pop127
+	i64.const	$push107=, 5124095577148911
+	i64.ne  	$push47=, $pop46, $pop107
 	br_if   	0, $pop47       # 0: down to label0
-# BB#10:                                # %if.end76
+# %bb.10:                               # %if.end76
 	i32.const	$push48=, 0
-	i32.load	$push132=, shift2($pop48)
-	tee_local	$push131=, $11=, $pop132
-	i64.extend_u/i32	$push130=, $pop131
-	tee_local	$push129=, $10=, $pop130
-	i64.rotr	$push49=, $8, $pop129
-	i64.const	$push128=, 1311768467750121216
-	i64.ne  	$push50=, $pop49, $pop128
+	i32.load	$11=, shift2($pop48)
+	i64.extend_u/i32	$10=, $11
+	i64.rotr	$push49=, $8, $10
+	i64.const	$push108=, 1311768467750121216
+	i64.ne  	$push50=, $pop49, $pop108
 	br_if   	0, $pop50       # 0: down to label0
-# BB#11:                                # %if.end86
+# %bb.11:                               # %if.end86
 	i64.const	$push53=, 4
 	i64.rotl	$push54=, $8, $pop53
-	i64.const	$push133=, 1311768467750121216
-	i64.ne  	$push55=, $pop54, $pop133
+	i64.const	$push109=, 1311768467750121216
+	i64.ne  	$push55=, $pop54, $pop109
 	br_if   	0, $pop55       # 0: down to label0
-# BB#12:                                # %if.end93
+# %bb.12:                               # %if.end93
 	i32.shr_u	$push57=, $0, $2
 	i32.shl 	$push56=, $0, $1
 	i32.or  	$push58=, $pop57, $pop56
 	i32.const	$push59=, 835
 	i32.ne  	$push60=, $pop58, $pop59
 	br_if   	0, $pop60       # 0: down to label0
-# BB#13:                                # %if.end112
+# %bb.13:                               # %if.end112
 	i32.shl 	$push62=, $3, $1
 	i32.shr_u	$push61=, $3, $4
 	i32.or  	$push63=, $pop62, $pop61
-	i32.const	$push134=, 74561
-	i32.ne  	$push64=, $pop63, $pop134
+	i32.const	$push110=, 74561
+	i32.ne  	$push64=, $pop63, $pop110
 	br_if   	0, $pop64       # 0: down to label0
-# BB#14:                                # %if.end122
+# %bb.14:                               # %if.end122
 	i32.const	$push67=, 4
 	i32.shl 	$push68=, $3, $pop67
 	i32.const	$push65=, 12
 	i32.shr_u	$push66=, $3, $pop65
 	i32.or  	$push69=, $pop68, $pop66
-	i32.const	$push135=, 74561
-	i32.ne  	$push70=, $pop69, $pop135
+	i32.const	$push111=, 74561
+	i32.ne  	$push70=, $pop69, $pop111
 	br_if   	0, $pop70       # 0: down to label0
-# BB#15:                                # %if.end131
+# %bb.15:                               # %if.end131
 	i32.shl 	$push72=, $5, $1
 	i32.shr_u	$push71=, $5, $6
 	i32.or  	$push73=, $pop72, $pop71
-	i32.const	$push136=, 74560
-	i32.ne  	$push74=, $pop73, $pop136
+	i32.const	$push112=, 74560
+	i32.ne  	$push74=, $pop73, $pop112
 	br_if   	0, $pop74       # 0: down to label0
-# BB#16:                                # %if.end139
+# %bb.16:                               # %if.end139
 	i32.const	$push75=, 4
 	i32.rotl	$push76=, $5, $pop75
-	i32.const	$push137=, 74560
-	i32.ne  	$push77=, $pop76, $pop137
+	i32.const	$push113=, 74560
+	i32.ne  	$push77=, $pop76, $pop113
 	br_if   	0, $pop77       # 0: down to label0
-# BB#17:                                # %if.end146
+# %bb.17:                               # %if.end146
 	i32.shl 	$push79=, $7, $1
 	i32.shr_u	$push78=, $7, $6
 	i32.or  	$push80=, $pop79, $pop78
-	i32.const	$push138=, 591751041
-	i32.ne  	$push81=, $pop80, $pop138
+	i32.const	$push114=, 591751041
+	i32.ne  	$push81=, $pop80, $pop114
 	br_if   	0, $pop81       # 0: down to label0
-# BB#18:                                # %if.end154
+# %bb.18:                               # %if.end154
 	i32.const	$push82=, 4
 	i32.rotl	$push83=, $7, $pop82
-	i32.const	$push139=, 591751041
-	i32.ne  	$push84=, $pop83, $pop139
+	i32.const	$push115=, 591751041
+	i32.ne  	$push84=, $pop83, $pop115
 	br_if   	0, $pop84       # 0: down to label0
-# BB#19:                                # %if.end161
+# %bb.19:                               # %if.end161
 	i64.shl 	$push86=, $8, $9
 	i32.const	$push43=, 64
 	i32.sub 	$push44=, $pop43, $1
@@ -179,7 +167,7 @@ main:                                   # @main
 	i64.const	$push88=, 1311768467750121216
 	i64.ne  	$push89=, $pop87, $pop88
 	br_if   	0, $pop89       # 0: down to label0
-# BB#20:                                # %if.end178
+# %bb.20:                               # %if.end178
 	i32.const	$push51=, 64
 	i32.sub 	$push52=, $pop51, $11
 	i64.extend_u/i32	$push1=, $pop52
@@ -189,7 +177,7 @@ main:                                   # @main
 	i64.const	$push93=, 5124095577148911
 	i64.ne  	$push94=, $pop92, $pop93
 	br_if   	0, $pop94       # 0: down to label0
-# BB#21:                                # %if.end195
+# %bb.21:                               # %if.end195
 	i32.const	$push95=, 0
 	call    	exit@FUNCTION, $pop95
 	unreachable
@@ -264,6 +252,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 87d486911..a68000749 100644
--- a/test/torture-s/20020227-1.c.s
+++ b/test/torture-s/20020227-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -19,7 +19,7 @@ main:                                   # @main
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
-# BB#0:                                 # %f2.exit
+# %bb.0:                                # %f2.exit
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -31,25 +31,25 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.load	$push1=, 1($0):p2align=0
 	f32.const	$push2=, 0x1p0
 	f32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push4=, 5
 	i32.add 	$push5=, $0, $pop4
 	f32.load	$push0=, 0($pop5):p2align=0
 	f32.const	$push6=, 0x0p0
 	f32.ne  	$push7=, $pop0, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.load8_u	$push8=, 0($0)
 	i32.const	$push9=, 42
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB2_4:                                # %if.then
 	end_block                       # label0:
@@ -60,6 +60,6 @@ f2:                                     # @f2
 	.size	f2, .Lfunc_end2-f2
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7dd1ae2c9..36f5f4ce4 100644
--- a/test/torture-s/20020307-1.c.s
+++ b/test/torture-s/20020307-1.c.s
@@ -6,14 +6,14 @@
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 6
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push3=, 6
 	i32.eq  	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,14 +29,14 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 14
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
@@ -52,14 +52,14 @@ f4:                                     # @f4
 	.type	f5,@function
 f5:                                     # @f5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 30
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 18
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label2:
@@ -75,14 +75,14 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 62
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 34
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB3_2:                                # %if.then
 	end_block                       # label3:
@@ -98,14 +98,14 @@ f6:                                     # @f6
 	.type	f7,@function
 f7:                                     # @f7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 126
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 66
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label4
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB4_2:                                # %if.then
 	end_block                       # label4:
@@ -121,14 +121,14 @@ f7:                                     # @f7
 	.type	f8,@function
 f8:                                     # @f8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 254
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 130
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label5
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB5_2:                                # %if.then
 	end_block                       # label5:
@@ -144,14 +144,14 @@ f8:                                     # @f8
 	.type	f9,@function
 f9:                                     # @f9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 510
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 258
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label6
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB6_2:                                # %if.then
 	end_block                       # label6:
@@ -167,14 +167,14 @@ f9:                                     # @f9
 	.type	f10,@function
 f10:                                    # @f10
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1022
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 514
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label7
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB7_2:                                # %if.then
 	end_block                       # label7:
@@ -190,14 +190,14 @@ f10:                                    # @f10
 	.type	f11,@function
 f11:                                    # @f11
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 2046
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 1026
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label8
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB8_2:                                # %if.then
 	end_block                       # label8:
@@ -213,14 +213,14 @@ f11:                                    # @f11
 	.type	f12,@function
 f12:                                    # @f12
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 4094
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 2050
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label9
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB9_2:                                # %if.then
 	end_block                       # label9:
@@ -236,14 +236,14 @@ f12:                                    # @f12
 	.type	f13,@function
 f13:                                    # @f13
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 8190
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 4098
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label10
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB10_2:                               # %if.then
 	end_block                       # label10:
@@ -259,14 +259,14 @@ f13:                                    # @f13
 	.type	f14,@function
 f14:                                    # @f14
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 16382
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 8194
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label11
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB11_2:                               # %if.then
 	end_block                       # label11:
@@ -282,14 +282,14 @@ f14:                                    # @f14
 	.type	f15,@function
 f15:                                    # @f15
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 32766
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 16386
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label12
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB12_2:                               # %if.then
 	end_block                       # label12:
@@ -305,14 +305,14 @@ f15:                                    # @f15
 	.type	f16,@function
 f16:                                    # @f16
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 65534
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 32770
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label13
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB13_2:                               # %if.then
 	end_block                       # label13:
@@ -328,14 +328,14 @@ f16:                                    # @f16
 	.type	f17,@function
 f17:                                    # @f17
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 131070
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 65538
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label14
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB14_2:                               # %if.then
 	end_block                       # label14:
@@ -351,14 +351,14 @@ f17:                                    # @f17
 	.type	f18,@function
 f18:                                    # @f18
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 262142
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 131074
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label15
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB15_2:                               # %if.then
 	end_block                       # label15:
@@ -374,14 +374,14 @@ f18:                                    # @f18
 	.type	f19,@function
 f19:                                    # @f19
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 524286
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 262146
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label16
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB16_2:                               # %if.then
 	end_block                       # label16:
@@ -397,14 +397,14 @@ f19:                                    # @f19
 	.type	f20,@function
 f20:                                    # @f20
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1048574
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 524290
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label17
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB17_2:                               # %if.then
 	end_block                       # label17:
@@ -420,14 +420,14 @@ f20:                                    # @f20
 	.type	f21,@function
 f21:                                    # @f21
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 2097150
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 1048578
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label18
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB18_2:                               # %if.then
 	end_block                       # label18:
@@ -443,14 +443,14 @@ f21:                                    # @f21
 	.type	f22,@function
 f22:                                    # @f22
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 4194302
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 2097154
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label19
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB19_2:                               # %if.then
 	end_block                       # label19:
@@ -466,14 +466,14 @@ f22:                                    # @f22
 	.type	f23,@function
 f23:                                    # @f23
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 8388606
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 4194306
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label20
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB20_2:                               # %if.then
 	end_block                       # label20:
@@ -489,14 +489,14 @@ f23:                                    # @f23
 	.type	f24,@function
 f24:                                    # @f24
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 16777214
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 8388610
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label21
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB21_2:                               # %if.then
 	end_block                       # label21:
@@ -512,14 +512,14 @@ f24:                                    # @f24
 	.type	f25,@function
 f25:                                    # @f25
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 33554430
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 16777218
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label22
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB22_2:                               # %if.then
 	end_block                       # label22:
@@ -535,14 +535,14 @@ f25:                                    # @f25
 	.type	f26,@function
 f26:                                    # @f26
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 67108862
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 33554434
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label23
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB23_2:                               # %if.then
 	end_block                       # label23:
@@ -558,14 +558,14 @@ f26:                                    # @f26
 	.type	f27,@function
 f27:                                    # @f27
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 134217726
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 67108866
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label24
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB24_2:                               # %if.then
 	end_block                       # label24:
@@ -581,14 +581,14 @@ f27:                                    # @f27
 	.type	f28,@function
 f28:                                    # @f28
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 268435454
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 134217730
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label25
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB25_2:                               # %if.then
 	end_block                       # label25:
@@ -604,14 +604,14 @@ f28:                                    # @f28
 	.type	f29,@function
 f29:                                    # @f29
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 536870910
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 268435458
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label26
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB26_2:                               # %if.then
 	end_block                       # label26:
@@ -627,14 +627,14 @@ f29:                                    # @f29
 	.type	f30,@function
 f30:                                    # @f30
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1073741822
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 536870914
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label27
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB27_2:                               # %if.then
 	end_block                       # label27:
@@ -650,14 +650,14 @@ f30:                                    # @f30
 	.type	f31,@function
 f31:                                    # @f31
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 2147483646
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 1073741826
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label28
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB28_2:                               # %if.then
 	end_block                       # label28:
@@ -673,7 +673,7 @@ f31:                                    # @f31
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -682,6 +682,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end29-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b038d0b21..79e075c90 100644
--- a/test/torture-s/20020314-1.c.s
+++ b/test/torture-s/20020314-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,7 +19,7 @@ f:                                      # @f
 g:                                      # @g
 	.param  	f64, f64, f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.add 	$push1=, $0, $1
 	f64.mul 	$push0=, $2, $3
 	f64.mul 	$push2=, $pop1, $pop0
@@ -36,7 +36,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -45,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020320-1.c.s b/test/torture-s/20020320-1.c.s
index 41ee35ea6..31a72fa1d 100644
--- a/test/torture-s/20020320-1.c.s
+++ b/test/torture-s/20020320-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020321-1.c.s b/test/torture-s/20020321-1.c.s
index 5cf581c00..c5cec18c2 100644
--- a/test/torture-s/20020321-1.c.s
+++ b/test/torture-s/20020321-1.c.s
@@ -7,7 +7,7 @@
 g:                                      # @g
 	.param  	i32, i32, i32, i32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $4
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ g:                                      # @g
 f:                                      # @f
 	.param  	i32, i32, i32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $3
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -42,4 +42,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020328-1.c.s b/test/torture-s/20020328-1.c.s
index 0e0e3d545..2eb8b9379 100644
--- a/test/torture-s/20020328-1.c.s
+++ b/test/torture-s/20020328-1.c.s
@@ -7,7 +7,7 @@
 func:                                   # @func
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,12 +20,12 @@ func:                                   # @func
 	.type	testit,@function
 testit:                                 # @testit
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 20
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -41,7 +41,7 @@ testit:                                 # @testit
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -59,6 +59,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 dd2666444..46071134d 100644
--- a/test/torture-s/20020402-1.c.s
+++ b/test/torture-s/20020402-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end34
+# %bb.0:                                # %if.end34
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020402-2.c.s b/test/torture-s/20020402-2.c.s
index fb3357d2d..71dbcc0da 100644
--- a/test/torture-s/20020402-2.c.s
+++ b/test/torture-s/20020402-2.c.s
@@ -6,7 +6,7 @@
 	.type	InitCache,@function
 InitCache:                              # @InitCache
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	MyPte+4($pop0), $0
 	i32.const	$push74=, 0
@@ -132,7 +132,7 @@ InitCache:                              # @InitCache
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 5
 	i32.store	MyPte+12($pop1), $pop0
@@ -488,4 +488,4 @@ MyPte:
 	.size	MyPte, 392
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020402-3.c.s b/test/torture-s/20020402-3.c.s
index 5d211f59a..caff7996b 100644
--- a/test/torture-s/20020402-3.c.s
+++ b/test/torture-s/20020402-3.c.s
@@ -7,92 +7,84 @@
 blockvector_for_pc_sect:                # @blockvector_for_pc_sect
 	.param  	i64, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$7=, 0
+	.local  	i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($1)
+	i32.load	$3=, 0($2)
+	i32.const	$1=, 0
 	block   	
 	block   	
-	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
+	i32.const	$push18=, 2
+	i32.lt_s	$push0=, $3, $pop18
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %while.body.preheader
-	i32.const	$7=, 0
-	copy_local	$6=, $1
+# %bb.1:                                # %while.body.preheader
+	i32.const	$1=, 0
+	copy_local	$5=, $3
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	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	$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	$push23=, 1
+	i32.add 	$push1=, $3, $pop23
 	i32.const	$push22=, 1
-	i32.gt_s	$push7=, $pop23, $pop22
-	br_if   	0, $pop7        # 0: up to label2
-# BB#3:                                 # %while.end
+	i32.shr_s	$push2=, $pop1, $pop22
+	i32.add 	$3=, $pop2, $1
+	i32.const	$push21=, 2
+	i32.shl 	$push3=, $3, $pop21
+	i32.add 	$push4=, $2, $pop3
+	i32.const	$push20=, 4
+	i32.add 	$push5=, $pop4, $pop20
+	i32.load	$push6=, 0($pop5)
+	i64.load	$push7=, 0($pop6)
+	i64.gt_u	$4=, $pop7, $0
+	i32.select	$1=, $1, $3, $4
+	i32.select	$5=, $3, $5, $4
+	i32.sub 	$3=, $5, $1
+	i32.const	$push19=, 1
+	i32.gt_s	$push8=, $3, $pop19
+	br_if   	0, $pop8        # 0: up to label2
+# %bb.3:                                # %while.end
 	end_loop
-	i32.const	$1=, 0
-	i32.const	$push35=, 0
-	i32.lt_s	$push8=, $7, $pop35
-	br_if   	1, $pop8        # 1: down to label0
+	i32.const	$3=, 0
+	i32.const	$push24=, 0
+	i32.lt_s	$push9=, $1, $pop24
+	br_if   	1, $pop9        # 1: down to label0
 .LBB0_4:                                # %while.body10.preheader
 	end_block                       # label1:
-	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
+	i32.const	$push26=, 1
+	i32.add 	$3=, $1, $pop26
+	i32.const	$push25=, 2
+	i32.shl 	$push10=, $1, $pop25
+	i32.add 	$push11=, $2, $pop10
+	i32.const	$push12=, 4
+	i32.add 	$1=, $pop11, $pop12
 .LBB0_5:                                # %while.body10
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	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
+	i32.load	$push13=, 0($1)
+	i64.load	$push14=, 8($pop13)
+	i64.gt_u	$push15=, $pop14, $0
+	br_if   	1, $pop15       # 1: down to label3
+# %bb.6:                                # %while.cond8
                                         #   in Loop: Header=BB0_5 Depth=1
-	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:
+	i32.const	$push29=, -4
+	i32.add 	$1=, $1, $pop29
+	i32.const	$push28=, -1
+	i32.add 	$3=, $3, $pop28
+	i32.const	$push27=, 1
+	i32.ge_s	$push16=, $3, $pop27
+	br_if   	0, $pop16       # 0: up to label4
+# %bb.7:
 	end_loop
-	i32.const	$push16=, 0
-	return  	$pop16
+	i32.const	$push17=, 0
+	return  	$pop17
 .LBB0_8:
 	end_block                       # label3:
-	copy_local	$1=, $2
+	copy_local	$3=, $2
 .LBB0_9:                                # %cleanup
 	end_block                       # label0:
-	copy_local	$push43=, $1
-                                        # fallthrough-return: $pop43
+	copy_local	$push30=, $3
+                                        # fallthrough-return: $pop30
 	.endfunc
 .Lfunc_end0:
 	.size	blockvector_for_pc_sect, .Lfunc_end0-blockvector_for_pc_sect
@@ -103,7 +95,7 @@ blockvector_for_pc_sect:                # @blockvector_for_pc_sect
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -111,4 +103,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020404-1.c.s b/test/torture-s/20020404-1.c.s
index 26344bb7d..007f43b5a 100644
--- a/test/torture-s/20020404-1.c.s
+++ b/test/torture-s/20020404-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	dump_bfd_file@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -18,34 +18,25 @@ main:                                   # @main
 	.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	$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.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($pop7), $pop5
+# %bb.0:                                # %entry
+	i32.const	$push0=, 0
+	i32.const	$push4=, 0
+	i32.load8_u	$push1=, bfd_make_section_anyway.foo_section.0($pop4)
+	i32.const	$push2=, 1
+	i32.or  	$push3=, $pop1, $pop2
+	i32.store8	bfd_make_section_anyway.foo_section.0($pop0), $pop3
                                         # fallthrough-return
 	.endfunc
 .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
+	.type	bfd_make_section_anyway.foo_section.0,@object # @bfd_make_section_anyway.foo_section.0
+	.section	.bss.bfd_make_section_anyway.foo_section.0,"aw",@nobits
 	.p2align	3
-bfd_make_section_anyway.foo_section:
-	.skip	32
-	.size	bfd_make_section_anyway.foo_section, 32
+bfd_make_section_anyway.foo_section.0:
+	.int8	0                       # 0x0
+	.size	bfd_make_section_anyway.foo_section.0, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020406-1.c.s b/test/torture-s/20020406-1.c.s
index ffae922b7..5d865e9c5 100644
--- a/test/torture-s/20020406-1.c.s
+++ b/test/torture-s/20020406-1.c.s
@@ -7,7 +7,7 @@
 FFmul:                                  # @FFmul
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ FFmul:                                  # @FFmul
 DUPFFdeg:                               # @DUPFFdeg
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($0)
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -36,17 +36,16 @@ DUPFFnew:                               # @DUPFFnew
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
-	i32.call	$push12=, malloc@FUNCTION, $pop0
-	tee_local	$push11=, $1=, $pop12
+	i32.call	$1=, malloc@FUNCTION, $pop0
 	i32.const	$push1=, 0
-	i32.store	8($pop11), $pop1
+	i32.store	8($1), $pop1
 	block   	
 	i32.const	$push10=, 0
 	i32.lt_s	$push2=, $0, $pop10
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push3=, 8
 	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 1
@@ -59,8 +58,8 @@ DUPFFnew:                               # @DUPFFnew
 	i32.const	$push9=, -1
 	i32.store	4($1), $pop9
 	i32.store	0($1), $0
-	copy_local	$push13=, $1
-                                        # fallthrough-return: $pop13
+	copy_local	$push11=, $1
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end2:
 	.size	DUPFFnew, .Lfunc_end2-DUPFFnew
@@ -71,7 +70,7 @@ DUPFFnew:                               # @DUPFFnew
 	.type	DUPFFfree,@function
 DUPFFfree:                              # @DUPFFfree
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -83,7 +82,7 @@ DUPFFfree:                              # @DUPFFfree
 	.type	DUPFFswap,@function
 DUPFFswap:                              # @DUPFFswap
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
@@ -96,7 +95,7 @@ DUPFFswap:                              # @DUPFFswap
 DUPFFcopy:                              # @DUPFFcopy
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -109,7 +108,7 @@ DUPFFcopy:                              # @DUPFFcopy
 	.type	DUPFFshift_add,@function
 DUPFFshift_add:                         # @DUPFFshift_add
 	.param  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -123,14 +122,13 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	i32.const	$push18=, 0
 	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push25=, $pop17, $pop19
-	tee_local	$push24=, $8=, $pop25
-	i32.store	__stack_pointer($pop20), $pop24
+	i32.sub 	$8=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $8
 	i32.load	$6=, 4($3)
 	i32.load	$7=, 4($2)
 .LBB7_1:                                # %tailrecurse
@@ -142,64 +140,59 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	copy_local	$1=, $0
 	i32.store	4($8), $6
 	i32.store	0($8), $7
-	i32.const	$push30=, .L.str
-	i32.call	$drop=, printf@FUNCTION, $pop30, $8
+	i32.const	$push24=, .L.str
+	i32.call	$drop=, printf@FUNCTION, $pop24, $8
+	i32.load	$7=, 4($5)
+	i32.load	$6=, 4($3)
 	copy_local	$0=, $4
 	copy_local	$2=, $5
-	i32.load	$push29=, 4($3)
-	tee_local	$push28=, $6=, $pop29
-	i32.load	$push27=, 4($5)
-	tee_local	$push26=, $7=, $pop27
-	i32.lt_s	$push1=, $pop28, $pop26
+	i32.lt_s	$push1=, $6, $7
 	br_if   	0, $pop1        # 0: up to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	end_loop
 	block   	
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $6, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push4=, 1
 	i32.ne  	$push5=, $7, $pop4
 	br_if   	0, $pop5        # 0: down to label2
-# BB#4:                                 # %if.end11
+# %bb.4:                                # %if.end11
 	block   	
 	i32.load	$push6=, 8($3)
 	i32.load	$push7=, 0($pop6)
-	i32.eqz 	$push43=, $pop7
-	br_if   	0, $pop43       # 0: down to label3
-# BB#5:                                 # %DUPFFnew.exit
+	i32.eqz 	$push31=, $pop7
+	br_if   	0, $pop31       # 0: down to label3
+# %bb.5:                                # %DUPFFnew.exit
 	i32.const	$push8=, 12
-	i32.call	$push41=, malloc@FUNCTION, $pop8
-	tee_local	$push40=, $6=, $pop41
+	i32.call	$6=, malloc@FUNCTION, $pop8
 	i32.const	$push9=, 2
-	i32.const	$push39=, 4
-	i32.call	$push38=, calloc@FUNCTION, $pop9, $pop39
-	tee_local	$push37=, $2=, $pop38
-	i32.store	8($pop40), $pop37
+	i32.const	$push29=, 4
+	i32.call	$7=, calloc@FUNCTION, $pop9, $pop29
+	i32.store	8($6), $7
 	i32.const	$push10=, 1
-	i32.store	0($2), $pop10
+	i32.store	0($7), $pop10
 	i64.const	$push11=, 1
 	i64.store	0($6):p2align=2, $pop11
-	i32.const	$push36=, 12
-	i32.call	$2=, malloc@FUNCTION, $pop36
+	i32.const	$push28=, 12
+	i32.call	$7=, malloc@FUNCTION, $pop28
 	i32.const	$push12=, 3
-	i32.const	$push35=, 4
-	i32.call	$7=, calloc@FUNCTION, $pop12, $pop35
+	i32.const	$push27=, 4
+	i32.call	$2=, calloc@FUNCTION, $pop12, $pop27
 	i64.const	$push13=, -4294967294
-	i64.store	0($2):p2align=2, $pop13
-	i32.store	8($2), $7
+	i64.store	0($7):p2align=2, $pop13
+	i32.store	8($7), $2
+	i32.const	$push26=, 4
+	i32.add 	$push14=, $5, $pop26
+	i32.load	$5=, 0($pop14)
 	block   	
-	i32.const	$push34=, 4
-	i32.add 	$push14=, $5, $pop34
-	i32.load	$push33=, 0($pop14)
-	tee_local	$push32=, $5=, $pop33
-	i32.const	$push31=, 1
-	i32.lt_s	$push15=, $pop32, $pop31
+	i32.const	$push25=, 1
+	i32.lt_s	$push15=, $5, $pop25
 	br_if   	0, $pop15       # 0: down to label4
-# BB#6:                                 # %while.body.lr.ph
-	i32.const	$push42=, 4
-	i32.add 	$push16=, $3, $pop42
+# %bb.6:                                # %while.body.lr.ph
+	i32.const	$push30=, 4
+	i32.add 	$push16=, $3, $pop30
 	i32.load	$push0=, 0($pop16)
 	i32.lt_s	$3=, $pop0, $5
 .LBB7_7:                                # %while.body
@@ -215,7 +208,7 @@ DUPFFexgcd:                             # @DUPFFexgcd
 	end_loop
 	end_block                       # label4:
 	i32.store	0($1), $6
-	i32.store	0($4), $2
+	i32.store	0($4), $7
 .LBB7_10:                               # %cleanup
 	end_block                       # label3:
 	i32.const	$push23=, 0
@@ -238,34 +231,29 @@ DUPFFexgcd:                             # @DUPFFexgcd
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	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($pop13), $pop32
+	i32.sub 	$3=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $3
 	i32.const	$push0=, 12
-	i32.call	$push31=, malloc@FUNCTION, $pop0
-	tee_local	$push30=, $0=, $pop31
+	i32.call	$0=, malloc@FUNCTION, $pop0
 	i32.const	$push2=, 2
 	i32.const	$push1=, 4
-	i32.call	$push29=, calloc@FUNCTION, $pop2, $pop1
-	tee_local	$push28=, $1=, $pop29
-	i32.store	8($pop30), $pop28
+	i32.call	$1=, calloc@FUNCTION, $pop2, $pop1
+	i32.store	8($0), $1
 	i32.const	$push3=, 1
 	i32.store	4($1), $pop3
 	i64.const	$push4=, 4294967297
 	i64.store	0($0):p2align=2, $pop4
-	i32.const	$push27=, 12
-	i32.call	$push26=, malloc@FUNCTION, $pop27
-	tee_local	$push25=, $1=, $pop26
+	i32.const	$push23=, 12
+	i32.call	$1=, malloc@FUNCTION, $pop23
 	i32.const	$push5=, 3
-	i32.const	$push24=, 4
-	i32.call	$push23=, calloc@FUNCTION, $pop5, $pop24
-	tee_local	$push22=, $2=, $pop23
-	i32.store	8($pop25), $pop22
+	i32.const	$push22=, 4
+	i32.call	$2=, calloc@FUNCTION, $pop5, $pop22
+	i32.store	8($1), $2
 	i32.const	$push21=, 1
 	i32.store	8($2), $pop21
 	i64.const	$push6=, 8589934594
@@ -301,7 +289,7 @@ main:                                   # @main
 	.size	.L.str.1, 41
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1e48f4b1f..7f0b4cf61 100644
--- a/test/torture-s/20020411-1.c.s
+++ b/test/torture-s/20020411-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -4647714814380998656
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020413-1.c.s b/test/torture-s/20020413-1.c.s
index 69d8dd1b4..b141be3a6 100644
--- a/test/torture-s/20020413-1.c.s
+++ b/test/torture-s/20020413-1.c.s
@@ -7,128 +7,120 @@
 test:                                   # @test
 	.param  	i64, i64, i32
 	.local  	i64, i64, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push23=, 0
+	i32.load	$push22=, __stack_pointer($pop23)
+	i32.const	$push24=, 48
+	i32.sub 	$7=, $pop22, $pop24
+	i32.const	$push25=, 0
+	i32.store	__stack_pointer($pop25), $7
+	i32.const	$push29=, 32
+	i32.add 	$push30=, $7, $pop29
+	i64.const	$push39=, 0
 	i64.const	$push0=, -9223372036854775808
-	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
+	call    	__subtf3@FUNCTION, $pop30, $pop39, $pop0, $0, $1
 	i32.const	$6=, 0
+	i64.const	$push38=, 0
+	i64.const	$push37=, 0
+	i32.call	$push1=, __lttf2@FUNCTION, $0, $1, $pop38, $pop37
+	i32.const	$push36=, 0
+	i32.lt_s	$5=, $pop1, $pop36
+	i32.const	$push2=, 40
+	i32.add 	$push3=, $7, $pop2
+	i64.load	$push4=, 0($pop3)
+	i64.select	$4=, $pop4, $1, $5
+	i64.load	$push5=, 32($7)
+	i64.select	$3=, $pop5, $0, $5
 	block   	
 	block   	
 	block   	
-	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	$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	$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	$push35=, 0
+	i64.const	$push34=, 4611404543450677248
+	i32.call	$push6=, __getf2@FUNCTION, $3, $4, $pop35, $pop34
+	i32.const	$push33=, 0
+	i32.ge_s	$push7=, $pop6, $pop33
+	br_if   	0, $pop7        # 0: down to label2
+# %bb.1:                                # %if.else
+	i64.const	$push41=, 0
+	i64.const	$push40=, 0
+	i32.call	$push14=, __eqtf2@FUNCTION, $3, $4, $pop41, $pop40
+	i32.eqz 	$push55=, $pop14
+	br_if   	1, $pop55       # 1: down to label1
+# %bb.2:                                # %if.else
 	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
+	i64.const	$push43=, 0
+	i64.const	$push42=, 4611404543450677248
+	i32.call	$push15=, __lttf2@FUNCTION, $3, $4, $pop43, $pop42
+	i32.const	$push16=, -1
+	i32.gt_s	$push17=, $pop15, $pop16
+	br_if   	1, $pop17       # 1: down to label1
+# %bb.3:                                # %while.body11.preheader
+	i32.const	$push19=, 8
+	i32.add 	$5=, $7, $pop19
 	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
+	i32.const	$push44=, 10
+	i32.ge_u	$push18=, $6, $pop44
+	br_if   	3, $pop18       # 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
+	i64.const	$push48=, 0
+	i64.const	$push47=, 4611123068473966592
+	call    	__multf3@FUNCTION, $7, $1, $0, $pop48, $pop47
+	i64.load	$0=, 0($5)
+	i64.load	$1=, 0($7)
+	i32.const	$push46=, 1
+	i32.add 	$6=, $6, $pop46
+	i32.call	$push20=, __lttf2@FUNCTION, $3, $4, $1, $0
+	i32.const	$push45=, 0
+	i32.lt_s	$push21=, $pop20, $pop45
+	br_if   	0, $pop21       # 0: up to label3
 	br      	2               # 2: down to label1
 .LBB0_6:                                # %if.then2
 	end_loop
 	end_block                       # label2:
-	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	$push51=, 0
+	i64.const	$push50=, 4611404543450677248
+	i32.call	$push8=, __gttf2@FUNCTION, $3, $4, $pop51, $pop50
+	i32.const	$push49=, 1
+	i32.lt_s	$push9=, $pop8, $pop49
+	br_if   	0, $pop9        # 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	$push11=, 24
+	i32.add 	$5=, $7, $pop11
 	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
+	i32.const	$push52=, 10
+	i32.ge_u	$push10=, $6, $pop52
+	br_if   	2, $pop10       # 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
+	i32.const	$push31=, 16
+	i32.add 	$push32=, $7, $pop31
+	call    	__addtf3@FUNCTION, $pop32, $1, $0, $1, $0
+	i64.load	$0=, 0($5)
+	i64.load	$1=, 16($7)
+	i32.const	$push54=, 1
+	i32.add 	$6=, $6, $pop54
+	i32.call	$push12=, __lttf2@FUNCTION, $1, $0, $3, $4
+	i32.const	$push53=, 0
+	i32.lt_s	$push13=, $pop12, $pop53
+	br_if   	0, $pop13       # 0: up to label4
 .LBB0_10:                               # %if.end18
 	end_loop
 	end_block                       # label1:
 	i32.store	0($2), $6
-	i32.const	$push27=, 0
-	i32.const	$push25=, 48
-	i32.add 	$push26=, $7, $pop25
-	i32.store	__stack_pointer($pop27), $pop26
+	i32.const	$push28=, 0
+	i32.const	$push26=, 48
+	i32.add 	$push27=, $7, $pop26
+	i32.store	__stack_pointer($pop28), $pop27
 	return
 .LBB0_11:                               # %if.then5
 	end_block                       # label0:
@@ -145,14 +137,13 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push22=, $pop6, $pop8
-	tee_local	$push21=, $0=, $pop22
-	i32.store	__stack_pointer($pop9), $pop21
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i64.const	$push1=, 0
 	i64.const	$push0=, 4611826755915743232
 	i32.const	$push10=, 12
@@ -181,6 +172,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3b4ce2e36..3bec3b79a 100644
--- a/test/torture-s/20020418-1.c.s
+++ b/test/torture-s/20020418-1.c.s
@@ -7,23 +7,22 @@
 gcc_crash:                              # @gcc_crash
 	.param  	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	block   	
-	i32.load	$push4=, 0($0)
-	tee_local	$push3=, $2=, $pop4
 	i32.const	$push0=, 51
-	i32.le_s	$push1=, $pop3, $pop0
+	i32.le_s	$push1=, $2, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 60
 	i32.gt_s	$1=, $2, $pop2
 .LBB0_2:                                # %top
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push5=, 1
-	i32.add 	$2=, $2, $pop5
+	i32.const	$push3=, 1
+	i32.add 	$2=, $2, $pop3
 	br_if   	0, $1           # 0: up to label1
-# BB#3:                                 # %if.end6
+# %bb.3:                                # %if.end6
 	end_loop
 	i32.store	0($0), $2
 	return
@@ -41,7 +40,7 @@ gcc_crash:                              # @gcc_crash
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %gcc_crash.exit
+# %bb.0:                                # %gcc_crash.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -50,5 +49,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020423-1.c.s b/test/torture-s/20020423-1.c.s
index f488535f4..a057ce3f8 100644
--- a/test/torture-s/20020423-1.c.s
+++ b/test/torture-s/20020423-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020503-1.c.s b/test/torture-s/20020503-1.c.s
index ecbeafaad..3eab5086b 100644
--- a/test/torture-s/20020503-1.c.s
+++ b/test/torture-s/20020503-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020506-1.c.s b/test/torture-s/20020506-1.c.s
index 43ab1cdc2..32fc645eb 100644
--- a/test/torture-s/20020506-1.c.s
+++ b/test/torture-s/20020506-1.c.s
@@ -6,14 +6,14 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label1
 	br      	2               # 2: down to label0
 .LBB0_2:                                # %if.else
@@ -36,7 +36,7 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -47,7 +47,7 @@ test2:                                  # @test2
 	i32.const	$push3=, 0
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label5
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label4
 	br      	2               # 2: down to label3
 .LBB1_2:                                # %if.else
@@ -70,14 +70,14 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label8
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label7
 	br      	2               # 2: down to label6
 .LBB2_2:                                # %if.else
@@ -100,7 +100,7 @@ test3:                                  # @test3
 	.type	test4,@function
 test4:                                  # @test4
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -111,7 +111,7 @@ test4:                                  # @test4
 	i32.const	$push3=, 0
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label11
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label10
 	br      	2               # 2: down to label9
 .LBB3_2:                                # %if.else
@@ -134,14 +134,14 @@ test4:                                  # @test4
 	.type	test5,@function
 test5:                                  # @test5
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label14
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label13
 	br      	2               # 2: down to label12
 .LBB4_2:                                # %if.else
@@ -164,14 +164,14 @@ test5:                                  # @test5
 	.type	test6,@function
 test6:                                  # @test6
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label17
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label16
 	br      	2               # 2: down to label15
 .LBB5_2:                                # %if.else
@@ -194,14 +194,14 @@ test6:                                  # @test6
 	.type	test7,@function
 test7:                                  # @test7
 	.param  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i64.const	$push0=, 0
 	i64.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label20
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label19
 	br      	2               # 2: down to label18
 .LBB6_2:                                # %if.else
@@ -224,14 +224,14 @@ test7:                                  # @test7
 	.type	test8,@function
 test8:                                  # @test8
 	.param  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i64.const	$push0=, 0
 	i64.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label23
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $1           # 1: down to label22
 	br      	2               # 2: down to label21
 .LBB7_2:                                # %if.else
@@ -254,7 +254,7 @@ test8:                                  # @test8
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -262,5 +262,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end8-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20020508-1.c.s b/test/torture-s/20020508-1.c.s
index b1e0be21f..03314df49 100644
--- a/test/torture-s/20020508-1.c.s
+++ b/test/torture-s/20020508-1.c.s
@@ -7,169 +7,157 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.load8_u	$push103=, uc($pop2)
-	tee_local	$push102=, $0=, $pop103
+	i32.load	$1=, shift1($pop2)
+	i32.const	$push97=, 0
+	i32.load8_u	$0=, uc($pop97)
 	i32.const	$push4=, 8
-	i32.const	$push101=, 0
-	i32.load	$push100=, shift1($pop101)
-	tee_local	$push99=, $1=, $pop100
-	i32.sub 	$push98=, $pop4, $pop99
-	tee_local	$push97=, $2=, $pop98
-	i32.shl 	$push5=, $pop102, $pop97
+	i32.sub 	$2=, $pop4, $1
+	block   	
+	i32.shl 	$push5=, $0, $2
 	i32.shr_u	$push3=, $0, $1
 	i32.or  	$push6=, $pop5, $pop3
 	i32.const	$push96=, 835
 	i32.ne  	$push7=, $pop6, $pop96
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 4
 	i32.shr_u	$push10=, $0, $pop8
-	i32.const	$push105=, 4
-	i32.shl 	$push9=, $0, $pop105
+	i32.const	$push99=, 4
+	i32.shl 	$push9=, $0, $pop99
 	i32.or  	$push11=, $pop10, $pop9
-	i32.const	$push104=, 835
-	i32.ne  	$push12=, $pop11, $pop104
+	i32.const	$push98=, 835
+	i32.ne  	$push12=, $pop11, $pop98
 	br_if   	0, $pop12       # 0: down to label0
-# BB#2:                                 # %if.end11
-	i32.const	$push14=, 0
-	i32.load16_u	$push110=, us($pop14)
-	tee_local	$push109=, $3=, $pop110
-	i32.shr_u	$push16=, $pop109, $1
+# %bb.2:                                # %if.end11
 	i32.const	$push13=, 16
-	i32.sub 	$push108=, $pop13, $1
-	tee_local	$push107=, $4=, $pop108
-	i32.shl 	$push15=, $3, $pop107
+	i32.sub 	$4=, $pop13, $1
+	i32.const	$push14=, 0
+	i32.load16_u	$3=, us($pop14)
+	i32.shr_u	$push16=, $3, $1
+	i32.shl 	$push15=, $3, $4
 	i32.or  	$push17=, $pop16, $pop15
-	i32.const	$push106=, 253972259
-	i32.ne  	$push18=, $pop17, $pop106
+	i32.const	$push100=, 253972259
+	i32.ne  	$push18=, $pop17, $pop100
 	br_if   	0, $pop18       # 0: down to label0
-# BB#3:                                 # %if.end21
+# %bb.3:                                # %if.end21
 	i32.const	$push21=, 4
 	i32.shr_u	$push22=, $3, $pop21
 	i32.const	$push19=, 12
 	i32.shl 	$push20=, $3, $pop19
 	i32.or  	$push23=, $pop22, $pop20
-	i32.const	$push111=, 253972259
-	i32.ne  	$push24=, $pop23, $pop111
+	i32.const	$push101=, 253972259
+	i32.ne  	$push24=, $pop23, $pop101
 	br_if   	0, $pop24       # 0: down to label0
-# BB#4:                                 # %if.end30
+# %bb.4:                                # %if.end30
 	i32.const	$push26=, 0
-	i32.load	$push114=, ui($pop26)
-	tee_local	$push113=, $5=, $pop114
-	i32.rotr	$push27=, $pop113, $1
-	i32.const	$push112=, 1073745699
-	i32.ne  	$push28=, $pop27, $pop112
+	i32.load	$5=, ui($pop26)
+	i32.rotr	$push27=, $5, $1
+	i32.const	$push102=, 1073745699
+	i32.ne  	$push28=, $pop27, $pop102
 	br_if   	0, $pop28       # 0: down to label0
-# BB#5:                                 # %if.end38
+# %bb.5:                                # %if.end38
 	i32.const	$push29=, 28
 	i32.rotl	$push30=, $5, $pop29
-	i32.const	$push115=, 1073745699
-	i32.ne  	$push31=, $pop30, $pop115
+	i32.const	$push103=, 1073745699
+	i32.ne  	$push31=, $pop30, $pop103
 	br_if   	0, $pop31       # 0: down to label0
-# BB#6:                                 # %if.end45
-	i32.const	$push32=, 0
-	i32.load	$push120=, ul($pop32)
-	tee_local	$push119=, $7=, $pop120
-	i32.shr_u	$push34=, $pop119, $1
+# %bb.6:                                # %if.end45
 	i32.const	$push25=, 32
-	i32.sub 	$push118=, $pop25, $1
-	tee_local	$push117=, $6=, $pop118
-	i32.shl 	$push33=, $7, $pop117
+	i32.sub 	$6=, $pop25, $1
+	i32.const	$push32=, 0
+	i32.load	$7=, ul($pop32)
+	i32.shr_u	$push34=, $7, $1
+	i32.shl 	$push33=, $7, $6
 	i32.or  	$push35=, $pop34, $pop33
-	i32.const	$push116=, -1893513881
-	i32.ne  	$push36=, $pop35, $pop116
+	i32.const	$push104=, -1893513881
+	i32.ne  	$push36=, $pop35, $pop104
 	br_if   	0, $pop36       # 0: down to label0
-# BB#7:                                 # %if.end53
+# %bb.7:                                # %if.end53
 	i32.const	$push37=, 28
 	i32.rotl	$push38=, $7, $pop37
-	i32.const	$push121=, -1893513881
-	i32.ne  	$push39=, $pop38, $pop121
+	i32.const	$push105=, -1893513881
+	i32.ne  	$push39=, $pop38, $pop105
 	br_if   	0, $pop39       # 0: down to label0
-# BB#8:                                 # %if.end60
+# %bb.8:                                # %if.end60
+	i64.extend_u/i32	$9=, $1
 	i32.const	$push40=, 0
-	i64.load	$push126=, ull($pop40)
-	tee_local	$push125=, $8=, $pop126
-	i64.extend_u/i32	$push124=, $1
-	tee_local	$push123=, $9=, $pop124
-	i64.rotr	$push41=, $pop125, $pop123
-	i64.const	$push122=, 68174490360335855
-	i64.ne  	$push42=, $pop41, $pop122
+	i64.load	$8=, ull($pop40)
+	i64.rotr	$push41=, $8, $9
+	i64.const	$push106=, 68174490360335855
+	i64.ne  	$push42=, $pop41, $pop106
 	br_if   	0, $pop42       # 0: down to label0
-# BB#9:                                 # %if.end69
+# %bb.9:                                # %if.end69
 	i64.const	$push45=, 60
 	i64.rotl	$push46=, $8, $pop45
-	i64.const	$push127=, 68174490360335855
-	i64.ne  	$push47=, $pop46, $pop127
+	i64.const	$push107=, 68174490360335855
+	i64.ne  	$push47=, $pop46, $pop107
 	br_if   	0, $pop47       # 0: down to label0
-# BB#10:                                # %if.end76
+# %bb.10:                               # %if.end76
 	i32.const	$push48=, 0
-	i32.load	$push132=, shift2($pop48)
-	tee_local	$push131=, $11=, $pop132
-	i64.extend_u/i32	$push130=, $pop131
-	tee_local	$push129=, $10=, $pop130
-	i64.rotr	$push49=, $8, $pop129
-	i64.const	$push128=, -994074541463572736
-	i64.ne  	$push50=, $pop49, $pop128
+	i32.load	$11=, shift2($pop48)
+	i64.extend_u/i32	$10=, $11
+	i64.rotr	$push49=, $8, $10
+	i64.const	$push108=, -994074541463572736
+	i64.ne  	$push50=, $pop49, $pop108
 	br_if   	0, $pop50       # 0: down to label0
-# BB#11:                                # %if.end86
+# %bb.11:                               # %if.end86
 	i64.const	$push53=, 4
 	i64.rotl	$push54=, $8, $pop53
-	i64.const	$push133=, -994074541463572736
-	i64.ne  	$push55=, $pop54, $pop133
+	i64.const	$push109=, -994074541463572736
+	i64.ne  	$push55=, $pop54, $pop109
 	br_if   	0, $pop55       # 0: down to label0
-# BB#12:                                # %if.end93
+# %bb.12:                               # %if.end93
 	i32.shr_u	$push57=, $0, $2
 	i32.shl 	$push56=, $0, $1
 	i32.or  	$push58=, $pop57, $pop56
 	i32.const	$push59=, 835
 	i32.ne  	$push60=, $pop58, $pop59
 	br_if   	0, $pop60       # 0: down to label0
-# BB#13:                                # %if.end112
+# %bb.13:                               # %if.end112
 	i32.shl 	$push62=, $3, $1
 	i32.shr_u	$push61=, $3, $4
 	i32.or  	$push63=, $pop62, $pop61
-	i32.const	$push134=, 992079
-	i32.ne  	$push64=, $pop63, $pop134
+	i32.const	$push110=, 992079
+	i32.ne  	$push64=, $pop63, $pop110
 	br_if   	0, $pop64       # 0: down to label0
-# BB#14:                                # %if.end122
+# %bb.14:                               # %if.end122
 	i32.const	$push67=, 4
 	i32.shl 	$push68=, $3, $pop67
 	i32.const	$push65=, 12
 	i32.shr_u	$push66=, $3, $pop65
 	i32.or  	$push69=, $pop68, $pop66
-	i32.const	$push135=, 992079
-	i32.ne  	$push70=, $pop69, $pop135
+	i32.const	$push111=, 992079
+	i32.ne  	$push70=, $pop69, $pop111
 	br_if   	0, $pop70       # 0: down to label0
-# BB#15:                                # %if.end131
+# %bb.15:                               # %if.end131
 	i32.shl 	$push72=, $5, $1
 	i32.shr_u	$push71=, $5, $6
 	i32.or  	$push73=, $pop72, $pop71
-	i32.const	$push136=, 992064
-	i32.ne  	$push74=, $pop73, $pop136
+	i32.const	$push112=, 992064
+	i32.ne  	$push74=, $pop73, $pop112
 	br_if   	0, $pop74       # 0: down to label0
-# BB#16:                                # %if.end139
+# %bb.16:                               # %if.end139
 	i32.const	$push75=, 4
 	i32.rotl	$push76=, $5, $pop75
-	i32.const	$push137=, 992064
-	i32.ne  	$push77=, $pop76, $pop137
+	i32.const	$push113=, 992064
+	i32.ne  	$push77=, $pop76, $pop113
 	br_if   	0, $pop77       # 0: down to label0
-# BB#17:                                # %if.end146
+# %bb.17:                               # %if.end146
 	i32.shl 	$push79=, $7, $1
 	i32.shr_u	$push78=, $7, $6
 	i32.or  	$push80=, $pop79, $pop78
-	i32.const	$push138=, 591751055
-	i32.ne  	$push81=, $pop80, $pop138
+	i32.const	$push114=, 591751055
+	i32.ne  	$push81=, $pop80, $pop114
 	br_if   	0, $pop81       # 0: down to label0
-# BB#18:                                # %if.end154
+# %bb.18:                               # %if.end154
 	i32.const	$push82=, 4
 	i32.rotl	$push83=, $7, $pop82
-	i32.const	$push139=, 591751055
-	i32.ne  	$push84=, $pop83, $pop139
+	i32.const	$push115=, 591751055
+	i32.ne  	$push84=, $pop83, $pop115
 	br_if   	0, $pop84       # 0: down to label0
-# BB#19:                                # %if.end161
+# %bb.19:                               # %if.end161
 	i64.shl 	$push86=, $8, $9
 	i32.const	$push43=, 64
 	i32.sub 	$push44=, $pop43, $1
@@ -179,7 +167,7 @@ main:                                   # @main
 	i64.const	$push88=, -994074541463572736
 	i64.ne  	$push89=, $pop87, $pop88
 	br_if   	0, $pop89       # 0: down to label0
-# BB#20:                                # %if.end178
+# %bb.20:                               # %if.end178
 	i32.const	$push51=, 64
 	i32.sub 	$push52=, $pop51, $11
 	i64.extend_u/i32	$push1=, $pop52
@@ -189,7 +177,7 @@ main:                                   # @main
 	i64.const	$push93=, 68174490360335855
 	i64.ne  	$push94=, $pop92, $pop93
 	br_if   	0, $pop94       # 0: down to label0
-# BB#21:                                # %if.end195
+# %bb.21:                               # %if.end195
 	i32.const	$push95=, 0
 	call    	exit@FUNCTION, $pop95
 	unreachable
@@ -264,6 +252,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9558988e6..f8b915f8b 100644
--- a/test/torture-s/20020508-2.c.s
+++ b/test/torture-s/20020508-2.c.s
@@ -7,215 +7,201 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i64, i64, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load8_s	$push125=, c($pop0)
-	tee_local	$push124=, $0=, $pop125
+	i32.load	$1=, shift1($pop0)
+	i32.const	$push119=, 0
+	i32.load8_s	$0=, c($pop119)
 	i32.const	$push2=, 8
-	i32.const	$push123=, 0
-	i32.load	$push122=, shift1($pop123)
-	tee_local	$push121=, $1=, $pop122
-	i32.sub 	$push120=, $pop2, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.shl 	$push3=, $pop124, $pop119
+	i32.sub 	$2=, $pop2, $1
+	block   	
+	i32.shl 	$push3=, $0, $2
 	i32.shr_s	$push1=, $0, $1
 	i32.or  	$push4=, $pop3, $pop1
 	i32.const	$push118=, 835
 	i32.ne  	$push5=, $pop4, $pop118
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 4
 	i32.shr_s	$push8=, $0, $pop6
-	i32.const	$push127=, 4
-	i32.shl 	$push7=, $0, $pop127
+	i32.const	$push121=, 4
+	i32.shl 	$push7=, $0, $pop121
 	i32.or  	$push9=, $pop8, $pop7
-	i32.const	$push126=, 835
-	i32.ne  	$push10=, $pop9, $pop126
+	i32.const	$push120=, 835
+	i32.ne  	$push10=, $pop9, $pop120
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end11
-	i32.const	$push12=, 0
-	i32.load16_s	$push132=, s($pop12)
-	tee_local	$push131=, $3=, $pop132
-	i32.shr_s	$push14=, $pop131, $1
+# %bb.2:                                # %if.end11
 	i32.const	$push11=, 16
-	i32.sub 	$push130=, $pop11, $1
-	tee_local	$push129=, $4=, $pop130
-	i32.shl 	$push13=, $3, $pop129
+	i32.sub 	$4=, $pop11, $1
+	i32.const	$push12=, 0
+	i32.load16_s	$3=, s($pop12)
+	i32.shr_s	$push14=, $3, $1
+	i32.shl 	$push13=, $3, $4
 	i32.or  	$push15=, $pop14, $pop13
-	i32.const	$push128=, 19087651
-	i32.ne  	$push16=, $pop15, $pop128
+	i32.const	$push122=, 19087651
+	i32.ne  	$push16=, $pop15, $pop122
 	br_if   	0, $pop16       # 0: down to label0
-# BB#3:                                 # %if.end21
+# %bb.3:                                # %if.end21
 	i32.const	$push19=, 4
 	i32.shr_s	$push20=, $3, $pop19
 	i32.const	$push17=, 12
 	i32.shl 	$push18=, $3, $pop17
 	i32.or  	$push21=, $pop20, $pop18
-	i32.const	$push133=, 19087651
-	i32.ne  	$push22=, $pop21, $pop133
+	i32.const	$push123=, 19087651
+	i32.ne  	$push22=, $pop21, $pop123
 	br_if   	0, $pop22       # 0: down to label0
-# BB#4:                                 # %if.end30
-	i32.const	$push24=, 0
-	i32.load	$push138=, i($pop24)
-	tee_local	$push137=, $5=, $pop138
-	i32.shr_s	$push26=, $pop137, $1
+# %bb.4:                                # %if.end30
 	i32.const	$push23=, 32
-	i32.sub 	$push136=, $pop23, $1
-	tee_local	$push135=, $6=, $pop136
-	i32.shl 	$push25=, $5, $pop135
+	i32.sub 	$6=, $pop23, $1
+	i32.const	$push24=, 0
+	i32.load	$5=, i($pop24)
+	i32.shr_s	$push26=, $5, $1
+	i32.shl 	$push25=, $5, $6
 	i32.or  	$push27=, $pop26, $pop25
-	i32.const	$push134=, 1073742115
-	i32.ne  	$push28=, $pop27, $pop134
+	i32.const	$push124=, 1073742115
+	i32.ne  	$push28=, $pop27, $pop124
 	br_if   	0, $pop28       # 0: down to label0
-# BB#5:                                 # %if.end38
+# %bb.5:                                # %if.end38
 	i32.const	$push31=, 4
 	i32.shr_s	$push32=, $5, $pop31
 	i32.const	$push29=, 28
 	i32.shl 	$push30=, $5, $pop29
 	i32.or  	$push33=, $pop32, $pop30
-	i32.const	$push139=, 1073742115
-	i32.ne  	$push34=, $pop33, $pop139
+	i32.const	$push125=, 1073742115
+	i32.ne  	$push34=, $pop33, $pop125
 	br_if   	0, $pop34       # 0: down to label0
-# BB#6:                                 # %if.end45
+# %bb.6:                                # %if.end45
 	i32.const	$push35=, 0
-	i32.load	$push142=, l($pop35)
-	tee_local	$push141=, $7=, $pop142
-	i32.shr_s	$push37=, $pop141, $1
+	i32.load	$7=, l($pop35)
+	i32.shr_s	$push37=, $7, $1
 	i32.shl 	$push36=, $7, $6
 	i32.or  	$push38=, $pop37, $pop36
-	i32.const	$push140=, -2128394905
-	i32.ne  	$push39=, $pop38, $pop140
+	i32.const	$push126=, -2128394905
+	i32.ne  	$push39=, $pop38, $pop126
 	br_if   	0, $pop39       # 0: down to label0
-# BB#7:                                 # %if.end53
+# %bb.7:                                # %if.end53
 	i32.const	$push42=, 4
 	i32.shr_s	$push43=, $7, $pop42
 	i32.const	$push40=, 28
 	i32.shl 	$push41=, $7, $pop40
 	i32.or  	$push44=, $pop43, $pop41
-	i32.const	$push143=, -2128394905
-	i32.ne  	$push45=, $pop44, $pop143
+	i32.const	$push127=, -2128394905
+	i32.ne  	$push45=, $pop44, $pop127
 	br_if   	0, $pop45       # 0: down to label0
-# BB#8:                                 # %if.end60
+# %bb.8:                                # %if.end60
+	i64.extend_u/i32	$9=, $1
 	i32.const	$push46=, 0
-	i64.load	$push150=, ll($pop46)
-	tee_local	$push149=, $8=, $pop150
-	i64.extend_u/i32	$push148=, $1
-	tee_local	$push147=, $9=, $pop148
-	i64.shr_s	$push47=, $pop149, $pop147
+	i64.load	$8=, ll($pop46)
 	i32.const	$push48=, 64
 	i32.sub 	$push49=, $pop48, $1
-	i64.extend_u/i32	$push146=, $pop49
-	tee_local	$push145=, $10=, $pop146
-	i64.shl 	$push50=, $8, $pop145
+	i64.extend_u/i32	$10=, $pop49
+	i64.shr_s	$push47=, $8, $9
+	i64.shl 	$push50=, $8, $10
 	i64.or  	$push51=, $pop47, $pop50
-	i64.const	$push144=, 5124095577148911
-	i64.ne  	$push52=, $pop51, $pop144
+	i64.const	$push128=, 5124095577148911
+	i64.ne  	$push52=, $pop51, $pop128
 	br_if   	0, $pop52       # 0: down to label0
-# BB#9:                                 # %if.end69
+# %bb.9:                                # %if.end69
 	i64.const	$push55=, 4
 	i64.shr_s	$push56=, $8, $pop55
 	i64.const	$push53=, 60
 	i64.shl 	$push54=, $8, $pop53
 	i64.or  	$push57=, $pop56, $pop54
-	i64.const	$push151=, 5124095577148911
-	i64.ne  	$push58=, $pop57, $pop151
+	i64.const	$push129=, 5124095577148911
+	i64.ne  	$push58=, $pop57, $pop129
 	br_if   	0, $pop58       # 0: down to label0
-# BB#10:                                # %if.end76
-	i32.const	$push61=, 64
+# %bb.10:                               # %if.end76
 	i32.const	$push59=, 0
-	i32.load	$push158=, shift2($pop59)
-	tee_local	$push157=, $13=, $pop158
-	i32.sub 	$push62=, $pop61, $pop157
-	i64.extend_u/i32	$push156=, $pop62
-	tee_local	$push155=, $12=, $pop156
-	i64.shl 	$push63=, $8, $pop155
-	i64.extend_u/i32	$push154=, $13
-	tee_local	$push153=, $11=, $pop154
-	i64.shr_s	$push60=, $8, $pop153
+	i32.load	$13=, shift2($pop59)
+	i64.extend_u/i32	$11=, $13
+	i32.const	$push61=, 64
+	i32.sub 	$push62=, $pop61, $13
+	i64.extend_u/i32	$12=, $pop62
+	i64.shl 	$push63=, $8, $12
+	i64.shr_s	$push60=, $8, $11
 	i64.or  	$push64=, $pop63, $pop60
-	i64.const	$push152=, 1311768467750121216
-	i64.ne  	$push65=, $pop64, $pop152
+	i64.const	$push130=, 1311768467750121216
+	i64.ne  	$push65=, $pop64, $pop130
 	br_if   	0, $pop65       # 0: down to label0
-# BB#11:                                # %if.end86
+# %bb.11:                               # %if.end86
 	i64.const	$push68=, 60
 	i64.shr_s	$push69=, $8, $pop68
 	i64.const	$push66=, 4
 	i64.shl 	$push67=, $8, $pop66
 	i64.or  	$push70=, $pop69, $pop67
-	i64.const	$push159=, 1311768467750121216
-	i64.ne  	$push71=, $pop70, $pop159
+	i64.const	$push131=, 1311768467750121216
+	i64.ne  	$push71=, $pop70, $pop131
 	br_if   	0, $pop71       # 0: down to label0
-# BB#12:                                # %if.end93
+# %bb.12:                               # %if.end93
 	i32.shr_s	$push73=, $0, $2
 	i32.shl 	$push72=, $0, $1
 	i32.or  	$push74=, $pop73, $pop72
 	i32.const	$push75=, 835
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	0, $pop76       # 0: down to label0
-# BB#13:                                # %if.end112
+# %bb.13:                               # %if.end112
 	i32.shl 	$push78=, $3, $1
 	i32.shr_s	$push77=, $3, $4
 	i32.or  	$push79=, $pop78, $pop77
-	i32.const	$push160=, 74561
-	i32.ne  	$push80=, $pop79, $pop160
+	i32.const	$push132=, 74561
+	i32.ne  	$push80=, $pop79, $pop132
 	br_if   	0, $pop80       # 0: down to label0
-# BB#14:                                # %if.end122
+# %bb.14:                               # %if.end122
 	i32.const	$push83=, 4
 	i32.shl 	$push84=, $3, $pop83
 	i32.const	$push81=, 12
 	i32.shr_s	$push82=, $3, $pop81
 	i32.or  	$push85=, $pop84, $pop82
-	i32.const	$push161=, 74561
-	i32.ne  	$push86=, $pop85, $pop161
+	i32.const	$push133=, 74561
+	i32.ne  	$push86=, $pop85, $pop133
 	br_if   	0, $pop86       # 0: down to label0
-# BB#15:                                # %if.end131
+# %bb.15:                               # %if.end131
 	i32.shl 	$push88=, $5, $1
 	i32.shr_s	$push87=, $5, $6
 	i32.or  	$push89=, $pop88, $pop87
-	i32.const	$push162=, 74560
-	i32.ne  	$push90=, $pop89, $pop162
+	i32.const	$push134=, 74560
+	i32.ne  	$push90=, $pop89, $pop134
 	br_if   	0, $pop90       # 0: down to label0
-# BB#16:                                # %if.end139
+# %bb.16:                               # %if.end139
 	i32.const	$push93=, 4
 	i32.shl 	$push94=, $5, $pop93
 	i32.const	$push91=, 28
 	i32.shr_s	$push92=, $5, $pop91
 	i32.or  	$push95=, $pop94, $pop92
-	i32.const	$push163=, 74560
-	i32.ne  	$push96=, $pop95, $pop163
+	i32.const	$push135=, 74560
+	i32.ne  	$push96=, $pop95, $pop135
 	br_if   	0, $pop96       # 0: down to label0
-# BB#17:                                # %if.end146
+# %bb.17:                               # %if.end146
 	i32.shl 	$push98=, $7, $1
 	i32.shr_s	$push97=, $7, $6
 	i32.or  	$push99=, $pop98, $pop97
-	i32.const	$push164=, 591751041
-	i32.ne  	$push100=, $pop99, $pop164
+	i32.const	$push136=, 591751041
+	i32.ne  	$push100=, $pop99, $pop136
 	br_if   	0, $pop100      # 0: down to label0
-# BB#18:                                # %if.end154
+# %bb.18:                               # %if.end154
 	i32.const	$push103=, 4
 	i32.shl 	$push104=, $7, $pop103
 	i32.const	$push101=, 28
 	i32.shr_s	$push102=, $7, $pop101
 	i32.or  	$push105=, $pop104, $pop102
-	i32.const	$push165=, 591751041
-	i32.ne  	$push106=, $pop105, $pop165
+	i32.const	$push137=, 591751041
+	i32.ne  	$push106=, $pop105, $pop137
 	br_if   	0, $pop106      # 0: down to label0
-# BB#19:                                # %if.end161
+# %bb.19:                               # %if.end161
 	i64.shl 	$push108=, $8, $9
 	i64.shr_s	$push107=, $8, $10
 	i64.or  	$push109=, $pop108, $pop107
 	i64.const	$push110=, 1311768467750121216
 	i64.ne  	$push111=, $pop109, $pop110
 	br_if   	0, $pop111      # 0: down to label0
-# BB#20:                                # %if.end178
+# %bb.20:                               # %if.end178
 	i64.shr_s	$push113=, $8, $12
 	i64.shl 	$push112=, $8, $11
 	i64.or  	$push114=, $pop113, $pop112
 	i64.const	$push115=, 5124095577148911
 	i64.ne  	$push116=, $pop114, $pop115
 	br_if   	0, $pop116      # 0: down to label0
-# BB#21:                                # %if.end195
+# %bb.21:                               # %if.end195
 	i32.const	$push117=, 0
 	call    	exit@FUNCTION, $pop117
 	unreachable
@@ -290,6 +276,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 267828845..09be160e8 100644
--- a/test/torture-s/20020508-3.c.s
+++ b/test/torture-s/20020508-3.c.s
@@ -7,215 +7,201 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i64, i64, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load8_s	$push125=, c($pop0)
-	tee_local	$push124=, $0=, $pop125
+	i32.load	$1=, shift1($pop0)
+	i32.const	$push119=, 0
+	i32.load8_s	$0=, c($pop119)
 	i32.const	$push2=, 8
-	i32.const	$push123=, 0
-	i32.load	$push122=, shift1($pop123)
-	tee_local	$push121=, $1=, $pop122
-	i32.sub 	$push120=, $pop2, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.shl 	$push3=, $pop124, $pop119
+	i32.sub 	$2=, $pop2, $1
+	block   	
+	i32.shl 	$push3=, $0, $2
 	i32.shr_s	$push1=, $0, $1
 	i32.or  	$push4=, $pop3, $pop1
 	i32.const	$push118=, 835
 	i32.ne  	$push5=, $pop4, $pop118
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 4
 	i32.shr_s	$push8=, $0, $pop6
-	i32.const	$push127=, 4
-	i32.shl 	$push7=, $0, $pop127
+	i32.const	$push121=, 4
+	i32.shl 	$push7=, $0, $pop121
 	i32.or  	$push9=, $pop8, $pop7
-	i32.const	$push126=, 835
-	i32.ne  	$push10=, $pop9, $pop126
+	i32.const	$push120=, 835
+	i32.ne  	$push10=, $pop9, $pop120
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end11
-	i32.const	$push12=, 0
-	i32.load16_s	$push132=, s($pop12)
-	tee_local	$push131=, $3=, $pop132
-	i32.shr_s	$push14=, $pop131, $1
+# %bb.2:                                # %if.end11
 	i32.const	$push11=, 16
-	i32.sub 	$push130=, $pop11, $1
-	tee_local	$push129=, $4=, $pop130
-	i32.shl 	$push13=, $3, $pop129
+	i32.sub 	$4=, $pop11, $1
+	i32.const	$push12=, 0
+	i32.load16_s	$3=, s($pop12)
+	i32.shr_s	$push14=, $3, $1
+	i32.shl 	$push13=, $3, $4
 	i32.or  	$push15=, $pop14, $pop13
-	i32.const	$push128=, -221
-	i32.ne  	$push16=, $pop15, $pop128
+	i32.const	$push122=, -221
+	i32.ne  	$push16=, $pop15, $pop122
 	br_if   	0, $pop16       # 0: down to label0
-# BB#3:                                 # %if.end21
+# %bb.3:                                # %if.end21
 	i32.const	$push19=, 4
 	i32.shr_s	$push20=, $3, $pop19
 	i32.const	$push17=, 12
 	i32.shl 	$push18=, $3, $pop17
 	i32.or  	$push21=, $pop20, $pop18
-	i32.const	$push133=, -221
-	i32.ne  	$push22=, $pop21, $pop133
+	i32.const	$push123=, -221
+	i32.ne  	$push22=, $pop21, $pop123
 	br_if   	0, $pop22       # 0: down to label0
-# BB#4:                                 # %if.end30
-	i32.const	$push24=, 0
-	i32.load	$push138=, i($pop24)
-	tee_local	$push137=, $5=, $pop138
-	i32.shr_s	$push26=, $pop137, $1
+# %bb.4:                                # %if.end30
 	i32.const	$push23=, 32
-	i32.sub 	$push136=, $pop23, $1
-	tee_local	$push135=, $6=, $pop136
-	i32.shl 	$push25=, $5, $pop135
+	i32.sub 	$6=, $pop23, $1
+	i32.const	$push24=, 0
+	i32.load	$5=, i($pop24)
+	i32.shr_s	$push26=, $5, $1
+	i32.shl 	$push25=, $5, $6
 	i32.or  	$push27=, $pop26, $pop25
-	i32.const	$push134=, 1073745699
-	i32.ne  	$push28=, $pop27, $pop134
+	i32.const	$push124=, 1073745699
+	i32.ne  	$push28=, $pop27, $pop124
 	br_if   	0, $pop28       # 0: down to label0
-# BB#5:                                 # %if.end38
+# %bb.5:                                # %if.end38
 	i32.const	$push31=, 4
 	i32.shr_s	$push32=, $5, $pop31
 	i32.const	$push29=, 28
 	i32.shl 	$push30=, $5, $pop29
 	i32.or  	$push33=, $pop32, $pop30
-	i32.const	$push139=, 1073745699
-	i32.ne  	$push34=, $pop33, $pop139
+	i32.const	$push125=, 1073745699
+	i32.ne  	$push34=, $pop33, $pop125
 	br_if   	0, $pop34       # 0: down to label0
-# BB#6:                                 # %if.end45
+# %bb.6:                                # %if.end45
 	i32.const	$push35=, 0
-	i32.load	$push142=, l($pop35)
-	tee_local	$push141=, $7=, $pop142
-	i32.shr_s	$push37=, $pop141, $1
+	i32.load	$7=, l($pop35)
+	i32.shr_s	$push37=, $7, $1
 	i32.shl 	$push36=, $7, $6
 	i32.or  	$push38=, $pop37, $pop36
-	i32.const	$push140=, -14465689
-	i32.ne  	$push39=, $pop38, $pop140
+	i32.const	$push126=, -14465689
+	i32.ne  	$push39=, $pop38, $pop126
 	br_if   	0, $pop39       # 0: down to label0
-# BB#7:                                 # %if.end53
+# %bb.7:                                # %if.end53
 	i32.const	$push42=, 4
 	i32.shr_s	$push43=, $7, $pop42
 	i32.const	$push40=, 28
 	i32.shl 	$push41=, $7, $pop40
 	i32.or  	$push44=, $pop43, $pop41
-	i32.const	$push143=, -14465689
-	i32.ne  	$push45=, $pop44, $pop143
+	i32.const	$push127=, -14465689
+	i32.ne  	$push45=, $pop44, $pop127
 	br_if   	0, $pop45       # 0: down to label0
-# BB#8:                                 # %if.end60
+# %bb.8:                                # %if.end60
+	i64.extend_u/i32	$9=, $1
 	i32.const	$push46=, 0
-	i64.load	$push150=, ll($pop46)
-	tee_local	$push149=, $8=, $pop150
-	i64.extend_u/i32	$push148=, $1
-	tee_local	$push147=, $9=, $pop148
-	i64.shr_s	$push47=, $pop149, $pop147
+	i64.load	$8=, ll($pop46)
 	i32.const	$push48=, 64
 	i32.sub 	$push49=, $pop48, $1
-	i64.extend_u/i32	$push146=, $pop49
-	tee_local	$push145=, $10=, $pop146
-	i64.shl 	$push50=, $8, $pop145
+	i64.extend_u/i32	$10=, $pop49
+	i64.shr_s	$push47=, $8, $9
+	i64.shl 	$push50=, $8, $10
 	i64.or  	$push51=, $pop47, $pop50
-	i64.const	$push144=, 68174490360335855
-	i64.ne  	$push52=, $pop51, $pop144
+	i64.const	$push128=, 68174490360335855
+	i64.ne  	$push52=, $pop51, $pop128
 	br_if   	0, $pop52       # 0: down to label0
-# BB#9:                                 # %if.end69
+# %bb.9:                                # %if.end69
 	i64.const	$push55=, 4
 	i64.shr_s	$push56=, $8, $pop55
 	i64.const	$push53=, 60
 	i64.shl 	$push54=, $8, $pop53
 	i64.or  	$push57=, $pop56, $pop54
-	i64.const	$push151=, 68174490360335855
-	i64.ne  	$push58=, $pop57, $pop151
+	i64.const	$push129=, 68174490360335855
+	i64.ne  	$push58=, $pop57, $pop129
 	br_if   	0, $pop58       # 0: down to label0
-# BB#10:                                # %if.end76
-	i32.const	$push61=, 64
+# %bb.10:                               # %if.end76
 	i32.const	$push59=, 0
-	i32.load	$push158=, shift2($pop59)
-	tee_local	$push157=, $13=, $pop158
-	i32.sub 	$push62=, $pop61, $pop157
-	i64.extend_u/i32	$push156=, $pop62
-	tee_local	$push155=, $12=, $pop156
-	i64.shl 	$push63=, $8, $pop155
-	i64.extend_u/i32	$push154=, $13
-	tee_local	$push153=, $11=, $pop154
-	i64.shr_s	$push60=, $8, $pop153
+	i32.load	$13=, shift2($pop59)
+	i64.extend_u/i32	$11=, $13
+	i32.const	$push61=, 64
+	i32.sub 	$push62=, $pop61, $13
+	i64.extend_u/i32	$12=, $pop62
+	i64.shl 	$push63=, $8, $12
+	i64.shr_s	$push60=, $8, $11
 	i64.or  	$push64=, $pop63, $pop60
-	i64.const	$push152=, -994074541463572736
-	i64.ne  	$push65=, $pop64, $pop152
+	i64.const	$push130=, -994074541463572736
+	i64.ne  	$push65=, $pop64, $pop130
 	br_if   	0, $pop65       # 0: down to label0
-# BB#11:                                # %if.end86
+# %bb.11:                               # %if.end86
 	i64.const	$push68=, 60
 	i64.shr_s	$push69=, $8, $pop68
 	i64.const	$push66=, 4
 	i64.shl 	$push67=, $8, $pop66
 	i64.or  	$push70=, $pop69, $pop67
-	i64.const	$push159=, -994074541463572736
-	i64.ne  	$push71=, $pop70, $pop159
+	i64.const	$push131=, -994074541463572736
+	i64.ne  	$push71=, $pop70, $pop131
 	br_if   	0, $pop71       # 0: down to label0
-# BB#12:                                # %if.end93
+# %bb.12:                               # %if.end93
 	i32.shr_s	$push73=, $0, $2
 	i32.shl 	$push72=, $0, $1
 	i32.or  	$push74=, $pop73, $pop72
 	i32.const	$push75=, 835
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	0, $pop76       # 0: down to label0
-# BB#13:                                # %if.end112
+# %bb.13:                               # %if.end112
 	i32.shl 	$push78=, $3, $1
 	i32.shr_s	$push77=, $3, $4
 	i32.or  	$push79=, $pop78, $pop77
-	i32.const	$push160=, -1
-	i32.ne  	$push80=, $pop79, $pop160
+	i32.const	$push132=, -1
+	i32.ne  	$push80=, $pop79, $pop132
 	br_if   	0, $pop80       # 0: down to label0
-# BB#14:                                # %if.end122
+# %bb.14:                               # %if.end122
 	i32.const	$push83=, 4
 	i32.shl 	$push84=, $3, $pop83
 	i32.const	$push81=, 12
 	i32.shr_s	$push82=, $3, $pop81
 	i32.or  	$push85=, $pop84, $pop82
-	i32.const	$push161=, -1
-	i32.ne  	$push86=, $pop85, $pop161
+	i32.const	$push133=, -1
+	i32.ne  	$push86=, $pop85, $pop133
 	br_if   	0, $pop86       # 0: down to label0
-# BB#15:                                # %if.end131
+# %bb.15:                               # %if.end131
 	i32.shl 	$push88=, $5, $1
 	i32.shr_s	$push87=, $5, $6
 	i32.or  	$push89=, $pop88, $pop87
-	i32.const	$push162=, 992064
-	i32.ne  	$push90=, $pop89, $pop162
+	i32.const	$push134=, 992064
+	i32.ne  	$push90=, $pop89, $pop134
 	br_if   	0, $pop90       # 0: down to label0
-# BB#16:                                # %if.end139
+# %bb.16:                               # %if.end139
 	i32.const	$push93=, 4
 	i32.shl 	$push94=, $5, $pop93
 	i32.const	$push91=, 28
 	i32.shr_s	$push92=, $5, $pop91
 	i32.or  	$push95=, $pop94, $pop92
-	i32.const	$push163=, 992064
-	i32.ne  	$push96=, $pop95, $pop163
+	i32.const	$push135=, 992064
+	i32.ne  	$push96=, $pop95, $pop135
 	br_if   	0, $pop96       # 0: down to label0
-# BB#17:                                # %if.end146
+# %bb.17:                               # %if.end146
 	i32.shl 	$push98=, $7, $1
 	i32.shr_s	$push97=, $7, $6
 	i32.or  	$push99=, $pop98, $pop97
-	i32.const	$push164=, -1
-	i32.ne  	$push100=, $pop99, $pop164
+	i32.const	$push136=, -1
+	i32.ne  	$push100=, $pop99, $pop136
 	br_if   	0, $pop100      # 0: down to label0
-# BB#18:                                # %if.end154
+# %bb.18:                               # %if.end154
 	i32.const	$push103=, 4
 	i32.shl 	$push104=, $7, $pop103
 	i32.const	$push101=, 28
 	i32.shr_s	$push102=, $7, $pop101
 	i32.or  	$push105=, $pop104, $pop102
-	i32.const	$push165=, -1
-	i32.ne  	$push106=, $pop105, $pop165
+	i32.const	$push137=, -1
+	i32.ne  	$push106=, $pop105, $pop137
 	br_if   	0, $pop106      # 0: down to label0
-# BB#19:                                # %if.end161
+# %bb.19:                               # %if.end161
 	i64.shl 	$push108=, $8, $9
 	i64.shr_s	$push107=, $8, $10
 	i64.or  	$push109=, $pop108, $pop107
 	i64.const	$push110=, -994074541463572736
 	i64.ne  	$push111=, $pop109, $pop110
 	br_if   	0, $pop111      # 0: down to label0
-# BB#20:                                # %if.end178
+# %bb.20:                               # %if.end178
 	i64.shr_s	$push113=, $8, $12
 	i64.shl 	$push112=, $8, $11
 	i64.or  	$push114=, $pop113, $pop112
 	i64.const	$push115=, 68174490360335855
 	i64.ne  	$push116=, $pop114, $pop115
 	br_if   	0, $pop116      # 0: down to label0
-# BB#21:                                # %if.end195
+# %bb.21:                               # %if.end195
 	i32.const	$push117=, 0
 	call    	exit@FUNCTION, $pop117
 	unreachable
@@ -290,6 +276,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a93b3399a..d2ece9f82 100644
--- a/test/torture-s/20020510-1.c.s
+++ b/test/torture-s/20020510-1.c.s
@@ -6,7 +6,7 @@
 	.type	testc,@function
 testc:                                  # @testc
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -17,7 +17,7 @@ testc:                                  # @testc
 	i32.const	$push3=, 1
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.eqz 	$push6=, $1
 	br_if   	1, $pop6        # 1: down to label1
 	br      	2               # 2: down to label0
@@ -42,7 +42,7 @@ testc:                                  # @testc
 	.type	tests,@function
 tests:                                  # @tests
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -53,7 +53,7 @@ tests:                                  # @tests
 	i32.const	$push3=, 1
 	i32.lt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label5
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.eqz 	$push6=, $1
 	br_if   	1, $pop6        # 1: down to label4
 	br      	2               # 2: down to label3
@@ -78,14 +78,14 @@ tests:                                  # @tests
 	.type	testi,@function
 testi:                                  # @testi
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label8
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.eqz 	$push2=, $1
 	br_if   	1, $pop2        # 1: down to label7
 	br      	2               # 2: down to label6
@@ -110,14 +110,14 @@ testi:                                  # @testi
 	.type	testl,@function
 testl:                                  # @testl
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label11
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.eqz 	$push2=, $1
 	br_if   	1, $pop2        # 1: down to label10
 	br      	2               # 2: down to label9
@@ -142,7 +142,7 @@ testl:                                  # @testl
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -150,5 +150,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20020529-1.c.s b/test/torture-s/20020529-1.c.s
index 3b65e0ebd..23074486a 100644
--- a/test/torture-s/20020529-1.c.s
+++ b/test/torture-s/20020529-1.c.s
@@ -8,46 +8,43 @@ foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push11=, 0
+	i32.load	$7=, f1.beenhere($pop11)
+	i32.const	$push10=, 1
+	i32.add 	$6=, $7, $pop10
+	i32.const	$push9=, 0
+	i32.store	f1.beenhere($pop9), $6
 	block   	
 	block   	
 	block   	
 	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
+# %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
+	i32.const	$push12=, 1
+	i32.eq  	$push1=, $7, $pop12
 	br_if   	2, $pop1        # 2: down to label1
-# BB#3:                                 # %if.end
+# %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
+	i32.eqz 	$push21=, $1
+	br_if   	0, $pop21       # 0: down to label4
+# %bb.4:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push21=, 0
-	i32.const	$push20=, 1
-	i32.add 	$push19=, $4, $pop20
-	tee_local	$push18=, $6=, $pop19
-	i32.store	f1.beenhere($pop21), $pop18
+	i32.const	$push15=, 1
+	i32.add 	$6=, $4, $pop15
+	i32.const	$push14=, 0
+	i32.store	f1.beenhere($pop14), $6
 	copy_local	$7=, $4
-	i32.const	$push17=, 2
-	i32.lt_s	$push2=, $4, $pop17
+	i32.const	$push13=, 2
+	i32.lt_s	$push2=, $4, $pop13
 	br_if   	1, $pop2        # 1: up to label3
 	br      	2               # 2: down to label2
 .LBB0_5:                                # %if.end3
@@ -56,23 +53,22 @@ foo:                                    # @foo
 	i32.store16	0($5), $3
 	i32.load	$push4=, 0($0)
 	br_if   	3, $pop4        # 3: down to label0
-# BB#6:                                 # %if.end8
+# %bb.6:                                # %if.end8
                                         #   in Loop: Header=BB0_2 Depth=1
 	br_if   	3, $2           # 3: down to label0
-# BB#7:                                 # %sw.epilog
+# %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
+	i32.const	$push20=, 1
+	i32.add 	$6=, $4, $pop20
+	i32.const	$push19=, 0
+	i32.store	f1.beenhere($pop19), $6
+	i32.const	$push18=, 16
+	i32.shl 	$push5=, $3, $pop18
+	i32.const	$push17=, 16
+	i32.shr_s	$3=, $pop5, $pop17
 	copy_local	$7=, $4
-	i32.const	$push22=, 1
-	i32.le_s	$push6=, $4, $pop22
+	i32.const	$push16=, 1
+	i32.le_s	$push6=, $4, $pop16
 	br_if   	0, $pop6        # 0: up to label3
 .LBB0_8:                                # %if.then.i
 	end_loop
@@ -99,21 +95,20 @@ f1:                                     # @f1
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push8=, 0
-	i32.load	$push7=, f1.beenhere($pop8)
-	tee_local	$push6=, $1=, $pop7
+	i32.load	$1=, f1.beenhere($pop0)
+	i32.const	$push6=, 0
 	i32.const	$push5=, 1
-	i32.add 	$push1=, $pop6, $pop5
-	i32.store	f1.beenhere($pop0), $pop1
+	i32.add 	$push1=, $1, $pop5
+	i32.store	f1.beenhere($pop6), $pop1
 	block   	
 	i32.const	$push2=, 2
 	i32.ge_s	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label5
-# BB#1:                                 # %if.end
-	i32.const	$push9=, 1
-	i32.eq  	$push4=, $1, $pop9
+# %bb.1:                                # %if.end
+	i32.const	$push7=, 1
+	i32.eq  	$push4=, $1, $pop7
 	return  	$pop4
 .LBB1_2:                                # %if.then
 	end_block                       # label5:
@@ -128,7 +123,7 @@ f1:                                     # @f1
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -142,21 +137,19 @@ f2:                                     # @f2
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push22=, $pop10, $pop12
-	tee_local	$push21=, $0=, $pop22
-	i32.store	__stack_pointer($pop13), $pop21
+	i32.sub 	$0=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $0
 	i32.const	$push0=, 0
-	i32.const	$push20=, 0
-	i32.load	$push19=, f1.beenhere($pop20)
-	tee_local	$push18=, $1=, $pop19
+	i32.load	$1=, f1.beenhere($pop0)
+	i32.const	$push18=, 0
 	i32.const	$push17=, 1
-	i32.add 	$push1=, $pop18, $pop17
-	i32.store	f1.beenhere($pop0), $pop1
+	i32.add 	$push1=, $1, $pop17
+	i32.store	f1.beenhere($pop18), $pop1
 	i32.const	$push16=, 0
 	i32.store	0($0), $pop16
 	i32.const	$2=, 23
@@ -167,30 +160,29 @@ main:                                   # @main
 	i32.const	$push14=, 1
 	i32.gt_s	$push2=, $1, $pop14
 	br_if   	0, $pop2        # 0: down to label6
-# BB#1:                                 # %f1.exit.lr.ph.i.preheader
+# %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    	                # label8:
-	i32.const	$push23=, 1
-	i32.eq  	$push3=, $1, $pop23
+	i32.const	$push19=, 1
+	i32.eq  	$push3=, $1, $pop19
 	br_if   	1, $pop3        # 1: down to label7
-# BB#3:                                 # %if.end8.i
+# %bb.3:                                # %if.end8.i
                                         #   in Loop: Header=BB3_2 Depth=1
 	i32.const	$2=, 0
-	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.le_s	$push6=, $pop25, $pop24
+	i32.const	$push24=, 0
+	i32.const	$push23=, 2
+	i32.add 	$push4=, $1, $pop23
+	i32.store	f1.beenhere($pop24), $pop4
+	i32.const	$push22=, 0
+	i32.store16	0($0), $pop22
+	i32.const	$push21=, 1
+	i32.add 	$1=, $1, $pop21
+	i32.const	$push20=, 1
+	i32.le_s	$push6=, $1, $pop20
 	br_if   	0, $pop6        # 0: up to label8
 	br      	2               # 2: down to label6
 .LBB3_4:                                # %foo.exit
@@ -199,7 +191,7 @@ main:                                   # @main
 	i32.const	$push7=, 65535
 	i32.and 	$push8=, $2, $pop7
 	br_if   	0, $pop8        # 0: down to label6
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -219,6 +211,6 @@ f1.beenhere:
 	.size	f1.beenhere, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8e7e6101e..5e5505425 100644
--- a/test/torture-s/20020611-1.c.s
+++ b/test/torture-s/20020611-1.c.s
@@ -6,14 +6,13 @@
 	.type	x,@function
 x:                                      # @x
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push6=, 0
-	i32.load	$push1=, n($pop6)
+	i32.load	$push1=, n($pop0)
 	i32.const	$push2=, 31
-	i32.lt_u	$push5=, $pop1, $pop2
-	tee_local	$push4=, $0=, $pop5
-	i32.store	p($pop0), $pop4
+	i32.lt_u	$0=, $pop1, $pop2
+	i32.const	$push4=, 0
+	i32.store	p($pop4), $0
 	i32.const	$push3=, 0
 	i32.store	k($pop3), $0
                                         # fallthrough-return
@@ -28,22 +27,21 @@ x:                                      # @x
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
-	i32.const	$push5=, 0
-	i32.load	$push0=, n($pop5)
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	i32.load	$push0=, n($pop4)
 	i32.const	$push1=, 31
-	i32.lt_u	$push4=, $pop0, $pop1
-	tee_local	$push3=, $0=, $pop4
-	i32.store	p($pop6), $pop3
+	i32.lt_u	$0=, $pop0, $pop1
+	i32.const	$push3=, 0
+	i32.store	p($pop3), $0
 	i32.const	$push2=, 0
 	i32.store	k($pop2), $0
 	block   	
-	i32.eqz 	$push8=, $0
-	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push7=, 0
-	call    	exit@FUNCTION, $pop7
+	i32.eqz 	$push6=, $0
+	br_if   	0, $pop6        # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push5=, 0
+	call    	exit@FUNCTION, $pop5
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -81,6 +79,6 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 079f3aa0a..ab6616925 100644
--- a/test/torture-s/20020614-1.c.s
+++ b/test/torture-s/20020614-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020615-1.c.s b/test/torture-s/20020615-1.c.s
index 49053f749..cbaa0b205 100644
--- a/test/torture-s/20020615-1.c.s
+++ b/test/torture-s/20020615-1.c.s
@@ -8,91 +8,78 @@ line_hints:                             # @line_hints
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$push3=, 0($2)
+	i32.load	$push2=, 0($1)
+	i32.sub 	$6=, $pop3, $pop2
 	i32.const	$8=, 0
-	i32.const	$push52=, 0
+	i32.load	$3=, 4($0)
+	i32.const	$push30=, 0
+	i32.sub 	$push4=, $pop30, $6
+	i32.select	$6=, $pop4, $6, $3
 	i32.load	$push6=, 4($2)
 	i32.load	$push5=, 4($1)
-	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 	$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.sub 	$2=, $pop6, $pop5
+	i32.load	$4=, 8($0)
+	i32.const	$push29=, 0
+	i32.sub 	$push7=, $pop29, $2
+	i32.select	$7=, $pop7, $2, $4
+	i32.load	$1=, 0($0)
+	i32.select	$2=, $7, $6, $1
 	i32.const	$push8=, 31
-	i32.shr_s	$push34=, $2, $pop8
-	tee_local	$push33=, $0=, $pop34
-	i32.add 	$push9=, $pop35, $pop33
+	i32.shr_s	$0=, $2, $pop8
+	i32.add 	$push9=, $2, $0
 	i32.xor 	$5=, $pop9, $0
-	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.select	$0=, $6, $7, $1
+	i32.const	$push28=, 31
+	i32.shr_s	$6=, $0, $pop28
+	i32.add 	$push10=, $0, $6
 	i32.xor 	$6=, $pop10, $6
 	block   	
 	block   	
-	i32.eqz 	$push60=, $0
-	br_if   	0, $pop60       # 0: down to label1
-# BB#1:                                 # %entry
-	i32.const	$push53=, 4
-	i32.shr_s	$push1=, $6, $pop53
+	i32.eqz 	$push34=, $0
+	br_if   	0, $pop34       # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$push31=, 4
+	i32.shr_s	$push1=, $6, $pop31
 	i32.gt_s	$push11=, $5, $pop1
 	br_if   	0, $pop11       # 0: down to label1
-# BB#2:                                 # %if.then21
+# %bb.2:                                # %if.then21
 	i32.const	$push16=, 2
 	i32.const	$push15=, 1
 	i32.const	$push13=, 0
 	i32.gt_s	$push14=, $0, $pop13
-	i32.select	$push55=, $pop16, $pop15, $pop14
-	tee_local	$push54=, $0=, $pop55
+	i32.select	$0=, $pop16, $pop15, $pop14
 	i32.const	$push17=, 3
-	i32.xor 	$push18=, $pop54, $pop17
+	i32.xor 	$push18=, $0, $pop17
 	i32.select	$push12=, $4, $3, $1
 	i32.select	$8=, $pop18, $0, $pop12
 	br      	1               # 1: down to label0
 .LBB0_3:                                # %if.else
 	end_block                       # label1:
-	i32.eqz 	$push61=, $2
-	br_if   	0, $pop61       # 0: down to label0
-# BB#4:                                 # %if.else
-	i32.const	$push56=, 4
-	i32.shr_s	$push19=, $5, $pop56
+	i32.eqz 	$push35=, $2
+	br_if   	0, $pop35       # 0: down to label0
+# %bb.4:                                # %if.else
+	i32.const	$push32=, 4
+	i32.shr_s	$push19=, $5, $pop32
 	i32.gt_s	$push20=, $6, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#5:                                 # %if.then31
+# %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	$push59=, 4
-	i32.add 	$push58=, $pop24, $pop59
-	tee_local	$push57=, $0=, $pop58
+	i32.const	$push33=, 4
+	i32.add 	$0=, $pop24, $pop33
 	i32.const	$push25=, 12
-	i32.xor 	$push26=, $pop57, $pop25
+	i32.xor 	$push26=, $0, $pop25
 	i32.select	$push0=, $3, $4, $1
 	i32.select	$push27=, $pop26, $0, $pop0
 	return  	$pop27
 .LBB0_6:                                # %if.end40
 	end_block                       # label0:
-	copy_local	$push62=, $8
-                                        # fallthrough-return: $pop62
+	copy_local	$push36=, $8
+                                        # fallthrough-return: $pop36
 	.endfunc
 .Lfunc_end0:
 	.size	line_hints, .Lfunc_end0-line_hints
@@ -103,251 +90,14 @@ line_hints:                             # @line_hints
 	.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	$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_14:                               # %if.then
-	end_block                       # label2:
-	call    	abort@FUNCTION
+# %bb.0:                                # %entry
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	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
-main.fh:
-	.int32	0                       # 0x0
-	.int32	1                       # 0x1
-	.int32	0                       # 0x0
-	.int32	0                       # 0x0
-	.int32	0                       # 0x0
-	.int32	1                       # 0x1
-	.skip	12
-	.size	main.fh, 36
-
-	.type	main.gsf,@object        # @main.gsf
-	.section	.data.main.gsf,"aw",@progbits
-	.p2align	4
-main.gsf:
-	.int32	196608                  # 0x30000
-	.int32	80216                   # 0x13958
-	.int32	196608                  # 0x30000
-	.int32	98697                   # 0x18189
-	.int32	80216                   # 0x13958
-	.int32	196608                  # 0x30000
-	.int32	98697                   # 0x18189
-	.int32	196608                  # 0x30000
-	.size	main.gsf, 32
-
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
-	.functype	abort, void
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020619-1.c.s b/test/torture-s/20020619-1.c.s
index a33ddfb5c..220fb93e7 100644
--- a/test/torture-s/20020619-1.c.s
+++ b/test/torture-s/20020619-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020716-1.c.s b/test/torture-s/20020716-1.c.s
index 4d9bb8bc8..fefc9e42e 100644
--- a/test/torture-s/20020716-1.c.s
+++ b/test/torture-s/20020716-1.c.s
@@ -7,7 +7,7 @@
 sub1:                                   # @sub1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ sub1:                                   # @sub1
 testcond:                               # @testcond
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 5046272
 	i32.select	$push2=, $pop1, $pop0, $0
@@ -36,7 +36,7 @@ testcond:                               # @testcond
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -45,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020720-1.c.s b/test/torture-s/20020720-1.c.s
index f53101bb4..366186250 100644
--- a/test/torture-s/20020720-1.c.s
+++ b/test/torture-s/20020720-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -26,4 +26,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020805-1.c.s b/test/torture-s/20020805-1.c.s
index e7486ac8a..5d60979c0 100644
--- a/test/torture-s/20020805-1.c.s
+++ b/test/torture-s/20020805-1.c.s
@@ -6,12 +6,12 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,12 +28,11 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push2=, 2
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push10=, n($pop0)
-	tee_local	$push9=, $0=, $pop10
-	i32.sub 	$push3=, $pop2, $pop9
+	i32.load	$0=, n($pop0)
+	i32.const	$push2=, 2
+	i32.sub 	$push3=, $pop2, $0
 	i32.const	$push8=, 0
 	i32.sub 	$push1=, $pop8, $0
 	i32.or  	$push4=, $pop3, $pop1
@@ -57,6 +56,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 05c5b20c6..02a16088a 100644
--- a/test/torture-s/20020810-1.c.s
+++ b/test/torture-s/20020810-1.c.s
@@ -6,20 +6,20 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push1=, 0($0)
 	i32.const	$push6=, 0
 	i32.load	$push0=, R($pop6)
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push4=, 4($0)
 	i32.const	$push7=, 0
 	i32.load	$push3=, R+4($pop7)
 	i32.ne  	$push5=, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -35,7 +35,7 @@ f:                                      # @f
 	.type	g,@function
 g:                                      # @g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, R($pop0)
 	i64.store	0($0):p2align=2, $pop1
@@ -51,25 +51,24 @@ g:                                      # @g
 main:                                   # @main
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %f.exit
+# %bb.0:                                # %f.exit
+	i32.const	$push10=, 0
+	i64.load	$0=, R($pop10)
 	block   	
-	i32.const	$push12=, 0
-	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.const	$push9=, 0
+	i32.load	$push2=, R($pop9)
+	i32.wrap/i64	$push3=, $0
 	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)
+# %bb.1:                                # %f.exit
+	i32.const	$push11=, 0
+	i32.load	$push0=, R+4($pop11)
 	i64.const	$push5=, 32
 	i64.shr_u	$push6=, $0, $pop5
 	i32.wrap/i64	$push1=, $pop6
 	i32.ne  	$push7=, $pop0, $pop1
 	br_if   	0, $pop7        # 0: down to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB2_3:                                # %if.then
@@ -91,5 +90,5 @@ R:
 	.size	R, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20020819-1.c.s b/test/torture-s/20020819-1.c.s
index 6622b19db..a5c56d385 100644
--- a/test/torture-s/20020819-1.c.s
+++ b/test/torture-s/20020819-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20020904-1.c.s b/test/torture-s/20020904-1.c.s
index 95ab8fe4a..f3fac2147 100644
--- a/test/torture-s/20020904-1.c.s
+++ b/test/torture-s/20020904-1.c.s
@@ -7,7 +7,7 @@
 fun:                                    # @fun
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 255
 	i32.div_u	$push1=, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ fun:                                    # @fun
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020911-1.c.s b/test/torture-s/20020911-1.c.s
index 19b09a6db..ea6788dd1 100644
--- a/test/torture-s/20020911-1.c.s
+++ b/test/torture-s/20020911-1.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	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
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -34,5 +34,5 @@ c:
 	.size	c, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20020916-1.c.s b/test/torture-s/20020916-1.c.s
index dcb1e5400..3de33a866 100644
--- a/test/torture-s/20020916-1.c.s
+++ b/test/torture-s/20020916-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.ne  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20020920-1.c.s b/test/torture-s/20020920-1.c.s
index 6aec7b525..d59f2a2a1 100644
--- a/test/torture-s/20020920-1.c.s
+++ b/test/torture-s/20020920-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4294967296
 	i64.store	4($0):p2align=2, $pop0
 	i32.const	$push1=, 2
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021010-1.c.s b/test/torture-s/20021010-1.c.s
index 08d1f8b83..5f7cf0bba 100644
--- a/test/torture-s/20021010-1.c.s
+++ b/test/torture-s/20021010-1.c.s
@@ -6,7 +6,7 @@
 	.type	sub,@function
 sub:                                    # @sub
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ sub:                                    # @sub
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021010-2.c.s b/test/torture-s/20021010-2.c.s
index 505bcbc36..369927866 100644
--- a/test/torture-s/20021010-2.c.s
+++ b/test/torture-s/20021010-2.c.s
@@ -6,33 +6,29 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push19=, 0
-	i32.load16_s	$push18=, global_bounds+2($pop19)
-	tee_local	$push17=, $0=, $pop18
-	i32.const	$push16=, 0
-	i32.load16_s	$push15=, global_saveRect+2($pop16)
-	tee_local	$push14=, $1=, $pop15
-	i32.gt_s	$push2=, $1, $0
-	i32.select	$push3=, $pop17, $pop14, $pop2
-	i32.const	$push13=, 0
-	i32.load16_s	$push12=, global_bounds($pop13)
-	tee_local	$push11=, $0=, $pop12
+	.local  	i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push11=, 0
+	i32.load16_s	$0=, global_bounds($pop11)
 	i32.const	$push10=, 0
-	i32.load16_s	$push9=, global_saveRect($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load16_s	$1=, global_saveRect($pop10)
+	i32.const	$push9=, 0
+	i32.load16_s	$2=, global_bounds+2($pop9)
+	i32.const	$push8=, 0
+	i32.load16_s	$3=, global_saveRect+2($pop8)
+	block   	
+	i32.gt_s	$push2=, $3, $2
+	i32.select	$push3=, $2, $3, $pop2
 	i32.lt_s	$push0=, $1, $0
-	i32.select	$push1=, $pop11, $pop8, $pop0
+	i32.select	$push1=, $0, $1, $pop0
 	i32.sub 	$push4=, $pop3, $pop1
 	i32.const	$push7=, 0
 	i32.load	$push5=, expectedwidth($pop7)
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end26
-	i32.const	$push20=, 0
-	call    	exit@FUNCTION, $pop20
+# %bb.1:                                # %if.end26
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
 .LBB0_2:                                # %if.then25
 	end_block                       # label0:
@@ -85,6 +81,6 @@ global_saveRect:
 	.size	global_saveRect, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 43a39b075..7150e7155 100644
--- a/test/torture-s/20021011-1.c.s
+++ b/test/torture-s/20021011-1.c.s
@@ -7,215 +7,199 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i64
-# BB#0:                                 # %entry
-	i32.const	$push44=, 0
-	i32.const	$push43=, 0
-	i32.load8_u	$push42=, .L.str+8($pop43)
-	tee_local	$push41=, $0=, $pop42
-	i32.store8	buf+8($pop44), $pop41
+# %bb.0:                                # %entry
 	i32.const	$push40=, 0
+	i32.load8_u	$0=, .L.str+8($pop40)
 	i32.const	$push39=, 0
-	i64.load	$push38=, .L.str($pop39):p2align=0
-	tee_local	$push37=, $1=, $pop38
-	i64.store	buf($pop40), $pop37
+	i32.store8	buf+8($pop39), $0
+	i32.const	$push38=, 0
+	i64.load	$1=, .L.str($pop38):p2align=0
+	i32.const	$push37=, 0
+	i64.store	buf($pop37), $1
 	block   	
 	i32.const	$push36=, buf
 	i32.const	$push35=, .L.str
 	i32.call	$push0=, strcmp@FUNCTION, $pop36, $pop35
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
+	i32.const	$push44=, 0
+	i32.store8	buf+8($pop44), $0
+	i32.const	$push43=, 0
+	i64.store	buf($pop43), $1
+	i32.const	$push42=, buf
+	i32.const	$push41=, .L.str
+	i32.call	$push1=, strcmp@FUNCTION, $pop42, $pop41
+	br_if   	0, $pop1        # 0: down to label0
+# %bb.2:                                # %for.cond
+	i32.const	$push49=, 0
+	i32.load8_u	$0=, .L.str+8($pop49)
 	i32.const	$push48=, 0
-	i32.store8	buf+8($pop48), $0
+	i32.store8	buf+9($pop48), $0
 	i32.const	$push47=, 0
-	i64.store	buf($pop47), $1
-	i32.const	$push46=, buf
-	i32.const	$push45=, .L.str
-	i32.call	$push1=, strcmp@FUNCTION, $pop46, $pop45
-	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %for.cond
-	i32.const	$push57=, 0
-	i32.const	$push56=, 0
-	i32.load8_u	$push55=, .L.str+8($pop56)
-	tee_local	$push54=, $0=, $pop55
-	i32.store8	buf+9($pop57), $pop54
-	i32.const	$push53=, 0
-	i32.const	$push52=, 0
-	i64.load	$push51=, .L.str($pop52):p2align=0
-	tee_local	$push50=, $1=, $pop51
-	i64.store	buf+1($pop53):p2align=0, $pop50
+	i64.load	$1=, .L.str($pop47):p2align=0
+	i32.const	$push46=, 0
+	i64.store	buf+1($pop46):p2align=0, $1
 	i32.const	$push2=, buf+1
-	i32.const	$push49=, .L.str
-	i32.call	$push3=, strcmp@FUNCTION, $pop2, $pop49
+	i32.const	$push45=, .L.str
+	i32.call	$push3=, strcmp@FUNCTION, $pop2, $pop45
 	br_if   	0, $pop3        # 0: down to label0
-# BB#3:                                 # %for.cond.1
-	i32.const	$push60=, 0
-	i32.store8	buf+10($pop60), $0
-	i32.const	$push59=, 0
-	i64.store	buf+2($pop59):p2align=1, $1
+# %bb.3:                                # %for.cond.1
+	i32.const	$push52=, 0
+	i32.store8	buf+10($pop52), $0
+	i32.const	$push51=, 0
+	i64.store	buf+2($pop51):p2align=1, $1
 	i32.const	$push4=, buf+2
-	i32.const	$push58=, .L.str
-	i32.call	$push5=, strcmp@FUNCTION, $pop4, $pop58
+	i32.const	$push50=, .L.str
+	i32.call	$push5=, strcmp@FUNCTION, $pop4, $pop50
 	br_if   	0, $pop5        # 0: down to label0
-# BB#4:                                 # %for.cond.2
-	i32.const	$push69=, 0
-	i32.const	$push68=, 0
-	i32.load8_u	$push67=, .L.str+8($pop68)
-	tee_local	$push66=, $0=, $pop67
-	i32.store8	buf+11($pop69), $pop66
-	i32.const	$push65=, 0
-	i32.const	$push64=, 0
-	i64.load	$push63=, .L.str($pop64):p2align=0
-	tee_local	$push62=, $1=, $pop63
-	i64.store	buf+3($pop65):p2align=0, $pop62
+# %bb.4:                                # %for.cond.2
+	i32.const	$push57=, 0
+	i32.load8_u	$0=, .L.str+8($pop57)
+	i32.const	$push56=, 0
+	i32.store8	buf+11($pop56), $0
+	i32.const	$push55=, 0
+	i64.load	$1=, .L.str($pop55):p2align=0
+	i32.const	$push54=, 0
+	i64.store	buf+3($pop54):p2align=0, $1
 	i32.const	$push6=, buf+3
-	i32.const	$push61=, .L.str
-	i32.call	$push7=, strcmp@FUNCTION, $pop6, $pop61
+	i32.const	$push53=, .L.str
+	i32.call	$push7=, strcmp@FUNCTION, $pop6, $pop53
 	br_if   	0, $pop7        # 0: down to label0
-# BB#5:                                 # %for.cond.3
-	i32.const	$push72=, 0
-	i32.store8	buf+12($pop72), $0
-	i32.const	$push71=, 0
-	i64.store	buf+4($pop71):p2align=2, $1
+# %bb.5:                                # %for.cond.3
+	i32.const	$push60=, 0
+	i32.store8	buf+12($pop60), $0
+	i32.const	$push59=, 0
+	i64.store	buf+4($pop59):p2align=2, $1
 	i32.const	$push8=, buf+4
-	i32.const	$push70=, .L.str
-	i32.call	$push9=, strcmp@FUNCTION, $pop8, $pop70
+	i32.const	$push58=, .L.str
+	i32.call	$push9=, strcmp@FUNCTION, $pop8, $pop58
 	br_if   	0, $pop9        # 0: down to label0
-# BB#6:                                 # %for.cond.4
-	i32.const	$push81=, 0
-	i32.const	$push80=, 0
-	i32.load8_u	$push79=, .L.str+8($pop80)
-	tee_local	$push78=, $0=, $pop79
-	i32.store8	buf+13($pop81), $pop78
-	i32.const	$push77=, 0
-	i32.const	$push76=, 0
-	i64.load	$push75=, .L.str($pop76):p2align=0
-	tee_local	$push74=, $1=, $pop75
-	i64.store	buf+5($pop77):p2align=0, $pop74
+# %bb.6:                                # %for.cond.4
+	i32.const	$push65=, 0
+	i32.load8_u	$0=, .L.str+8($pop65)
+	i32.const	$push64=, 0
+	i32.store8	buf+13($pop64), $0
+	i32.const	$push63=, 0
+	i64.load	$1=, .L.str($pop63):p2align=0
+	i32.const	$push62=, 0
+	i64.store	buf+5($pop62):p2align=0, $1
 	i32.const	$push10=, buf+5
-	i32.const	$push73=, .L.str
-	i32.call	$push11=, strcmp@FUNCTION, $pop10, $pop73
+	i32.const	$push61=, .L.str
+	i32.call	$push11=, strcmp@FUNCTION, $pop10, $pop61
 	br_if   	0, $pop11       # 0: down to label0
-# BB#7:                                 # %for.cond.5
-	i32.const	$push84=, 0
-	i32.store8	buf+14($pop84), $0
-	i32.const	$push83=, 0
-	i64.store	buf+6($pop83):p2align=1, $1
+# %bb.7:                                # %for.cond.5
+	i32.const	$push68=, 0
+	i32.store8	buf+14($pop68), $0
+	i32.const	$push67=, 0
+	i64.store	buf+6($pop67):p2align=1, $1
 	i32.const	$push12=, buf+6
-	i32.const	$push82=, .L.str
-	i32.call	$push13=, strcmp@FUNCTION, $pop12, $pop82
+	i32.const	$push66=, .L.str
+	i32.call	$push13=, strcmp@FUNCTION, $pop12, $pop66
 	br_if   	0, $pop13       # 0: down to label0
-# BB#8:                                 # %for.cond.6
-	i32.const	$push93=, 0
-	i32.const	$push92=, 0
-	i32.load8_u	$push91=, .L.str+8($pop92)
-	tee_local	$push90=, $0=, $pop91
-	i32.store8	buf+15($pop93), $pop90
-	i32.const	$push89=, 0
-	i32.const	$push88=, 0
-	i64.load	$push87=, .L.str($pop88):p2align=0
-	tee_local	$push86=, $1=, $pop87
-	i64.store	buf+7($pop89):p2align=0, $pop86
+# %bb.8:                                # %for.cond.6
+	i32.const	$push73=, 0
+	i32.load8_u	$0=, .L.str+8($pop73)
+	i32.const	$push72=, 0
+	i32.store8	buf+15($pop72), $0
+	i32.const	$push71=, 0
+	i64.load	$1=, .L.str($pop71):p2align=0
+	i32.const	$push70=, 0
+	i64.store	buf+7($pop70):p2align=0, $1
 	i32.const	$push14=, buf+7
-	i32.const	$push85=, .L.str
-	i32.call	$push15=, strcmp@FUNCTION, $pop14, $pop85
+	i32.const	$push69=, .L.str
+	i32.call	$push15=, strcmp@FUNCTION, $pop14, $pop69
 	br_if   	0, $pop15       # 0: down to label0
-# BB#9:                                 # %for.cond.7
-	i32.const	$push96=, 0
-	i32.store8	buf+16($pop96), $0
-	i32.const	$push95=, 0
-	i64.store	buf+8($pop95), $1
+# %bb.9:                                # %for.cond.7
+	i32.const	$push76=, 0
+	i32.store8	buf+16($pop76), $0
+	i32.const	$push75=, 0
+	i64.store	buf+8($pop75), $1
 	i32.const	$push16=, buf+8
-	i32.const	$push94=, .L.str
-	i32.call	$push17=, strcmp@FUNCTION, $pop16, $pop94
+	i32.const	$push74=, .L.str
+	i32.call	$push17=, strcmp@FUNCTION, $pop16, $pop74
 	br_if   	0, $pop17       # 0: down to label0
-# BB#10:                                # %for.cond.8
-	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.load8_u	$push103=, .L.str+8($pop104)
-	tee_local	$push102=, $0=, $pop103
-	i32.store8	buf+17($pop105), $pop102
-	i32.const	$push101=, 0
-	i32.const	$push100=, 0
-	i64.load	$push99=, .L.str($pop100):p2align=0
-	tee_local	$push98=, $1=, $pop99
-	i64.store	buf+9($pop101):p2align=0, $pop98
+# %bb.10:                               # %for.cond.8
+	i32.const	$push81=, 0
+	i32.load8_u	$0=, .L.str+8($pop81)
+	i32.const	$push80=, 0
+	i32.store8	buf+17($pop80), $0
+	i32.const	$push79=, 0
+	i64.load	$1=, .L.str($pop79):p2align=0
+	i32.const	$push78=, 0
+	i64.store	buf+9($pop78):p2align=0, $1
 	i32.const	$push18=, buf+9
-	i32.const	$push97=, .L.str
-	i32.call	$push19=, strcmp@FUNCTION, $pop18, $pop97
+	i32.const	$push77=, .L.str
+	i32.call	$push19=, strcmp@FUNCTION, $pop18, $pop77
 	br_if   	0, $pop19       # 0: down to label0
-# BB#11:                                # %for.cond.9
-	i32.const	$push108=, 0
-	i32.store8	buf+18($pop108), $0
-	i32.const	$push107=, 0
-	i64.store	buf+10($pop107):p2align=1, $1
+# %bb.11:                               # %for.cond.9
+	i32.const	$push84=, 0
+	i32.store8	buf+18($pop84), $0
+	i32.const	$push83=, 0
+	i64.store	buf+10($pop83):p2align=1, $1
 	i32.const	$push20=, buf+10
-	i32.const	$push106=, .L.str
-	i32.call	$push21=, strcmp@FUNCTION, $pop20, $pop106
+	i32.const	$push82=, .L.str
+	i32.call	$push21=, strcmp@FUNCTION, $pop20, $pop82
 	br_if   	0, $pop21       # 0: down to label0
-# BB#12:                                # %for.cond.10
-	i32.const	$push117=, 0
-	i32.const	$push116=, 0
-	i32.load8_u	$push115=, .L.str+8($pop116)
-	tee_local	$push114=, $0=, $pop115
-	i32.store8	buf+19($pop117), $pop114
-	i32.const	$push113=, 0
-	i32.const	$push112=, 0
-	i64.load	$push111=, .L.str($pop112):p2align=0
-	tee_local	$push110=, $1=, $pop111
-	i64.store	buf+11($pop113):p2align=0, $pop110
+# %bb.12:                               # %for.cond.10
+	i32.const	$push89=, 0
+	i32.load8_u	$0=, .L.str+8($pop89)
+	i32.const	$push88=, 0
+	i32.store8	buf+19($pop88), $0
+	i32.const	$push87=, 0
+	i64.load	$1=, .L.str($pop87):p2align=0
+	i32.const	$push86=, 0
+	i64.store	buf+11($pop86):p2align=0, $1
 	i32.const	$push22=, buf+11
-	i32.const	$push109=, .L.str
-	i32.call	$push23=, strcmp@FUNCTION, $pop22, $pop109
+	i32.const	$push85=, .L.str
+	i32.call	$push23=, strcmp@FUNCTION, $pop22, $pop85
 	br_if   	0, $pop23       # 0: down to label0
-# BB#13:                                # %for.cond.11
-	i32.const	$push120=, 0
-	i32.store8	buf+20($pop120), $0
-	i32.const	$push119=, 0
-	i64.store	buf+12($pop119):p2align=2, $1
+# %bb.13:                               # %for.cond.11
+	i32.const	$push92=, 0
+	i32.store8	buf+20($pop92), $0
+	i32.const	$push91=, 0
+	i64.store	buf+12($pop91):p2align=2, $1
 	i32.const	$push24=, buf+12
-	i32.const	$push118=, .L.str
-	i32.call	$push25=, strcmp@FUNCTION, $pop24, $pop118
+	i32.const	$push90=, .L.str
+	i32.call	$push25=, strcmp@FUNCTION, $pop24, $pop90
 	br_if   	0, $pop25       # 0: down to label0
-# BB#14:                                # %for.cond.12
-	i32.const	$push129=, 0
-	i32.const	$push128=, 0
-	i32.load8_u	$push127=, .L.str+8($pop128)
-	tee_local	$push126=, $0=, $pop127
-	i32.store8	buf+21($pop129), $pop126
-	i32.const	$push125=, 0
-	i32.const	$push124=, 0
-	i64.load	$push123=, .L.str($pop124):p2align=0
-	tee_local	$push122=, $1=, $pop123
-	i64.store	buf+13($pop125):p2align=0, $pop122
+# %bb.14:                               # %for.cond.12
+	i32.const	$push97=, 0
+	i32.load8_u	$0=, .L.str+8($pop97)
+	i32.const	$push96=, 0
+	i32.store8	buf+21($pop96), $0
+	i32.const	$push95=, 0
+	i64.load	$1=, .L.str($pop95):p2align=0
+	i32.const	$push94=, 0
+	i64.store	buf+13($pop94):p2align=0, $1
 	i32.const	$push26=, buf+13
-	i32.const	$push121=, .L.str
-	i32.call	$push27=, strcmp@FUNCTION, $pop26, $pop121
+	i32.const	$push93=, .L.str
+	i32.call	$push27=, strcmp@FUNCTION, $pop26, $pop93
 	br_if   	0, $pop27       # 0: down to label0
-# BB#15:                                # %for.cond.13
-	i32.const	$push132=, 0
-	i32.store8	buf+22($pop132), $0
-	i32.const	$push131=, 0
-	i64.store	buf+14($pop131):p2align=1, $1
+# %bb.15:                               # %for.cond.13
+	i32.const	$push100=, 0
+	i32.store8	buf+22($pop100), $0
+	i32.const	$push99=, 0
+	i64.store	buf+14($pop99):p2align=1, $1
 	i32.const	$push28=, buf+14
-	i32.const	$push130=, .L.str
-	i32.call	$push29=, strcmp@FUNCTION, $pop28, $pop130
+	i32.const	$push98=, .L.str
+	i32.call	$push29=, strcmp@FUNCTION, $pop28, $pop98
 	br_if   	0, $pop29       # 0: down to label0
-# BB#16:                                # %for.cond.14
-	i32.const	$push136=, 0
-	i32.const	$push135=, 0
-	i32.load8_u	$push30=, .L.str+8($pop135)
-	i32.store8	buf+23($pop136), $pop30
-	i32.const	$push134=, 0
-	i32.const	$push133=, 0
-	i64.load	$push31=, .L.str($pop133):p2align=0
-	i64.store	buf+15($pop134):p2align=0, $pop31
+# %bb.16:                               # %for.cond.14
+	i32.const	$push104=, 0
+	i32.const	$push103=, 0
+	i32.load8_u	$push30=, .L.str+8($pop103)
+	i32.store8	buf+23($pop104), $pop30
+	i32.const	$push102=, 0
+	i32.const	$push101=, 0
+	i64.load	$push31=, .L.str($pop101):p2align=0
+	i64.store	buf+15($pop102):p2align=0, $pop31
 	i32.const	$push33=, buf+15
 	i32.const	$push32=, .L.str
 	i32.call	$push34=, strcmp@FUNCTION, $pop33, $pop32
 	br_if   	0, $pop34       # 0: down to label0
-# BB#17:                                # %for.cond.15
-	i32.const	$push137=, 0
-	return  	$pop137
+# %bb.17:                               # %for.cond.15
+	i32.const	$push105=, 0
+	return  	$pop105
 .LBB0_18:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -240,6 +224,6 @@ buf:
 	.size	.L.str, 9
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0b345ac17..6011e6445 100644
--- a/test/torture-s/20021015-1.c.s
+++ b/test/torture-s/20021015-1.c.s
@@ -6,13 +6,13 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($4)
 	i32.const	$push1=, g_list
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	i32.const	$push4=, 0
 	i32.store8	g_list($pop3), $pop4
@@ -31,13 +31,13 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load8_u	$push0=, g_list($pop1)
 	i32.eqz 	$push5=, $pop0
 	br_if   	0, $pop5        # 0: down to label1
-# BB#1:                                 # %g.exit
+# %bb.1:                                # %g.exit
 	i32.const	$push3=, 0
 	i32.const	$push2=, 0
 	i32.store8	g_list($pop3), $pop2
@@ -58,5 +58,5 @@ g_list:
 	.size	g_list, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20021024-1.c.s b/test/torture-s/20021024-1.c.s
index 5bff253ab..cd51a8409 100644
--- a/test/torture-s/20021024-1.c.s
+++ b/test/torture-s/20021024-1.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 511
 	i32.and 	$2=, $0, $pop0
 	i32.const	$push1=, 20
@@ -47,7 +47,7 @@ bar:                                    # @bar
 	i64.store	0($0), $pop17
 	i32.eqz 	$push20=, $2
 	br_if   	0, $pop20       # 0: up to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	end_loop
 	i32.const	$push11=, 3
 	i32.shl 	$push12=, $2, $pop11
@@ -66,34 +66,24 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push7=, 0
-	i32.load	$push6=, __stack_pointer($pop7)
-	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop6, $pop8
-	tee_local	$push17=, $0=, $pop18
-	i32.store	__stack_pointer($pop9), $pop17
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
+	i32.const	$push5=, 16
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push1=, 0
-	i64.const	$push0=, 47
-	i64.store	main.r+32($pop1), $pop0
-	i32.const	$push16=, 0
-	i64.const	$push2=, 11
-	i64.store	main.r+64($pop16), $pop2
-	i32.const	$push15=, 0
-	i64.const	$push3=, 58
-	i64.store	m($pop15), $pop3
-	i32.const	$push14=, 0
-	i64.const	$push4=, 1
-	i64.store	main.r+120($pop14), $pop4
-	i32.const	$push13=, 0
-	i32.const	$push10=, 8
-	i32.add 	$push11=, $0, $pop10
-	i32.store	cp($pop13), $pop11
-	i64.const	$push5=, 2
-	i64.store	8($0), $pop5
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
+	i64.const	$push0=, 58
+	i64.store	m($pop1), $pop0
+	i32.const	$push10=, 0
+	i32.const	$push7=, 8
+	i32.add 	$push8=, $0, $pop7
+	i32.store	cp($pop10), $pop8
+	i64.const	$push2=, 2
+	i64.store	8($0), $pop2
+	i32.const	$push9=, 0
+	call    	exit@FUNCTION, $pop9
 	unreachable
 	.endfunc
 .Lfunc_end2:
@@ -117,13 +107,6 @@ m:
 	.int64	0                       # 0x0
 	.size	m, 8
 
-	.type	main.r,@object          # @main.r
-	.section	.bss.main.r,"aw",@nobits
-	.p2align	4
-main.r:
-	.skip	512
-	.size	main.r, 512
-
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021111-1.c.s b/test/torture-s/20021111-1.c.s
index faf5928d3..48774becf 100644
--- a/test/torture-s/20021111-1.c.s
+++ b/test/torture-s/20021111-1.c.s
@@ -7,27 +7,26 @@
 aim_callhandler:                        # @aim_callhandler
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.eqz 	$push11=, $1
-	br_if   	0, $pop11       # 0: down to label1
-# BB#1:                                 # %entry
+	i32.eqz 	$push9=, $1
+	br_if   	0, $pop9        # 0: down to label1
+# %bb.1:                                # %entry
 	i32.const	$push0=, 65535
 	i32.eq  	$push1=, $3, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#2:                                 # %if.end3
-	i32.const	$push8=, 0
-	i32.load	$push7=, aim_callhandler.i($pop8)
-	tee_local	$push6=, $1=, $pop7
+# %bb.2:                                # %if.end3
+	i32.const	$push6=, 0
+	i32.load	$1=, aim_callhandler.i($pop6)
 	i32.const	$push5=, 1
-	i32.ge_s	$push2=, $pop6, $pop5
+	i32.ge_s	$push2=, $1, $pop5
 	br_if   	1, $pop2        # 1: down to label0
-# BB#3:                                 # %if.end7
-	i32.const	$push10=, 0
-	i32.const	$push9=, 1
-	i32.add 	$push3=, $1, $pop9
-	i32.store	aim_callhandler.i($pop10), $pop3
+# %bb.3:                                # %if.end7
+	i32.const	$push8=, 0
+	i32.const	$push7=, 1
+	i32.add 	$push3=, $1, $pop7
+	i32.store	aim_callhandler.i($pop8), $pop3
 .LBB0_4:                                # %return
 	end_block                       # label1:
 	i32.const	$push4=, 0
@@ -46,7 +45,7 @@ aim_callhandler:                        # @aim_callhandler
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.const	$push4=, 0
@@ -67,6 +66,6 @@ aim_callhandler.i:
 	.size	aim_callhandler.i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ad500b6f1..b4a21dbc7 100644
--- a/test/torture-s/20021113-1.c.s
+++ b/test/torture-s/20021113-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.store	0($0), $pop0
 	copy_local	$push1=, $0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021118-1.c.s b/test/torture-s/20021118-1.c.s
index e6591f575..17339d619 100644
--- a/test/torture-s/20021118-1.c.s
+++ b/test/torture-s/20021118-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 12($0)
 	i32.add 	$push1=, $pop0, $7
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021118-2.c.s b/test/torture-s/20021118-2.c.s
index 3e16c8fc9..9f9856bac 100644
--- a/test/torture-s/20021118-2.c.s
+++ b/test/torture-s/20021118-2.c.s
@@ -7,22 +7,21 @@
 t1:                                     # @t1
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x1.8p1
 	call_indirect	$pop0, $2
 	i32.const	$push1=, 2
 	i32.shl 	$push2=, $1, $pop1
-	i32.add 	$push9=, $0, $pop2
-	tee_local	$push8=, $0=, $pop9
+	i32.add 	$0=, $0, $pop2
 	i32.const	$push3=, 4
 	i32.add 	$push4=, $0, $pop3
 	i32.load	$push5=, 0($pop4)
-	i32.store	0($pop8), $pop5
+	i32.store	0($0), $pop5
 	f32.const	$push7=, 0x1.4p1
 	f32.const	$push6=, 0x1.cp1
 	call_indirect	$pop7, $pop6, $3
-	copy_local	$push10=, $3
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $0
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end0:
 	.size	t1, .Lfunc_end0-t1
@@ -34,24 +33,23 @@ t1:                                     # @t1
 t2:                                     # @t2
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.const	$push0=, 0x1.8p2
 	call_indirect	$pop0, $4
 	f64.const	$push1=, 0x1.8p1
 	call_indirect	$pop1, $2
 	i32.const	$push2=, 2
 	i32.shl 	$push3=, $1, $pop2
-	i32.add 	$push10=, $0, $pop3
-	tee_local	$push9=, $0=, $pop10
+	i32.add 	$0=, $0, $pop3
 	i32.const	$push4=, 4
 	i32.add 	$push5=, $0, $pop4
 	i32.load	$push6=, 0($pop5)
-	i32.store	0($pop9), $pop6
+	i32.store	0($0), $pop6
 	f32.const	$push8=, 0x1.4p1
 	f32.const	$push7=, 0x1.cp1
 	call_indirect	$pop8, $pop7, $3
-	copy_local	$push11=, $3
-                                        # fallthrough-return: $pop11
+	copy_local	$push9=, $0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end1:
 	.size	t2, .Lfunc_end1-t2
@@ -62,12 +60,12 @@ t2:                                     # @t2
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, 0x1.8p1
 	f64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
@@ -83,16 +81,16 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	f32, f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.const	$push0=, 0x1.4p1
 	f32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f32.const	$push2=, 0x1.cp1
 	f32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB3_3:                                # %if.then
 	end_block                       # label1:
@@ -108,12 +106,12 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.const	$push0=, 0x1.8p2
 	f32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB4_2:                                # %if.then
 	end_block                       # label2:
@@ -129,7 +127,7 @@ f3:                                     # @f3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -138,6 +136,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end5-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d9204c022..8ec0308fc 100644
--- a/test/torture-s/20021118-3.c.s
+++ b/test/torture-s/20021118-3.c.s
@@ -7,18 +7,18 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, -2
 	i32.eq  	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push1=, -100
 	i32.sub 	$push0=, $pop1, $0
 	i32.const	$push5=, 0
 	i32.ge_s	$push4=, $pop0, $pop5
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB0_3:                                # %if.then
@@ -35,7 +35,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -44,6 +44,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c7ad81f8a..9d97cb667 100644
--- a/test/torture-s/20021119-1.c.s
+++ b/test/torture-s/20021119-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 80
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,4 +33,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20021120-1.c.s b/test/torture-s/20021120-1.c.s
index f59762eaf..0279714e6 100644
--- a/test/torture-s/20021120-1.c.s
+++ b/test/torture-s/20021120-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push97=, 0
 	f64.load	$160=, gd($pop97)
 	i32.const	$push96=, 0
@@ -76,330 +76,332 @@ foo:                                    # @foo
 	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.preheader
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push260=, 0
-	f32.load	$1=, gf($pop260)
-	i32.const	$push259=, 0
-	f32.load	$2=, gf+4($pop259)
 	i32.const	$push258=, 0
-	f32.load	$3=, gf+8($pop258)
+	f32.load	$1=, gf($pop258)
 	i32.const	$push257=, 0
-	f32.load	$4=, gf+12($pop257)
+	f32.load	$2=, gf+4($pop257)
 	i32.const	$push256=, 0
-	f32.load	$5=, gf+16($pop256)
+	f32.load	$3=, gf+8($pop256)
 	i32.const	$push255=, 0
-	f32.load	$6=, gf+20($pop255)
+	f32.load	$4=, gf+12($pop255)
 	i32.const	$push254=, 0
-	f32.load	$7=, gf+24($pop254)
+	f32.load	$5=, gf+16($pop254)
 	i32.const	$push253=, 0
-	f32.load	$8=, gf+28($pop253)
+	f32.load	$6=, gf+20($pop253)
 	i32.const	$push252=, 0
-	f32.load	$9=, gf+32($pop252)
+	f32.load	$7=, gf+24($pop252)
 	i32.const	$push251=, 0
-	f32.load	$10=, gf+36($pop251)
+	f32.load	$8=, gf+28($pop251)
 	i32.const	$push250=, 0
-	f32.load	$11=, gf+40($pop250)
+	f32.load	$9=, gf+32($pop250)
 	i32.const	$push249=, 0
-	f32.load	$12=, gf+44($pop249)
+	f32.load	$10=, gf+36($pop249)
 	i32.const	$push248=, 0
-	f32.load	$13=, gf+48($pop248)
+	f32.load	$11=, gf+40($pop248)
 	i32.const	$push247=, 0
-	f32.load	$14=, gf+52($pop247)
+	f32.load	$12=, gf+44($pop247)
 	i32.const	$push246=, 0
-	f32.load	$15=, gf+56($pop246)
+	f32.load	$13=, gf+48($pop246)
 	i32.const	$push245=, 0
-	f32.load	$16=, gf+60($pop245)
+	f32.load	$14=, gf+52($pop245)
 	i32.const	$push244=, 0
-	f32.load	$17=, gf+64($pop244)
+	f32.load	$15=, gf+56($pop244)
 	i32.const	$push243=, 0
-	f32.load	$18=, gf+68($pop243)
+	f32.load	$16=, gf+60($pop243)
 	i32.const	$push242=, 0
-	f32.load	$19=, gf+72($pop242)
+	f32.load	$17=, gf+64($pop242)
 	i32.const	$push241=, 0
-	f32.load	$20=, gf+76($pop241)
+	f32.load	$18=, gf+68($pop241)
 	i32.const	$push240=, 0
-	f32.load	$21=, gf+80($pop240)
+	f32.load	$19=, gf+72($pop240)
 	i32.const	$push239=, 0
-	f32.load	$22=, gf+84($pop239)
+	f32.load	$20=, gf+76($pop239)
 	i32.const	$push238=, 0
-	f32.load	$23=, gf+88($pop238)
+	f32.load	$21=, gf+80($pop238)
 	i32.const	$push237=, 0
-	f32.load	$24=, gf+92($pop237)
+	f32.load	$22=, gf+84($pop237)
 	i32.const	$push236=, 0
-	f32.load	$25=, gf+96($pop236)
+	f32.load	$23=, gf+88($pop236)
 	i32.const	$push235=, 0
-	f32.load	$26=, gf+100($pop235)
+	f32.load	$24=, gf+92($pop235)
 	i32.const	$push234=, 0
-	f32.load	$27=, gf+104($pop234)
+	f32.load	$25=, gf+96($pop234)
 	i32.const	$push233=, 0
-	f32.load	$28=, gf+108($pop233)
+	f32.load	$26=, gf+100($pop233)
 	i32.const	$push232=, 0
-	f32.load	$29=, gf+112($pop232)
+	f32.load	$27=, gf+104($pop232)
 	i32.const	$push231=, 0
-	f32.load	$30=, gf+116($pop231)
+	f32.load	$28=, gf+108($pop231)
 	i32.const	$push230=, 0
-	f32.load	$31=, gf+120($pop230)
+	f32.load	$29=, gf+112($pop230)
 	i32.const	$push229=, 0
-	f32.load	$32=, gf+124($pop229)
+	f32.load	$30=, gf+116($pop229)
 	i32.const	$push228=, 0
-	f64.load	$33=, gd($pop228)
+	f32.load	$31=, gf+120($pop228)
 	i32.const	$push227=, 0
-	f64.load	$34=, gd+8($pop227)
+	f32.load	$32=, gf+124($pop227)
 	i32.const	$push226=, 0
-	f64.load	$35=, gd+16($pop226)
+	f64.load	$33=, gd($pop226)
 	i32.const	$push225=, 0
-	f64.load	$36=, gd+24($pop225)
+	f64.load	$34=, gd+8($pop225)
 	i32.const	$push224=, 0
-	f64.load	$37=, gd+32($pop224)
+	f64.load	$35=, gd+16($pop224)
 	i32.const	$push223=, 0
-	f64.load	$38=, gd+40($pop223)
+	f64.load	$36=, gd+24($pop223)
 	i32.const	$push222=, 0
-	f64.load	$39=, gd+48($pop222)
+	f64.load	$37=, gd+32($pop222)
 	i32.const	$push221=, 0
-	f64.load	$40=, gd+56($pop221)
+	f64.load	$38=, gd+40($pop221)
 	i32.const	$push220=, 0
-	f64.load	$41=, gd+64($pop220)
+	f64.load	$39=, gd+48($pop220)
 	i32.const	$push219=, 0
-	f64.load	$42=, gd+72($pop219)
+	f64.load	$40=, gd+56($pop219)
 	i32.const	$push218=, 0
-	f64.load	$43=, gd+80($pop218)
+	f64.load	$41=, gd+64($pop218)
 	i32.const	$push217=, 0
-	f64.load	$44=, gd+88($pop217)
+	f64.load	$42=, gd+72($pop217)
 	i32.const	$push216=, 0
-	f64.load	$45=, gd+96($pop216)
+	f64.load	$43=, gd+80($pop216)
 	i32.const	$push215=, 0
-	f64.load	$46=, gd+104($pop215)
+	f64.load	$44=, gd+88($pop215)
 	i32.const	$push214=, 0
-	f64.load	$47=, gd+112($pop214)
+	f64.load	$45=, gd+96($pop214)
 	i32.const	$push213=, 0
-	f64.load	$48=, gd+120($pop213)
+	f64.load	$46=, gd+104($pop213)
 	i32.const	$push212=, 0
-	f64.load	$49=, gd+128($pop212)
+	f64.load	$47=, gd+112($pop212)
 	i32.const	$push211=, 0
-	f64.load	$50=, gd+136($pop211)
+	f64.load	$48=, gd+120($pop211)
 	i32.const	$push210=, 0
-	f64.load	$51=, gd+144($pop210)
+	f64.load	$49=, gd+128($pop210)
 	i32.const	$push209=, 0
-	f64.load	$52=, gd+152($pop209)
+	f64.load	$50=, gd+136($pop209)
 	i32.const	$push208=, 0
-	f64.load	$53=, gd+160($pop208)
+	f64.load	$51=, gd+144($pop208)
 	i32.const	$push207=, 0
-	f64.load	$54=, gd+168($pop207)
+	f64.load	$52=, gd+152($pop207)
 	i32.const	$push206=, 0
-	f64.load	$55=, gd+176($pop206)
+	f64.load	$53=, gd+160($pop206)
 	i32.const	$push205=, 0
-	f64.load	$56=, gd+184($pop205)
+	f64.load	$54=, gd+168($pop205)
 	i32.const	$push204=, 0
-	f64.load	$57=, gd+192($pop204)
+	f64.load	$55=, gd+176($pop204)
 	i32.const	$push203=, 0
-	f64.load	$58=, gd+200($pop203)
+	f64.load	$56=, gd+184($pop203)
 	i32.const	$push202=, 0
-	f64.load	$59=, gd+208($pop202)
+	f64.load	$57=, gd+192($pop202)
 	i32.const	$push201=, 0
-	f64.load	$60=, gd+216($pop201)
+	f64.load	$58=, gd+200($pop201)
 	i32.const	$push200=, 0
-	f64.load	$61=, gd+224($pop200)
+	f64.load	$59=, gd+208($pop200)
 	i32.const	$push199=, 0
-	f64.load	$62=, gd+232($pop199)
+	f64.load	$60=, gd+216($pop199)
 	i32.const	$push198=, 0
-	f64.load	$63=, gd+240($pop198)
+	f64.load	$61=, gd+224($pop198)
 	i32.const	$push197=, 0
-	f64.load	$64=, gd+248($pop197)
+	f64.load	$62=, gd+232($pop197)
 	i32.const	$push196=, 0
-	f64.load	$65=, gd($pop196)
+	f64.load	$63=, gd+240($pop196)
 	i32.const	$push195=, 0
-	f64.load	$66=, gd+8($pop195)
+	f64.load	$64=, gd+248($pop195)
 	i32.const	$push194=, 0
-	f64.load	$67=, gd+16($pop194)
+	f64.load	$65=, gd($pop194)
 	i32.const	$push193=, 0
-	f64.load	$68=, gd+24($pop193)
+	f64.load	$66=, gd+8($pop193)
 	i32.const	$push192=, 0
-	f64.load	$69=, gd+32($pop192)
+	f64.load	$67=, gd+16($pop192)
 	i32.const	$push191=, 0
-	f64.load	$70=, gd+40($pop191)
+	f64.load	$68=, gd+24($pop191)
 	i32.const	$push190=, 0
-	f64.load	$71=, gd+48($pop190)
+	f64.load	$69=, gd+32($pop190)
 	i32.const	$push189=, 0
-	f64.load	$72=, gd+56($pop189)
+	f64.load	$70=, gd+40($pop189)
 	i32.const	$push188=, 0
-	f64.load	$73=, gd+64($pop188)
+	f64.load	$71=, gd+48($pop188)
 	i32.const	$push187=, 0
-	f64.load	$74=, gd+72($pop187)
+	f64.load	$72=, gd+56($pop187)
 	i32.const	$push186=, 0
-	f64.load	$75=, gd+80($pop186)
+	f64.load	$73=, gd+64($pop186)
 	i32.const	$push185=, 0
-	f64.load	$76=, gd+88($pop185)
+	f64.load	$74=, gd+72($pop185)
 	i32.const	$push184=, 0
-	f64.load	$77=, gd+96($pop184)
+	f64.load	$75=, gd+80($pop184)
 	i32.const	$push183=, 0
-	f64.load	$78=, gd+104($pop183)
+	f64.load	$76=, gd+88($pop183)
 	i32.const	$push182=, 0
-	f64.load	$79=, gd+112($pop182)
+	f64.load	$77=, gd+96($pop182)
 	i32.const	$push181=, 0
-	f64.load	$80=, gd+120($pop181)
+	f64.load	$78=, gd+104($pop181)
 	i32.const	$push180=, 0
-	f64.load	$81=, gd+128($pop180)
+	f64.load	$79=, gd+112($pop180)
 	i32.const	$push179=, 0
-	f64.load	$82=, gd+136($pop179)
+	f64.load	$80=, gd+120($pop179)
 	i32.const	$push178=, 0
-	f64.load	$83=, gd+144($pop178)
+	f64.load	$81=, gd+128($pop178)
 	i32.const	$push177=, 0
-	f64.load	$84=, gd+152($pop177)
+	f64.load	$82=, gd+136($pop177)
 	i32.const	$push176=, 0
-	f64.load	$85=, gd+160($pop176)
+	f64.load	$83=, gd+144($pop176)
 	i32.const	$push175=, 0
-	f64.load	$86=, gd+168($pop175)
+	f64.load	$84=, gd+152($pop175)
 	i32.const	$push174=, 0
-	f64.load	$87=, gd+176($pop174)
+	f64.load	$85=, gd+160($pop174)
 	i32.const	$push173=, 0
-	f64.load	$88=, gd+184($pop173)
+	f64.load	$86=, gd+168($pop173)
 	i32.const	$push172=, 0
-	f64.load	$89=, gd+192($pop172)
+	f64.load	$87=, gd+176($pop172)
 	i32.const	$push171=, 0
-	f64.load	$90=, gd+200($pop171)
+	f64.load	$88=, gd+184($pop171)
 	i32.const	$push170=, 0
-	f64.load	$91=, gd+208($pop170)
+	f64.load	$89=, gd+192($pop170)
 	i32.const	$push169=, 0
-	f64.load	$92=, gd+216($pop169)
+	f64.load	$90=, gd+200($pop169)
 	i32.const	$push168=, 0
-	f64.load	$93=, gd+224($pop168)
+	f64.load	$91=, gd+208($pop168)
 	i32.const	$push167=, 0
-	f64.load	$94=, gd+232($pop167)
+	f64.load	$92=, gd+216($pop167)
 	i32.const	$push166=, 0
-	f64.load	$95=, gd+240($pop166)
+	f64.load	$93=, gd+224($pop166)
 	i32.const	$push165=, 0
-	f64.load	$96=, gd+248($pop165)
+	f64.load	$94=, gd+232($pop165)
 	i32.const	$push164=, 0
-	f64.load	$97=, gd($pop164)
+	f64.load	$95=, gd+240($pop164)
 	i32.const	$push163=, 0
-	f64.load	$98=, gd+8($pop163)
+	f64.load	$96=, gd+248($pop163)
 	i32.const	$push162=, 0
-	f64.load	$99=, gd+16($pop162)
+	f64.load	$97=, gd($pop162)
 	i32.const	$push161=, 0
-	f64.load	$100=, gd+24($pop161)
+	f64.load	$98=, gd+8($pop161)
 	i32.const	$push160=, 0
-	f64.load	$101=, gd+32($pop160)
+	f64.load	$99=, gd+16($pop160)
 	i32.const	$push159=, 0
-	f64.load	$102=, gd+40($pop159)
+	f64.load	$100=, gd+24($pop159)
 	i32.const	$push158=, 0
-	f64.load	$103=, gd+48($pop158)
+	f64.load	$101=, gd+32($pop158)
 	i32.const	$push157=, 0
-	f64.load	$104=, gd+56($pop157)
+	f64.load	$102=, gd+40($pop157)
 	i32.const	$push156=, 0
-	f64.load	$105=, gd+64($pop156)
+	f64.load	$103=, gd+48($pop156)
 	i32.const	$push155=, 0
-	f64.load	$106=, gd+72($pop155)
+	f64.load	$104=, gd+56($pop155)
 	i32.const	$push154=, 0
-	f64.load	$107=, gd+80($pop154)
+	f64.load	$105=, gd+64($pop154)
 	i32.const	$push153=, 0
-	f64.load	$108=, gd+88($pop153)
+	f64.load	$106=, gd+72($pop153)
 	i32.const	$push152=, 0
-	f64.load	$109=, gd+96($pop152)
+	f64.load	$107=, gd+80($pop152)
 	i32.const	$push151=, 0
-	f64.load	$110=, gd+104($pop151)
+	f64.load	$108=, gd+88($pop151)
 	i32.const	$push150=, 0
-	f64.load	$111=, gd+112($pop150)
+	f64.load	$109=, gd+96($pop150)
 	i32.const	$push149=, 0
-	f64.load	$112=, gd+120($pop149)
+	f64.load	$110=, gd+104($pop149)
 	i32.const	$push148=, 0
-	f64.load	$113=, gd+128($pop148)
+	f64.load	$111=, gd+112($pop148)
 	i32.const	$push147=, 0
-	f64.load	$114=, gd+136($pop147)
+	f64.load	$112=, gd+120($pop147)
 	i32.const	$push146=, 0
-	f64.load	$115=, gd+144($pop146)
+	f64.load	$113=, gd+128($pop146)
 	i32.const	$push145=, 0
-	f64.load	$116=, gd+152($pop145)
+	f64.load	$114=, gd+136($pop145)
 	i32.const	$push144=, 0
-	f64.load	$117=, gd+160($pop144)
+	f64.load	$115=, gd+144($pop144)
 	i32.const	$push143=, 0
-	f64.load	$118=, gd+168($pop143)
+	f64.load	$116=, gd+152($pop143)
 	i32.const	$push142=, 0
-	f64.load	$119=, gd+176($pop142)
+	f64.load	$117=, gd+160($pop142)
 	i32.const	$push141=, 0
-	f64.load	$120=, gd+184($pop141)
+	f64.load	$118=, gd+168($pop141)
 	i32.const	$push140=, 0
-	f64.load	$121=, gd+192($pop140)
+	f64.load	$119=, gd+176($pop140)
 	i32.const	$push139=, 0
-	f64.load	$122=, gd+200($pop139)
+	f64.load	$120=, gd+184($pop139)
 	i32.const	$push138=, 0
-	f64.load	$123=, gd+208($pop138)
+	f64.load	$121=, gd+192($pop138)
 	i32.const	$push137=, 0
-	f64.load	$124=, gd+216($pop137)
+	f64.load	$122=, gd+200($pop137)
 	i32.const	$push136=, 0
-	f64.load	$125=, gd+224($pop136)
+	f64.load	$123=, gd+208($pop136)
 	i32.const	$push135=, 0
-	f64.load	$126=, gd+232($pop135)
+	f64.load	$124=, gd+216($pop135)
 	i32.const	$push134=, 0
-	f64.load	$127=, gd+240($pop134)
+	f64.load	$125=, gd+224($pop134)
 	i32.const	$push133=, 0
-	f64.load	$128=, gd+248($pop133)
+	f64.load	$126=, gd+232($pop133)
 	i32.const	$push132=, 0
-	f32.store	gf($pop132), $1
+	f64.load	$127=, gd+240($pop132)
 	i32.const	$push131=, 0
-	f32.store	gf+4($pop131), $2
+	f64.load	$128=, gd+248($pop131)
 	i32.const	$push130=, 0
-	f32.store	gf+8($pop130), $3
+	f32.store	gf($pop130), $1
 	i32.const	$push129=, 0
-	f32.store	gf+12($pop129), $4
+	f32.store	gf+4($pop129), $2
 	i32.const	$push128=, 0
-	f32.store	gf+16($pop128), $5
+	f32.store	gf+8($pop128), $3
 	i32.const	$push127=, 0
-	f32.store	gf+20($pop127), $6
+	f32.store	gf+12($pop127), $4
 	i32.const	$push126=, 0
-	f32.store	gf+24($pop126), $7
+	f32.store	gf+16($pop126), $5
 	i32.const	$push125=, 0
-	f32.store	gf+28($pop125), $8
+	f32.store	gf+20($pop125), $6
 	i32.const	$push124=, 0
-	f32.store	gf+32($pop124), $9
+	f32.store	gf+24($pop124), $7
 	i32.const	$push123=, 0
-	f32.store	gf+36($pop123), $10
+	f32.store	gf+28($pop123), $8
 	i32.const	$push122=, 0
-	f32.store	gf+40($pop122), $11
+	f32.store	gf+32($pop122), $9
 	i32.const	$push121=, 0
-	f32.store	gf+44($pop121), $12
+	f32.store	gf+36($pop121), $10
 	i32.const	$push120=, 0
-	f32.store	gf+48($pop120), $13
+	f32.store	gf+40($pop120), $11
 	i32.const	$push119=, 0
-	f32.store	gf+52($pop119), $14
+	f32.store	gf+44($pop119), $12
 	i32.const	$push118=, 0
-	f32.store	gf+56($pop118), $15
+	f32.store	gf+48($pop118), $13
 	i32.const	$push117=, 0
-	f32.store	gf+60($pop117), $16
+	f32.store	gf+52($pop117), $14
 	i32.const	$push116=, 0
-	f32.store	gf+64($pop116), $17
+	f32.store	gf+56($pop116), $15
 	i32.const	$push115=, 0
-	f32.store	gf+68($pop115), $18
+	f32.store	gf+60($pop115), $16
 	i32.const	$push114=, 0
-	f32.store	gf+72($pop114), $19
+	f32.store	gf+64($pop114), $17
 	i32.const	$push113=, 0
-	f32.store	gf+76($pop113), $20
+	f32.store	gf+68($pop113), $18
 	i32.const	$push112=, 0
-	f32.store	gf+80($pop112), $21
+	f32.store	gf+72($pop112), $19
 	i32.const	$push111=, 0
-	f32.store	gf+84($pop111), $22
+	f32.store	gf+76($pop111), $20
 	i32.const	$push110=, 0
-	f32.store	gf+88($pop110), $23
+	f32.store	gf+80($pop110), $21
 	i32.const	$push109=, 0
-	f32.store	gf+92($pop109), $24
+	f32.store	gf+84($pop109), $22
 	i32.const	$push108=, 0
-	f32.store	gf+96($pop108), $25
+	f32.store	gf+88($pop108), $23
 	i32.const	$push107=, 0
-	f32.store	gf+100($pop107), $26
+	f32.store	gf+92($pop107), $24
 	i32.const	$push106=, 0
-	f32.store	gf+104($pop106), $27
+	f32.store	gf+96($pop106), $25
 	i32.const	$push105=, 0
-	f32.store	gf+108($pop105), $28
+	f32.store	gf+100($pop105), $26
 	i32.const	$push104=, 0
-	f32.store	gf+112($pop104), $29
+	f32.store	gf+104($pop104), $27
 	i32.const	$push103=, 0
-	f32.store	gf+116($pop103), $30
+	f32.store	gf+108($pop103), $28
 	i32.const	$push102=, 0
-	f32.store	gf+120($pop102), $31
+	f32.store	gf+112($pop102), $29
 	i32.const	$push101=, 0
-	f32.store	gf+124($pop101), $32
+	f32.store	gf+116($pop101), $30
+	i32.const	$push100=, 0
+	f32.store	gf+120($pop100), $31
+	i32.const	$push99=, 0
+	f32.store	gf+124($pop99), $32
+	i32.const	$push98=, -1
+	i32.add 	$0=, $0, $pop98
 	f64.add 	$push2=, $160, $33
 	f64.add 	$push3=, $65, $pop2
 	f64.add 	$160=, $97, $pop3
@@ -496,77 +498,74 @@ foo:                                    # @foo
 	f64.add 	$push64=, $129, $64
 	f64.add 	$push65=, $96, $pop64
 	f64.add 	$129=, $128, $pop65
-	i32.const	$push100=, -1
-	i32.add 	$push99=, $0, $pop100
-	tee_local	$push98=, $0=, $pop99
-	br_if   	0, $pop98       # 0: up to label1
+	br_if   	0, $0           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	i32.const	$push292=, 0
-	f64.store	gd($pop292), $160
-	i32.const	$push291=, 0
-	f64.store	gd+8($pop291), $159
 	i32.const	$push290=, 0
-	f64.store	gd+16($pop290), $158
+	f64.store	gd($pop290), $160
 	i32.const	$push289=, 0
-	f64.store	gd+24($pop289), $157
+	f64.store	gd+8($pop289), $159
 	i32.const	$push288=, 0
-	f64.store	gd+32($pop288), $156
+	f64.store	gd+16($pop288), $158
 	i32.const	$push287=, 0
-	f64.store	gd+40($pop287), $155
+	f64.store	gd+24($pop287), $157
 	i32.const	$push286=, 0
-	f64.store	gd+48($pop286), $154
+	f64.store	gd+32($pop286), $156
 	i32.const	$push285=, 0
-	f64.store	gd+56($pop285), $153
+	f64.store	gd+40($pop285), $155
 	i32.const	$push284=, 0
-	f64.store	gd+64($pop284), $152
+	f64.store	gd+48($pop284), $154
 	i32.const	$push283=, 0
-	f64.store	gd+72($pop283), $151
+	f64.store	gd+56($pop283), $153
 	i32.const	$push282=, 0
-	f64.store	gd+80($pop282), $150
+	f64.store	gd+64($pop282), $152
 	i32.const	$push281=, 0
-	f64.store	gd+88($pop281), $149
+	f64.store	gd+72($pop281), $151
 	i32.const	$push280=, 0
-	f64.store	gd+96($pop280), $148
+	f64.store	gd+80($pop280), $150
 	i32.const	$push279=, 0
-	f64.store	gd+104($pop279), $147
+	f64.store	gd+88($pop279), $149
 	i32.const	$push278=, 0
-	f64.store	gd+112($pop278), $146
+	f64.store	gd+96($pop278), $148
 	i32.const	$push277=, 0
-	f64.store	gd+120($pop277), $145
+	f64.store	gd+104($pop277), $147
 	i32.const	$push276=, 0
-	f64.store	gd+128($pop276), $144
+	f64.store	gd+112($pop276), $146
 	i32.const	$push275=, 0
-	f64.store	gd+136($pop275), $143
+	f64.store	gd+120($pop275), $145
 	i32.const	$push274=, 0
-	f64.store	gd+144($pop274), $142
+	f64.store	gd+128($pop274), $144
 	i32.const	$push273=, 0
-	f64.store	gd+152($pop273), $141
+	f64.store	gd+136($pop273), $143
 	i32.const	$push272=, 0
-	f64.store	gd+160($pop272), $140
+	f64.store	gd+144($pop272), $142
 	i32.const	$push271=, 0
-	f64.store	gd+168($pop271), $139
+	f64.store	gd+152($pop271), $141
 	i32.const	$push270=, 0
-	f64.store	gd+176($pop270), $138
+	f64.store	gd+160($pop270), $140
 	i32.const	$push269=, 0
-	f64.store	gd+184($pop269), $137
+	f64.store	gd+168($pop269), $139
 	i32.const	$push268=, 0
-	f64.store	gd+192($pop268), $136
+	f64.store	gd+176($pop268), $138
 	i32.const	$push267=, 0
-	f64.store	gd+200($pop267), $135
+	f64.store	gd+184($pop267), $137
 	i32.const	$push266=, 0
-	f64.store	gd+208($pop266), $134
+	f64.store	gd+192($pop266), $136
 	i32.const	$push265=, 0
-	f64.store	gd+216($pop265), $133
+	f64.store	gd+200($pop265), $135
 	i32.const	$push264=, 0
-	f64.store	gd+224($pop264), $132
+	f64.store	gd+208($pop264), $134
 	i32.const	$push263=, 0
-	f64.store	gd+232($pop263), $131
+	f64.store	gd+216($pop263), $133
 	i32.const	$push262=, 0
-	f64.store	gd+240($pop262), $130
+	f64.store	gd+224($pop262), $132
 	i32.const	$push261=, 0
-	f64.store	gd+248($pop261), $129
+	f64.store	gd+232($pop261), $131
+	i32.const	$push260=, 0
+	f64.store	gd+240($pop260), $130
+	i32.const	$push259=, 0
+	f64.store	gd+248($pop259), $129
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -579,7 +578,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	f64.const	$0=, 0x0p0
 	i32.const	$3=, gd
@@ -590,25 +589,24 @@ main:                                   # @main
 	f64.store	0($3), $0
 	f32.convert_s/i32	$push0=, $1
 	f32.store	0($2), $pop0
-	i32.const	$push17=, 4
-	i32.add 	$2=, $2, $pop17
-	i32.const	$push16=, 8
-	i32.add 	$3=, $3, $pop16
-	f64.const	$push15=, 0x1p0
-	f64.add 	$0=, $0, $pop15
-	i32.const	$push14=, 1
-	i32.add 	$push13=, $1, $pop14
-	tee_local	$push12=, $1=, $pop13
+	i32.const	$push15=, 4
+	i32.add 	$2=, $2, $pop15
+	i32.const	$push14=, 8
+	i32.add 	$3=, $3, $pop14
+	f64.const	$push13=, 0x1p0
+	f64.add 	$0=, $0, $pop13
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
 	i32.const	$push11=, 32
-	i32.ne  	$push1=, $pop12, $pop11
+	i32.ne  	$push1=, $1, $pop11
 	br_if   	0, $pop1        # 0: up to label2
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	i32.const	$push18=, 1
-	call    	foo@FUNCTION, $pop18
-	i32.const	$3=, -1
+	i32.const	$push16=, 1
+	call    	foo@FUNCTION, $pop16
 	i32.const	$2=, gd
 	i32.const	$1=, 0
+	i32.const	$3=, 0
 .LBB1_3:                                # %for.body6
                                         # =>This Inner Loop Header: Depth=1
 	block   	
@@ -617,27 +615,26 @@ main:                                   # @main
 	f64.convert_s/i32	$push2=, $1
 	f64.ne  	$push4=, $pop3, $pop2
 	br_if   	1, $pop4        # 1: down to label3
-# BB#4:                                 # %lor.lhs.false
+# %bb.4:                                # %lor.lhs.false
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push22=, gf
-	i32.add 	$push5=, $1, $pop22
+	i32.const	$push17=, gf
+	i32.add 	$push5=, $1, $pop17
 	f32.load	$push6=, 0($pop5)
-	i32.const	$push21=, 1
-	i32.add 	$push20=, $3, $pop21
-	tee_local	$push19=, $3=, $pop20
-	f32.convert_s/i32	$push7=, $pop19
+	f32.convert_s/i32	$push7=, $3
 	f32.ne  	$push8=, $pop6, $pop7
 	br_if   	1, $pop8        # 1: down to label3
-# BB#5:                                 # %for.cond3
+# %bb.5:                                # %for.cond3
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push25=, 4
-	i32.add 	$1=, $1, $pop25
-	i32.const	$push24=, 8
-	i32.add 	$2=, $2, $pop24
-	i32.const	$push23=, 30
-	i32.le_u	$push9=, $3, $pop23
+	i32.const	$push21=, 1
+	i32.add 	$3=, $3, $pop21
+	i32.const	$push20=, 4
+	i32.add 	$1=, $1, $pop20
+	i32.const	$push19=, 8
+	i32.add 	$2=, $2, $pop19
+	i32.const	$push18=, 31
+	i32.le_u	$push9=, $3, $pop18
 	br_if   	0, $pop9        # 0: up to label4
-# BB#6:                                 # %for.end17
+# %bb.6:                                # %for.end17
 	end_loop
 	i32.const	$push10=, 0
 	call    	exit@FUNCTION, $pop10
@@ -669,6 +666,6 @@ gf:
 	.size	gf, 128
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ae3d1b716..97c53a746 100644
--- a/test/torture-s/20021120-2.c.s
+++ b/test/torture-s/20021120-2.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 10
 	i32.store	g1($pop1), $pop0
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 10
 	i32.store	g2($pop1), $pop0
@@ -58,5 +58,5 @@ g2:
 	.size	g2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20021120-3.c.s b/test/torture-s/20021120-3.c.s
index 99209767a..ac526ec11 100644
--- a/test/torture-s/20021120-3.c.s
+++ b/test/torture-s/20021120-3.c.s
@@ -8,14 +8,13 @@ foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop6, $pop8
-	tee_local	$push14=, $3=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
+	i32.sub 	$3=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $3
 	i32.div_u	$push0=, $1, $2
 	i32.store	0($3), $pop0
 	i32.const	$push1=, .L.str
@@ -41,14 +40,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
-	i32.const	$push6=, 0
+# %bb.0:                                # %if.end
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 32
-	i32.sub 	$push10=, $pop3, $pop5
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop6), $pop9
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push0=, 1073741823
 	i32.store	0($0), $pop0
 	i32.const	$push7=, 16
@@ -69,6 +67,6 @@ main:                                   # @main
 	.size	.L.str, 3
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 860885976..1f1114348 100644
--- a/test/torture-s/20021127-1.c.s
+++ b/test/torture-s/20021127-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ main:                                   # @main
 llabs:                                  # @llabs
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -37,5 +37,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20021204-1.c.s b/test/torture-s/20021204-1.c.s
index c86970556..fb6ebb705 100644
--- a/test/torture-s/20021204-1.c.s
+++ b/test/torture-s/20021204-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 2
 	i32.const	$push3=, 1
 	i32.const	$push0=, 0
@@ -54,6 +54,6 @@ z:
 	.size	z, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 cf115635f..101370ee2 100644
--- a/test/torture-s/20021219-1.c.s
+++ b/test/torture-s/20021219-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,51 +19,49 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 16
-	i32.sub 	$push19=, $pop13, $pop15
-	tee_local	$push18=, $0=, $pop19
+	i32.sub 	$1=, $pop13, $pop15
 	i32.const	$push3=, 10
-	i32.add 	$push4=, $pop18, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push1=, 0
 	i32.load8_u	$push2=, .Lmain.str+10($pop1)
 	i32.store8	0($pop4), $pop2
 	i32.const	$push6=, 8
-	i32.add 	$push7=, $0, $pop6
+	i32.add 	$push7=, $1, $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	0($0), $pop8
+	i64.store	0($1), $pop8
 	i32.const	$push9=, 6
-	i32.or  	$0=, $0, $pop9
-	i32.const	$1=, 32
+	i32.or  	$1=, $1, $pop9
+	i32.const	$0=, 32
 .LBB1_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
+	i32.const	$push20=, 255
+	i32.and 	$0=, $0, $pop20
 	block   	
-	i32.const	$push24=, 255
-	i32.and 	$push23=, $1, $pop24
-	tee_local	$push22=, $1=, $pop23
-	i32.const	$push21=, 32
-	i32.eq  	$push10=, $pop22, $pop21
+	i32.const	$push19=, 32
+	i32.eq  	$push10=, $0, $pop19
 	br_if   	0, $pop10       # 0: down to label2
-# BB#2:                                 # %while.cond
+# %bb.2:                                # %while.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push25=, 13
-	i32.ne  	$push11=, $1, $pop25
+	i32.const	$push21=, 13
+	i32.ne  	$push11=, $0, $pop21
 	br_if   	2, $pop11       # 2: down to label0
 .LBB1_3:                                # %while.body
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label2:
-	i32.load8_u	$1=, 0($0)
-	i32.const	$push20=, 1
-	i32.add 	$push0=, $0, $pop20
-	copy_local	$0=, $pop0
+	i32.load8_u	$0=, 0($1)
+	i32.const	$push18=, 1
+	i32.add 	$push0=, $1, $pop18
+	copy_local	$1=, $pop0
 	br      	0               # 0: up to label1
 .LBB1_4:                                # %while.end
 	end_loop
@@ -81,4 +79,4 @@ main:                                   # @main
 	.size	.Lmain.str, 11
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030105-1.c.s b/test/torture-s/20030105-1.c.s
index b4de9fa72..27e733805 100644
--- a/test/torture-s/20030105-1.c.s
+++ b/test/torture-s/20030105-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 28
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,13 +19,13 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push1=, foo@FUNCTION
 	i32.const	$push0=, 28
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	call    	exit@FUNCTION, $pop3
 	unreachable
@@ -38,6 +38,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 882d64f6e..7862b2fee 100644
--- a/test/torture-s/20030109-1.c.s
+++ b/test/torture-s/20030109-1.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, x+4($pop3)
 	i32.const	$push1=, 40
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -35,5 +35,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20030117-1.c.s b/test/torture-s/20030117-1.c.s
index 04a437c51..07edc908f 100644
--- a/test/torture-s/20030117-1.c.s
+++ b/test/torture-s/20030117-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -21,7 +21,7 @@ main:                                   # @main
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $1, $0
 	i32.add 	$push1=, $pop0, $2
 	i32.const	$push2=, 3
@@ -38,7 +38,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.mul 	$push1=, $1, $1
 	i32.mul 	$push0=, $0, $0
 	i32.add 	$push2=, $pop1, $pop0
@@ -52,5 +52,5 @@ bar:                                    # @bar
 	.size	bar, .Lfunc_end2-bar
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030120-1.c.s b/test/torture-s/20030120-1.c.s
index 056b2e70a..dd7211a14 100644
--- a/test/torture-s/20030120-1.c.s
+++ b/test/torture-s/20030120-1.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.select	$push1=, $0, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.select	$push1=, $0, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.ne  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -51,7 +51,7 @@ test3:                                  # @test3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end11
+# %bb.0:                                # %if.end11
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -60,5 +60,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030120-2.c.s b/test/torture-s/20030120-2.c.s
index efac761ed..1a39ab01c 100644
--- a/test/torture-s/20030120-2.c.s
+++ b/test/torture-s/20030120-2.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 4
 	i32.const	$push0=, 3
 	i32.const	$push2=, 1
@@ -29,7 +29,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,4 +37,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030125-1.c.s b/test/torture-s/20030125-1.c.s
index 80f863422..3aca314a7 100644
--- a/test/torture-s/20030125-1.c.s
+++ b/test/torture-s/20030125-1.c.s
@@ -7,7 +7,7 @@
 t:                                      # @t
 	.param  	f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.promote/f32	$push0=, $0
 	f64.call	$push1=, sin@FUNCTION, $pop0
 	f32.demote/f64	$push2=, $pop1
@@ -16,20 +16,6 @@ t:                                      # @t
 .Lfunc_end0:
 	.size	t, .Lfunc_end0-t
                                         # -- End function
-	.section	.text.sin,"ax",@progbits
-	.hidden	sin                     # -- Begin function sin
-	.globl	sin
-	.type	sin,@function
-sin:                                    # @sin
-	.param  	f64
-	.result 	f64
-# BB#0:                                 # %entry
-	copy_local	$push0=, $0
-                                        # fallthrough-return: $pop0
-	.endfunc
-.Lfunc_end1:
-	.size	sin, .Lfunc_end1-sin
-                                        # -- End function
 	.section	.text.q,"ax",@progbits
 	.hidden	q                       # -- Begin function q
 	.globl	q
@@ -37,27 +23,12 @@ sin:                                    # @sin
 q:                                      # @q
 	.param  	f32
 	.result 	f32
-	.local  	f32
-# BB#0:                                 # %entry
-	copy_local	$push0=, $1
+# %bb.0:                                # %entry
+	f32.floor	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
-.Lfunc_end2:
-	.size	q, .Lfunc_end2-q
-                                        # -- End function
-	.section	.text.floor,"ax",@progbits
-	.hidden	floor                   # -- Begin function floor
-	.globl	floor
-	.type	floor,@function
-floor:                                  # @floor
-	.param  	f64
-	.result 	f64
-# BB#0:                                 # %entry
-	call    	abort@FUNCTION
-	unreachable
-	.endfunc
-.Lfunc_end3:
-	.size	floor, .Lfunc_end3-floor
+.Lfunc_end1:
+	.size	q, .Lfunc_end1-q
                                         # -- End function
 	.section	.text.q1,"ax",@progbits
 	.hidden	q1                      # -- Begin function q1
@@ -66,13 +37,13 @@ floor:                                  # @floor
 q1:                                     # @q1
 	.param  	f32
 	.result 	f64
-	.local  	f64
-# BB#0:                                 # %entry
-	copy_local	$push0=, $1
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	f32.floor	$push0=, $0
+	f64.promote/f32	$push1=, $pop0
+                                        # fallthrough-return: $pop1
 	.endfunc
-.Lfunc_end4:
-	.size	q1, .Lfunc_end4-q1
+.Lfunc_end2:
+	.size	q1, .Lfunc_end2-q1
                                         # -- End function
 	.section	.text.main,"ax",@progbits
 	.hidden	main                    # -- Begin function main
@@ -80,12 +51,26 @@ q1:                                     # @q1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end8
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end3:
+	.size	main, .Lfunc_end3-main
+                                        # -- End function
+	.section	.text.floor,"ax",@progbits
+	.hidden	floor                   # -- Begin function floor
+	.globl	floor
+	.type	floor,@function
+floor:                                  # @floor
+	.param  	f64
+	.result 	f64
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
-.Lfunc_end5:
-	.size	main, .Lfunc_end5-main
+.Lfunc_end4:
+	.size	floor, .Lfunc_end4-floor
                                         # -- End function
 	.section	.text.floorf,"ax",@progbits
 	.hidden	floorf                  # -- Begin function floorf
@@ -94,12 +79,26 @@ main:                                   # @main
 floorf:                                 # @floorf
 	.param  	f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	copy_local	$push0=, $0
+                                        # fallthrough-return: $pop0
+	.endfunc
+.Lfunc_end5:
+	.size	floorf, .Lfunc_end5-floorf
+                                        # -- End function
+	.section	.text.sin,"ax",@progbits
+	.hidden	sin                     # -- Begin function sin
+	.globl	sin
+	.type	sin,@function
+sin:                                    # @sin
+	.param  	f64
+	.result 	f64
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end6:
-	.size	floorf, .Lfunc_end6-floorf
+	.size	sin, .Lfunc_end6-sin
                                         # -- End function
 	.section	.text.sinf,"ax",@progbits
 	.hidden	sinf                    # -- Begin function sinf
@@ -108,7 +107,7 @@ floorf:                                 # @floorf
 sinf:                                   # @sinf
 	.param  	f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -116,5 +115,5 @@ sinf:                                   # @sinf
 	.size	sinf, .Lfunc_end7-sinf
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20030128-1.c.s b/test/torture-s/20030128-1.c.s
index fc8ae5842..dab0f56af 100644
--- a/test/torture-s/20030128-1.c.s
+++ b/test/torture-s/20030128-1.c.s
@@ -7,24 +7,23 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.load16_s	$0=, y($pop9)
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
-	i32.load8_u	$push0=, x($pop7)
-	i32.div_s	$push6=, $pop0, $0
-	tee_local	$push5=, $0=, $pop6
-	i32.store8	x($pop8), $pop5
+	i32.load16_s	$0=, y($pop7)
+	i32.const	$push6=, 0
+	i32.load8_u	$push0=, x($pop6)
+	i32.div_s	$0=, $pop0, $0
+	i32.const	$push5=, 0
+	i32.store8	x($pop5), $0
 	block   	
 	i32.const	$push1=, 255
 	i32.and 	$push2=, $0, $pop1
 	i32.const	$push3=, 246
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push10=, 0
-	call    	exit@FUNCTION, $pop10
+# %bb.1:                                # %if.end
+	i32.const	$push8=, 0
+	call    	exit@FUNCTION, $pop8
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -52,6 +51,6 @@ y:
 	.size	y, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 79c511344..028a1a110 100644
--- a/test/torture-s/20030203-1.c.s
+++ b/test/torture-s/20030203-1.c.s
@@ -7,7 +7,7 @@
 do_layer3:                              # @do_layer3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$push1=, $0, $pop0
 	i32.const	$push2=, 1
@@ -23,7 +23,7 @@ do_layer3:                              # @do_layer3
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -35,7 +35,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -43,4 +43,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030209-1.c.s b/test/torture-s/20030209-1.c.s
index b67066055..ce0ea4e96 100644
--- a/test/torture-s/20030209-1.c.s
+++ b/test/torture-s/20030209-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 4631107791820423168
 	i64.store	x+79200($pop1), $pop0
@@ -27,5 +27,5 @@ x:
 	.size	x, 80000
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030216-1.c.s b/test/torture-s/20030216-1.c.s
index 58a6fb682..78744c324 100644
--- a/test/torture-s/20030216-1.c.s
+++ b/test/torture-s/20030216-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,4 +23,4 @@ one:
 	.size	one, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030218-1.c.s b/test/torture-s/20030218-1.c.s
index 430ae6275..b65f6ded2 100644
--- a/test/torture-s/20030218-1.c.s
+++ b/test/torture-s/20030218-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, 2
 	i32.add 	$push1=, $0, $pop0
@@ -25,14 +25,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
-	i32.const	$push7=, 0
+# %bb.0:                                # %if.end
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop4, $pop6
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop7), $pop9
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push2=, 0
 	i32.const	$push0=, 16
 	i32.add 	$push1=, $0, $pop0
@@ -56,5 +55,5 @@ q:
 	.size	q, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030221-1.c.s b/test/torture-s/20030221-1.c.s
index 49363f044..afbc0b59d 100644
--- a/test/torture-s/20030221-1.c.s
+++ b/test/torture-s/20030221-1.c.s
@@ -7,36 +7,34 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop6, $pop8
-	tee_local	$push17=, $1=, $pop18
-	i32.store	__stack_pointer($pop9), $pop17
-	i32.const	$push16=, 0
-	i64.load	$push0=, .Lmain.buf+8($pop16)
+	i32.sub 	$1=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $1
+	i32.const	$push14=, 0
+	i64.load	$push0=, .Lmain.buf+8($pop14)
 	i64.store	8($1), $pop0
-	i32.const	$push15=, 0
-	i64.load	$push1=, .Lmain.buf($pop15)
+	i32.const	$push13=, 0
+	i64.load	$push1=, .Lmain.buf($pop13)
 	i64.store	0($1), $pop1
-	i32.call	$push14=, strlen@FUNCTION, $1
-	tee_local	$push13=, $0=, $pop14
-	i32.store8	0($1), $pop13
+	i32.call	$0=, strlen@FUNCTION, $1
+	i32.store8	0($1), $0
 	block   	
 	i32.const	$push2=, 255
 	i32.and 	$push3=, $0, $pop2
 	i32.const	$push4=, 10
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push12=, 0
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $1, $pop10
 	i32.store	__stack_pointer($pop12), $pop11
-	i32.const	$push19=, 0
-	return  	$pop19
+	i32.const	$push15=, 0
+	return  	$pop15
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -53,6 +51,6 @@ main:                                   # @main
 	.size	.Lmain.buf, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 20bee4dd4..2ecc63245 100644
--- a/test/torture-s/20030222-1.c.s
+++ b/test/torture-s/20030222-1.c.s
@@ -6,7 +6,7 @@
 	.type	ll_to_int,@function
 ll_to_int:                              # @ll_to_int
 	.param  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	i64.store32	0($1), $0
@@ -22,18 +22,16 @@ ll_to_int:                              # @ll_to_int
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop2, $pop4
-	tee_local	$push9=, $2=, $pop10
-	i32.store	__stack_pointer($pop5), $pop9
-	i32.const	$push8=, 0
-	i32.load	$push7=, val($pop8)
-	tee_local	$push6=, $1=, $pop7
-	i64.extend_s/i32	$0=, $pop6
+	i32.sub 	$2=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $2
+	i32.const	$push6=, 0
+	i32.load	$1=, val($pop6)
+	i64.extend_s/i32	$0=, $1
 	#APP
 	#NO_APP
 	i64.store32	12($2), $0
@@ -41,9 +39,9 @@ main:                                   # @main
 	i32.load	$push0=, 12($2)
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push11=, 0
-	call    	exit@FUNCTION, $pop11
+# %bb.1:                                # %if.end
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -63,6 +61,6 @@ val:
 	.size	val, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0bf5da478..ffafa0973 100644
--- a/test/torture-s/20030224-2.c.s
+++ b/test/torture-s/20030224-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,4 +32,4 @@ node_p:
 	.size	node_p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030307-1.c.s b/test/torture-s/20030307-1.c.s
index f6e4c1611..b487f3f19 100644
--- a/test/torture-s/20030307-1.c.s
+++ b/test/torture-s/20030307-1.c.s
@@ -7,7 +7,7 @@
 vfswrap_lock:                           # @vfswrap_lock
 	.param  	i32, i32, i32, i64, i64, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $5
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ vfswrap_lock:                           # @vfswrap_lock
 fcntl_lock:                             # @fcntl_lock
 	.param  	i32, i32, i64, i64, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $4
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ fcntl_lock:                             # @fcntl_lock
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -42,4 +42,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030313-1.c.s b/test/torture-s/20030313-1.c.s
index 3dd1c75cb..2d41cb640 100644
--- a/test/torture-s/20030313-1.c.s
+++ b/test/torture-s/20030313-1.c.s
@@ -6,72 +6,72 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 12
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load	$push2=, 0($0)
 	i32.const	$push3=, 1
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.load	$push5=, 4($0)
 	i32.const	$push6=, 11
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %if.end5
+# %bb.3:                                # %if.end5
 	i32.load	$push8=, 8($0)
 	i32.const	$push9=, 2
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false8
+# %bb.4:                                # %lor.lhs.false8
 	i32.load	$push11=, 12($0)
 	i32.const	$push12=, 12
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#5:                                 # %if.end12
+# %bb.5:                                # %if.end12
 	i32.load	$push14=, 16($0)
 	i32.const	$push15=, 3
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#6:                                 # %lor.lhs.false15
+# %bb.6:                                # %lor.lhs.false15
 	i32.load	$push17=, 20($0)
 	i32.const	$push18=, 13
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#7:                                 # %if.end19
+# %bb.7:                                # %if.end19
 	i32.load	$push20=, 24($0)
 	i32.const	$push21=, 4
 	i32.ne  	$push22=, $pop20, $pop21
 	br_if   	0, $pop22       # 0: down to label0
-# BB#8:                                 # %lor.lhs.false22
+# %bb.8:                                # %lor.lhs.false22
 	i32.load	$push23=, 28($0)
 	i32.const	$push24=, 14
 	i32.ne  	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label0
-# BB#9:                                 # %if.end26
+# %bb.9:                                # %if.end26
 	i32.load	$push26=, 32($0)
 	i32.const	$push27=, 5
 	i32.ne  	$push28=, $pop26, $pop27
 	br_if   	0, $pop28       # 0: down to label0
-# BB#10:                                # %lor.lhs.false29
+# %bb.10:                               # %lor.lhs.false29
 	i32.load	$push29=, 36($0)
 	i32.const	$push30=, 15
 	i32.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#11:                                # %if.end33
+# %bb.11:                               # %if.end33
 	i32.load	$push32=, 40($0)
 	i32.const	$push33=, 6
 	i32.ne  	$push34=, $pop32, $pop33
 	br_if   	0, $pop34       # 0: down to label0
-# BB#12:                                # %lor.lhs.false36
+# %bb.12:                               # %lor.lhs.false36
 	i32.load	$push35=, 44($0)
 	i32.const	$push36=, 16
 	i32.ne  	$push37=, $pop35, $pop36
 	br_if   	0, $pop37       # 0: down to label0
-# BB#13:                                # %if.end40
+# %bb.13:                               # %if.end40
 	return
 .LBB0_14:                               # %if.then
 	end_block                       # label0:
@@ -88,14 +88,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 160
-	i32.sub 	$push21=, $pop12, $pop14
-	tee_local	$push20=, $0=, $pop21
-	i32.store	__stack_pointer($pop15), $pop20
+	i32.sub 	$0=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $0
 	i64.const	$push0=, 47244640257
 	i64.store	0($0), $pop0
 	i64.const	$push1=, 51539607554
@@ -142,6 +141,6 @@ x:
 	.size	x, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c4cb5cc03..b622a6bbd 100644
--- a/test/torture-s/20030316-1.c.s
+++ b/test/torture-s/20030316-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030330-1.c.s b/test/torture-s/20030330-1.c.s
index 566531cab..0ad9b7016 100644
--- a/test/torture-s/20030330-1.c.s
+++ b/test/torture-s/20030330-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030401-1.c.s b/test/torture-s/20030401-1.c.s
index b580fd9f5..8c3bc1ccd 100644
--- a/test/torture-s/20030401-1.c.s
+++ b/test/torture-s/20030401-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -31,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -39,4 +39,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030403-1.c.s b/test/torture-s/20030403-1.c.s
index ce1defe2e..550172569 100644
--- a/test/torture-s/20030403-1.c.s
+++ b/test/torture-s/20030403-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030404-1.c.s b/test/torture-s/20030404-1.c.s
index 32f2db5db..1a8de640e 100644
--- a/test/torture-s/20030404-1.c.s
+++ b/test/torture-s/20030404-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030408-1.c.s b/test/torture-s/20030408-1.c.s
index fc300361c..f3f6dbe46 100644
--- a/test/torture-s/20030408-1.c.s
+++ b/test/torture-s/20030408-1.c.s
@@ -6,7 +6,7 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ test3:                                  # @test3
 	.type	test4,@function
 test4:                                  # @test4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -58,7 +58,7 @@ test4:                                  # @test4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -66,4 +66,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030606-1.c.s b/test/torture-s/20030606-1.c.s
index 02f9fb604..3e6bb3d64 100644
--- a/test/torture-s/20030606-1.c.s
+++ b/test/torture-s/20030606-1.c.s
@@ -7,13 +7,13 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 55
 	i32.store	0($0), $pop0
 	block   	
 	i32.eqz 	$push7=, $1
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push5=, 4
 	i32.add 	$push1=, $0, $pop5
 	i32.store	0($pop1), $1
@@ -35,7 +35,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030613-1.c.s b/test/torture-s/20030613-1.c.s
index aef6a1ed0..8f69c48d2 100644
--- a/test/torture-s/20030613-1.c.s
+++ b/test/torture-s/20030613-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030626-1.c.s b/test/torture-s/20030626-1.c.s
index 073087308..5b896ade0 100644
--- a/test/torture-s/20030626-1.c.s
+++ b/test/torture-s/20030626-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 7303014
 	i32.store	buf($pop1), $pop0
@@ -26,4 +26,4 @@ buf:
 	.size	buf, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030626-2.c.s b/test/torture-s/20030626-2.c.s
index 85e809809..e678052b6 100644
--- a/test/torture-s/20030626-2.c.s
+++ b/test/torture-s/20030626-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i64.load	$push1=, .L.str.2+5($pop6):p2align=0
@@ -37,4 +37,4 @@ buf:
 	.size	.L.str.2, 13
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030714-1.c.s b/test/torture-s/20030714-1.c.s
index 13989588a..963626e25 100644
--- a/test/torture-s/20030714-1.c.s
+++ b/test/torture-s/20030714-1.c.s
@@ -6,9 +6,11 @@
 	.type	RenderBox_setStyle,@function
 RenderBox_setStyle:                     # @RenderBox_setStyle
 	.param  	i32, i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$3=, 16
+	.local  	i32
+# %bb.0:                                # %entry
+	i32.load16_u	$2=, 26($0)
+	block   	
+	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 2
@@ -16,57 +18,67 @@ RenderBox_setStyle:                     # @RenderBox_setStyle
 	i32.load8_u	$push2=, 0($pop1)
 	i32.const	$push3=, 4
 	i32.and 	$push4=, $pop2, $pop3
-	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %sw.default
+	br_if   	0, $pop4        # 0: down to label3
+# %bb.1:                                # %sw.default
 	block   	
-	i32.load16_u	$push26=, 26($0)
-	tee_local	$push25=, $3=, $pop26
-	i32.const	$push24=, 16
-	i32.and 	$push5=, $pop25, $pop24
-	i32.eqz 	$push32=, $pop5
-	br_if   	0, $pop32       # 0: down to label2
-# BB#2:                                 # %if.then
-	i32.const	$push6=, 26
-	i32.add 	$push7=, $0, $pop6
-	i32.const	$push29=, 16
-	i32.or  	$push28=, $3, $pop29
-	tee_local	$push27=, $3=, $pop28
-	i32.store16	0($pop7), $pop27
+	i32.const	$push32=, 16
+	i32.and 	$push6=, $2, $pop32
+	i32.eqz 	$push34=, $pop6
+	br_if   	0, $pop34       # 0: down to label4
+# %bb.2:                                # %if.then
+	i32.const	$push33=, 16
+	i32.or  	$2=, $2, $pop33
+	i32.const	$push7=, 26
+	i32.add 	$push8=, $0, $pop7
+	i32.store16	0($pop8), $2
 .LBB0_3:                                # %if.end
-	end_block                       # label2:
-	i32.const	$push11=, 26
-	i32.add 	$push12=, $0, $pop11
-	i32.const	$push9=, 65519
-	i32.and 	$push10=, $3, $pop9
-	i32.store16	0($pop12), $pop10
+	end_block                       # label4:
+	i32.const	$push12=, 26
+	i32.add 	$push13=, $0, $pop12
+	i32.const	$push10=, 65519
+	i32.and 	$push11=, $2, $pop10
+	i32.store16	0($pop13), $pop11
 	i32.load	$2=, 0($1)
-	block   	
-	i32.load	$push14=, 28($0)
-	i32.call_indirect	$push15=, $0, $pop14
-	br_if   	0, $pop15       # 0: down to label3
-# BB#4:                                 # %if.end
-	i32.const	$3=, 8
-	i32.const	$push13=, 1572864
-	i32.and 	$push8=, $2, $pop13
-	br_if   	1, $pop8        # 1: down to label1
-.LBB0_5:                                # %if.else
+	i32.load	$push15=, 28($0)
+	i32.call_indirect	$push16=, $0, $pop15
+	br_if   	1, $pop16       # 1: down to label2
+# %bb.4:                                # %if.end
+	i32.const	$push14=, 1572864
+	i32.and 	$push9=, $2, $pop14
+	i32.eqz 	$push35=, $pop9
+	br_if   	1, $pop35       # 1: down to label2
+# %bb.5:                                # %if.then33
+	i32.const	$push17=, 26
+	i32.add 	$push18=, $0, $pop17
+	i32.load16_u	$push19=, 0($pop18)
+	i32.const	$push20=, 8
+	i32.or  	$2=, $pop19, $pop20
+	br      	2               # 2: down to label1
+.LBB0_6:                                # %sw.bb
 	end_block                       # label3:
-	i32.const	$3=, 64
-	i32.load	$push16=, 0($1)
-	i32.const	$push17=, 393216
-	i32.and 	$push18=, $pop16, $pop17
-	i32.const	$push19=, 131072
-	i32.ne  	$push20=, $pop18, $pop19
-	br_if   	1, $pop20       # 1: down to label0
-.LBB0_6:                                # %sw.epilog.sink.split
+	i32.const	$push5=, 16
+	i32.or  	$2=, $2, $pop5
+	br      	1               # 1: down to label1
+.LBB0_7:                                # %if.else
+	end_block                       # label2:
+	i32.load	$push21=, 0($1)
+	i32.const	$push22=, 393216
+	i32.and 	$push23=, $pop21, $pop22
+	i32.const	$push24=, 131072
+	i32.ne  	$push25=, $pop23, $pop24
+	br_if   	1, $pop25       # 1: down to label0
+# %bb.8:                                # %if.then48
+	i32.const	$push26=, 26
+	i32.add 	$push27=, $0, $pop26
+	i32.load16_u	$push28=, 0($pop27)
+	i32.const	$push29=, 64
+	i32.or  	$2=, $pop28, $pop29
+.LBB0_9:                                # %sw.epilog.sink.split
 	end_block                       # label1:
-	i32.const	$push21=, 26
-	i32.add 	$push31=, $0, $pop21
-	tee_local	$push30=, $0=, $pop31
-	i32.load16_u	$push22=, 0($0)
-	i32.or  	$push23=, $pop22, $3
-	i32.store16	0($pop30), $pop23
-.LBB0_7:                                # %sw.epilog
+	i32.const	$push30=, 26
+	i32.add 	$push31=, $0, $pop30
+	i32.store16	0($pop31), $2
+.LBB0_10:                               # %sw.epilog
 	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
@@ -79,7 +91,7 @@ RenderBox_setStyle:                     # @RenderBox_setStyle
 	.type	RenderObject_setStyle,@function
 RenderObject_setStyle:                  # @RenderObject_setStyle
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -91,7 +103,7 @@ RenderObject_setStyle:                  # @RenderObject_setStyle
 	.type	removeFromSpecialObjects,@function
 removeFromSpecialObjects:               # @removeFromSpecialObjects
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -104,7 +116,7 @@ removeFromSpecialObjects:               # @removeFromSpecialObjects
 RenderBox_isTableCell:                  # @RenderBox_isTableCell
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -117,7 +129,7 @@ RenderBox_isTableCell:                  # @RenderBox_isTableCell
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %RenderBox_setStyle.exit
+# %bb.0:                                # %RenderBox_setStyle.exit
 	i32.const	$push1=, 0
 	i32.const	$push0=, RenderBox_isTableCell@FUNCTION
 	i32.store	g_this+28($pop1), $pop0
@@ -179,5 +191,5 @@ g__style:
 	.size	g__style, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030715-1.c.s b/test/torture-s/20030715-1.c.s
index 60e2cde85..b614aa8e1 100644
--- a/test/torture-s/20030715-1.c.s
+++ b/test/torture-s/20030715-1.c.s
@@ -7,7 +7,7 @@
 ap_check_cmd_context:                   # @ap_check_cmd_context
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -22,20 +22,20 @@ server_type:                            # @server_type
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
 	block   	
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, strcmp@FUNCTION, $2, $pop0
 	i32.eqz 	$push7=, $pop1
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	block   	
 	i32.const	$push2=, .L.str.1
 	i32.call	$push3=, strcmp@FUNCTION, $2, $pop2
 	i32.eqz 	$push8=, $pop3
 	br_if   	0, $pop8        # 0: down to label1
-# BB#2:                                 # %cleanup
+# %bb.2:                                # %cleanup
 	i32.const	$push5=, .L.str.2
 	return  	$pop5
 .LBB1_3:
@@ -57,7 +57,7 @@ server_type:                            # @server_type
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	ap_standalone($pop1), $pop0
@@ -94,5 +94,5 @@ ap_standalone:
 	.size	.L.str.2, 50
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/20030717-1.c.s b/test/torture-s/20030717-1.c.s
index 2899e1f1a..0cf13cabe 100644
--- a/test/torture-s/20030717-1.c.s
+++ b/test/torture-s/20030717-1.c.s
@@ -7,70 +7,63 @@
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push28=, 4($1)
-	tee_local	$push27=, $4=, $pop28
-	i32.load	$push26=, 24($0)
-	tee_local	$push25=, $2=, $pop26
-	i32.const	$push24=, 20
-	i32.mul 	$push0=, $pop25, $pop24
+	.local  	i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.load	$2=, 24($0)
+	i32.load	$4=, 4($1)
+	i32.const	$push20=, 20
+	i32.mul 	$push0=, $2, $pop20
 	i32.add 	$push1=, $0, $pop0
 	i32.load	$push2=, 12($pop1)
-	i32.sub 	$push23=, $pop27, $pop2
-	tee_local	$push22=, $7=, $pop23
-	i32.const	$push21=, 31
-	i32.shr_s	$push20=, $7, $pop21
-	tee_local	$push19=, $7=, $pop20
-	i32.add 	$push3=, $pop22, $pop19
+	i32.sub 	$6=, $4, $pop2
+	i32.const	$push19=, 31
+	i32.shr_s	$7=, $6, $pop19
+	i32.add 	$push3=, $6, $7
 	i32.xor 	$5=, $pop3, $7
 	i32.load16_u	$3=, 0($1)
 	copy_local	$1=, $2
-	copy_local	$7=, $2
+	copy_local	$8=, $2
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
 	block   	
-	i32.const	$push29=, 0
-	i32.gt_s	$push4=, $1, $pop29
+	i32.const	$push21=, 0
+	i32.gt_s	$push4=, $1, $pop21
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push30=, 20
-	i32.add 	$push5=, $0, $pop30
+	i32.const	$push22=, 20
+	i32.add 	$push5=, $0, $pop22
 	i32.load	$1=, 0($pop5)
 .LBB0_3:                                # %if.end
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
-	i32.const	$push39=, -1
-	i32.add 	$push38=, $1, $pop39
-	tee_local	$push37=, $1=, $pop38
-	i32.const	$push36=, 20
-	i32.mul 	$push6=, $1, $pop36
+	i32.const	$push25=, -1
+	i32.add 	$1=, $1, $pop25
+	i32.const	$push24=, 20
+	i32.mul 	$push6=, $1, $pop24
 	i32.add 	$push7=, $0, $pop6
 	i32.load	$push8=, 12($pop7)
-	i32.sub 	$push35=, $4, $pop8
-	tee_local	$push34=, $6=, $pop35
-	i32.const	$push33=, 31
-	i32.shr_s	$push32=, $6, $pop33
-	tee_local	$push31=, $6=, $pop32
-	i32.add 	$push9=, $pop34, $pop31
-	i32.xor 	$push10=, $pop9, $6
+	i32.sub 	$6=, $4, $pop8
+	i32.const	$push23=, 31
+	i32.shr_s	$7=, $6, $pop23
+	i32.add 	$push9=, $6, $7
+	i32.xor 	$push10=, $pop9, $7
 	i32.lt_u	$push11=, $pop10, $5
-	i32.select	$7=, $pop37, $7, $pop11
+	i32.select	$8=, $1, $8, $pop11
 	i32.ne  	$push12=, $1, $2
 	br_if   	0, $pop12       # 0: up to label0
-# BB#4:                                 # %do.end
+# %bb.4:                                # %do.end
 	end_loop
 	i32.const	$push16=, 20
-	i32.mul 	$push17=, $7, $pop16
+	i32.mul 	$push17=, $8, $pop16
 	i32.add 	$push18=, $0, $pop17
 	i32.const	$push13=, 9
 	i32.shr_u	$push14=, $3, $pop13
 	i32.add 	$push15=, $pop14, $4
 	i32.store	12($pop18), $pop15
-	copy_local	$push40=, $7
-                                        # fallthrough-return: $pop40
+	copy_local	$push26=, $8
+                                        # fallthrough-return: $pop26
 	.endfunc
 .Lfunc_end0:
 	.size	bar, .Lfunc_end0-bar
@@ -81,7 +74,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %bar.exit
+# %bb.0:                                # %bar.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -89,4 +82,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030718-1.c.s b/test/torture-s/20030718-1.c.s
index e5fa53236..131778fa0 100644
--- a/test/torture-s/20030718-1.c.s
+++ b/test/torture-s/20030718-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030821-1.c.s b/test/torture-s/20030821-1.c.s
index 373c406f0..e25d6417c 100644
--- a/test/torture-s/20030821-1.c.s
+++ b/test/torture-s/20030821-1.c.s
@@ -7,14 +7,14 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -2130706433
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, -2147418114
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -31,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20030828-1.c.s b/test/torture-s/20030828-1.c.s
index 20e5fd5c3..159509eff 100644
--- a/test/torture-s/20030828-1.c.s
+++ b/test/torture-s/20030828-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, p($pop0)
 	i32.load	$push2=, 0($pop1)
@@ -24,14 +24,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
-	i32.const	$push5=, 0
+# %bb.0:                                # %if.end
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop2, $pop4
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop5), $pop9
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 0
 	i32.const	$push6=, 12
 	i32.add 	$push7=, $0, $pop6
@@ -55,5 +54,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030828-2.c.s b/test/torture-s/20030828-2.c.s
index 27086df3b..d702b7a92 100644
--- a/test/torture-s/20030828-2.c.s
+++ b/test/torture-s/20030828-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030903-1.c.s b/test/torture-s/20030903-1.c.s
index 6c2fcef6f..f7ebdb3f9 100644
--- a/test/torture-s/20030903-1.c.s
+++ b/test/torture-s/20030903-1.c.s
@@ -7,19 +7,18 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push6=, 0
-	i32.load	$push0=, test($pop6)
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	i32.load	$push0=, test($pop4)
 	i32.const	$push1=, -1
-	i32.add 	$push5=, $pop0, $pop1
-	tee_local	$push4=, $0=, $pop5
+	i32.add 	$0=, $pop0, $pop1
+	block   	
 	i32.const	$push2=, 3
-	i32.le_u	$push3=, $pop4, $pop2
+	i32.le_u	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %sw.epilog
-	i32.const	$push7=, 0
-	return  	$pop7
+# %bb.1:                                # %sw.epilog
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB0_2:                                # %entry
 	end_block                       # label0:
 	block   	
@@ -35,7 +34,7 @@ main:                                   # @main
 	.section	.text.y,"ax",@progbits
 	.type	y,@function             # -- Begin function y
 y:                                      # @y
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -50,5 +49,5 @@ test:
 	.size	test, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20030909-1.c.s b/test/torture-s/20030909-1.c.s
index 39f69131c..1edcdf608 100644
--- a/test/torture-s/20030909-1.c.s
+++ b/test/torture-s/20030909-1.c.s
@@ -6,11 +6,11 @@
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eq  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ test:                                   # @test
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -38,7 +38,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -47,6 +47,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b827f627a..660d12cac 100644
--- a/test/torture-s/20030910-1.c.s
+++ b/test/torture-s/20030910-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030913-1.c.s b/test/torture-s/20030913-1.c.s
index 1c605fbe3..e8d099c3e 100644
--- a/test/torture-s/20030913-1.c.s
+++ b/test/torture-s/20030913-1.c.s
@@ -6,7 +6,7 @@
 	.type	fn2,@function
 fn2:                                    # @fn2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, glob
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -19,7 +19,7 @@ fn2:                                    # @fn2
 	.globl	test
 	.type	test,@function
 test:                                   # @test
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 42
 	i32.store	glob($pop1), $pop0
@@ -34,7 +34,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 42
 	i32.store	glob($pop1), $pop0
@@ -55,5 +55,5 @@ glob:
 	.size	glob, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030914-1.c.s b/test/torture-s/20030914-1.c.s
index a02f0d2bd..25c6b8938 100644
--- a/test/torture-s/20030914-1.c.s
+++ b/test/torture-s/20030914-1.c.s
@@ -7,322 +7,319 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i64, i64
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push117=, 0
-	i32.const	$push115=, 0
-	i32.load	$push114=, __stack_pointer($pop115)
-	i32.const	$push116=, 512
-	i32.sub 	$push278=, $pop114, $pop116
-	tee_local	$push277=, $5=, $pop278
-	i32.store	__stack_pointer($pop117), $pop277
-	i32.const	$push121=, 496
-	i32.add 	$push122=, $5, $pop121
+# %bb.0:                                # %entry
+	i32.const	$push114=, 0
+	i32.load	$push113=, __stack_pointer($pop114)
+	i32.const	$push115=, 512
+	i32.sub 	$5=, $pop113, $pop115
+	i32.const	$push116=, 0
+	i32.store	__stack_pointer($pop116), $5
+	i32.const	$push120=, 496
+	i32.add 	$push121=, $5, $pop120
 	i32.load	$push0=, 0($2)
-	call    	__floatsitf@FUNCTION, $pop122, $pop0
-	i32.const	$push125=, 480
-	i32.add 	$push126=, $5, $pop125
+	call    	__floatsitf@FUNCTION, $pop121, $pop0
+	i32.const	$push124=, 480
+	i32.add 	$push125=, $5, $pop124
 	i64.load	$push4=, 496($5)
-	i32.const	$push123=, 496
-	i32.add 	$push124=, $5, $pop123
+	i32.const	$push122=, 496
+	i32.add 	$push123=, $5, $pop122
 	i32.const	$push1=, 8
-	i32.add 	$push2=, $pop124, $pop1
+	i32.add 	$push2=, $pop123, $pop1
 	i64.load	$push3=, 0($pop2)
-	call    	__addtf3@FUNCTION, $pop126, $pop4, $pop3, $3, $4
-	i32.const	$push127=, 464
-	i32.add 	$push128=, $5, $pop127
+	call    	__addtf3@FUNCTION, $pop125, $pop4, $pop3, $3, $4
+	i32.const	$push126=, 464
+	i32.add 	$push127=, $5, $pop126
 	i32.load	$push5=, 4($2)
-	call    	__floatsitf@FUNCTION, $pop128, $pop5
-	i32.const	$push133=, 448
-	i32.add 	$push134=, $5, $pop133
+	call    	__floatsitf@FUNCTION, $pop127, $pop5
+	i32.const	$push132=, 448
+	i32.add 	$push133=, $5, $pop132
 	i64.load	$push11=, 480($5)
-	i32.const	$push131=, 480
-	i32.add 	$push132=, $5, $pop131
-	i32.const	$push276=, 8
-	i32.add 	$push8=, $pop132, $pop276
+	i32.const	$push130=, 480
+	i32.add 	$push131=, $5, $pop130
+	i32.const	$push274=, 8
+	i32.add 	$push8=, $pop131, $pop274
 	i64.load	$push9=, 0($pop8)
 	i64.load	$push10=, 464($5)
-	i32.const	$push129=, 464
-	i32.add 	$push130=, $5, $pop129
-	i32.const	$push275=, 8
-	i32.add 	$push6=, $pop130, $pop275
+	i32.const	$push128=, 464
+	i32.add 	$push129=, $5, $pop128
+	i32.const	$push273=, 8
+	i32.add 	$push6=, $pop129, $pop273
 	i64.load	$push7=, 0($pop6)
-	call    	__addtf3@FUNCTION, $pop134, $pop11, $pop9, $pop10, $pop7
-	i32.const	$push135=, 432
-	i32.add 	$push136=, $5, $pop135
+	call    	__addtf3@FUNCTION, $pop133, $pop11, $pop9, $pop10, $pop7
+	i32.const	$push134=, 432
+	i32.add 	$push135=, $5, $pop134
 	i32.load	$push12=, 8($2)
-	call    	__floatsitf@FUNCTION, $pop136, $pop12
-	i32.const	$push141=, 416
-	i32.add 	$push142=, $5, $pop141
+	call    	__floatsitf@FUNCTION, $pop135, $pop12
+	i32.const	$push140=, 416
+	i32.add 	$push141=, $5, $pop140
 	i64.load	$push18=, 448($5)
-	i32.const	$push139=, 448
-	i32.add 	$push140=, $5, $pop139
-	i32.const	$push274=, 8
-	i32.add 	$push15=, $pop140, $pop274
+	i32.const	$push138=, 448
+	i32.add 	$push139=, $5, $pop138
+	i32.const	$push272=, 8
+	i32.add 	$push15=, $pop139, $pop272
 	i64.load	$push16=, 0($pop15)
 	i64.load	$push17=, 432($5)
-	i32.const	$push137=, 432
-	i32.add 	$push138=, $5, $pop137
-	i32.const	$push273=, 8
-	i32.add 	$push13=, $pop138, $pop273
+	i32.const	$push136=, 432
+	i32.add 	$push137=, $5, $pop136
+	i32.const	$push271=, 8
+	i32.add 	$push13=, $pop137, $pop271
 	i64.load	$push14=, 0($pop13)
-	call    	__addtf3@FUNCTION, $pop142, $pop18, $pop16, $pop17, $pop14
-	i32.const	$push143=, 400
-	i32.add 	$push144=, $5, $pop143
+	call    	__addtf3@FUNCTION, $pop141, $pop18, $pop16, $pop17, $pop14
+	i32.const	$push142=, 400
+	i32.add 	$push143=, $5, $pop142
 	i32.load	$push19=, 12($2)
-	call    	__floatsitf@FUNCTION, $pop144, $pop19
-	i32.const	$push149=, 384
-	i32.add 	$push150=, $5, $pop149
+	call    	__floatsitf@FUNCTION, $pop143, $pop19
+	i32.const	$push148=, 384
+	i32.add 	$push149=, $5, $pop148
 	i64.load	$push25=, 416($5)
-	i32.const	$push147=, 416
-	i32.add 	$push148=, $5, $pop147
-	i32.const	$push272=, 8
-	i32.add 	$push22=, $pop148, $pop272
+	i32.const	$push146=, 416
+	i32.add 	$push147=, $5, $pop146
+	i32.const	$push270=, 8
+	i32.add 	$push22=, $pop147, $pop270
 	i64.load	$push23=, 0($pop22)
 	i64.load	$push24=, 400($5)
-	i32.const	$push145=, 400
-	i32.add 	$push146=, $5, $pop145
-	i32.const	$push271=, 8
-	i32.add 	$push20=, $pop146, $pop271
+	i32.const	$push144=, 400
+	i32.add 	$push145=, $5, $pop144
+	i32.const	$push269=, 8
+	i32.add 	$push20=, $pop145, $pop269
 	i64.load	$push21=, 0($pop20)
-	call    	__addtf3@FUNCTION, $pop150, $pop25, $pop23, $pop24, $pop21
-	i32.const	$push151=, 368
-	i32.add 	$push152=, $5, $pop151
+	call    	__addtf3@FUNCTION, $pop149, $pop25, $pop23, $pop24, $pop21
+	i32.const	$push150=, 368
+	i32.add 	$push151=, $5, $pop150
 	i32.load	$push26=, 16($2)
-	call    	__floatsitf@FUNCTION, $pop152, $pop26
-	i32.const	$push157=, 352
-	i32.add 	$push158=, $5, $pop157
+	call    	__floatsitf@FUNCTION, $pop151, $pop26
+	i32.const	$push156=, 352
+	i32.add 	$push157=, $5, $pop156
 	i64.load	$push32=, 384($5)
-	i32.const	$push155=, 384
-	i32.add 	$push156=, $5, $pop155
-	i32.const	$push270=, 8
-	i32.add 	$push29=, $pop156, $pop270
+	i32.const	$push154=, 384
+	i32.add 	$push155=, $5, $pop154
+	i32.const	$push268=, 8
+	i32.add 	$push29=, $pop155, $pop268
 	i64.load	$push30=, 0($pop29)
 	i64.load	$push31=, 368($5)
-	i32.const	$push153=, 368
-	i32.add 	$push154=, $5, $pop153
-	i32.const	$push269=, 8
-	i32.add 	$push27=, $pop154, $pop269
+	i32.const	$push152=, 368
+	i32.add 	$push153=, $5, $pop152
+	i32.const	$push267=, 8
+	i32.add 	$push27=, $pop153, $pop267
 	i64.load	$push28=, 0($pop27)
-	call    	__addtf3@FUNCTION, $pop158, $pop32, $pop30, $pop31, $pop28
-	i32.const	$push159=, 336
-	i32.add 	$push160=, $5, $pop159
+	call    	__addtf3@FUNCTION, $pop157, $pop32, $pop30, $pop31, $pop28
+	i32.const	$push158=, 336
+	i32.add 	$push159=, $5, $pop158
 	i32.load	$push33=, 20($2)
-	call    	__floatsitf@FUNCTION, $pop160, $pop33
-	i32.const	$push165=, 320
-	i32.add 	$push166=, $5, $pop165
+	call    	__floatsitf@FUNCTION, $pop159, $pop33
+	i32.const	$push164=, 320
+	i32.add 	$push165=, $5, $pop164
 	i64.load	$push39=, 352($5)
-	i32.const	$push163=, 352
-	i32.add 	$push164=, $5, $pop163
-	i32.const	$push268=, 8
-	i32.add 	$push36=, $pop164, $pop268
+	i32.const	$push162=, 352
+	i32.add 	$push163=, $5, $pop162
+	i32.const	$push266=, 8
+	i32.add 	$push36=, $pop163, $pop266
 	i64.load	$push37=, 0($pop36)
 	i64.load	$push38=, 336($5)
-	i32.const	$push161=, 336
-	i32.add 	$push162=, $5, $pop161
-	i32.const	$push267=, 8
-	i32.add 	$push34=, $pop162, $pop267
+	i32.const	$push160=, 336
+	i32.add 	$push161=, $5, $pop160
+	i32.const	$push265=, 8
+	i32.add 	$push34=, $pop161, $pop265
 	i64.load	$push35=, 0($pop34)
-	call    	__addtf3@FUNCTION, $pop166, $pop39, $pop37, $pop38, $pop35
-	i32.const	$push167=, 304
-	i32.add 	$push168=, $5, $pop167
+	call    	__addtf3@FUNCTION, $pop165, $pop39, $pop37, $pop38, $pop35
+	i32.const	$push166=, 304
+	i32.add 	$push167=, $5, $pop166
 	i32.load	$push40=, 24($2)
-	call    	__floatsitf@FUNCTION, $pop168, $pop40
-	i32.const	$push173=, 288
-	i32.add 	$push174=, $5, $pop173
+	call    	__floatsitf@FUNCTION, $pop167, $pop40
+	i32.const	$push172=, 288
+	i32.add 	$push173=, $5, $pop172
 	i64.load	$push46=, 320($5)
-	i32.const	$push171=, 320
-	i32.add 	$push172=, $5, $pop171
-	i32.const	$push266=, 8
-	i32.add 	$push43=, $pop172, $pop266
+	i32.const	$push170=, 320
+	i32.add 	$push171=, $5, $pop170
+	i32.const	$push264=, 8
+	i32.add 	$push43=, $pop171, $pop264
 	i64.load	$push44=, 0($pop43)
 	i64.load	$push45=, 304($5)
-	i32.const	$push169=, 304
-	i32.add 	$push170=, $5, $pop169
-	i32.const	$push265=, 8
-	i32.add 	$push41=, $pop170, $pop265
+	i32.const	$push168=, 304
+	i32.add 	$push169=, $5, $pop168
+	i32.const	$push263=, 8
+	i32.add 	$push41=, $pop169, $pop263
 	i64.load	$push42=, 0($pop41)
-	call    	__addtf3@FUNCTION, $pop174, $pop46, $pop44, $pop45, $pop42
-	i32.const	$push175=, 272
-	i32.add 	$push176=, $5, $pop175
+	call    	__addtf3@FUNCTION, $pop173, $pop46, $pop44, $pop45, $pop42
+	i32.const	$push174=, 272
+	i32.add 	$push175=, $5, $pop174
 	i32.load	$push47=, 28($2)
-	call    	__floatsitf@FUNCTION, $pop176, $pop47
-	i32.const	$push181=, 256
-	i32.add 	$push182=, $5, $pop181
+	call    	__floatsitf@FUNCTION, $pop175, $pop47
+	i32.const	$push180=, 256
+	i32.add 	$push181=, $5, $pop180
 	i64.load	$push53=, 288($5)
-	i32.const	$push179=, 288
-	i32.add 	$push180=, $5, $pop179
-	i32.const	$push264=, 8
-	i32.add 	$push50=, $pop180, $pop264
+	i32.const	$push178=, 288
+	i32.add 	$push179=, $5, $pop178
+	i32.const	$push262=, 8
+	i32.add 	$push50=, $pop179, $pop262
 	i64.load	$push51=, 0($pop50)
 	i64.load	$push52=, 272($5)
-	i32.const	$push177=, 272
-	i32.add 	$push178=, $5, $pop177
-	i32.const	$push263=, 8
-	i32.add 	$push48=, $pop178, $pop263
+	i32.const	$push176=, 272
+	i32.add 	$push177=, $5, $pop176
+	i32.const	$push261=, 8
+	i32.add 	$push48=, $pop177, $pop261
 	i64.load	$push49=, 0($pop48)
-	call    	__addtf3@FUNCTION, $pop182, $pop53, $pop51, $pop52, $pop49
-	i32.const	$push183=, 240
-	i32.add 	$push184=, $5, $pop183
+	call    	__addtf3@FUNCTION, $pop181, $pop53, $pop51, $pop52, $pop49
+	i32.const	$push182=, 240
+	i32.add 	$push183=, $5, $pop182
 	i32.load	$push54=, 32($2)
-	call    	__floatsitf@FUNCTION, $pop184, $pop54
-	i32.const	$push189=, 224
-	i32.add 	$push190=, $5, $pop189
+	call    	__floatsitf@FUNCTION, $pop183, $pop54
+	i32.const	$push188=, 224
+	i32.add 	$push189=, $5, $pop188
 	i64.load	$push60=, 256($5)
-	i32.const	$push187=, 256
-	i32.add 	$push188=, $5, $pop187
-	i32.const	$push262=, 8
-	i32.add 	$push57=, $pop188, $pop262
+	i32.const	$push186=, 256
+	i32.add 	$push187=, $5, $pop186
+	i32.const	$push260=, 8
+	i32.add 	$push57=, $pop187, $pop260
 	i64.load	$push58=, 0($pop57)
 	i64.load	$push59=, 240($5)
-	i32.const	$push185=, 240
-	i32.add 	$push186=, $5, $pop185
-	i32.const	$push261=, 8
-	i32.add 	$push55=, $pop186, $pop261
+	i32.const	$push184=, 240
+	i32.add 	$push185=, $5, $pop184
+	i32.const	$push259=, 8
+	i32.add 	$push55=, $pop185, $pop259
 	i64.load	$push56=, 0($pop55)
-	call    	__addtf3@FUNCTION, $pop190, $pop60, $pop58, $pop59, $pop56
-	i32.const	$push191=, 208
-	i32.add 	$push192=, $5, $pop191
+	call    	__addtf3@FUNCTION, $pop189, $pop60, $pop58, $pop59, $pop56
+	i32.const	$push190=, 208
+	i32.add 	$push191=, $5, $pop190
 	i32.load	$push61=, 36($2)
-	call    	__floatsitf@FUNCTION, $pop192, $pop61
-	i32.const	$push197=, 192
-	i32.add 	$push198=, $5, $pop197
+	call    	__floatsitf@FUNCTION, $pop191, $pop61
+	i32.const	$push196=, 192
+	i32.add 	$push197=, $5, $pop196
 	i64.load	$push67=, 224($5)
-	i32.const	$push195=, 224
-	i32.add 	$push196=, $5, $pop195
-	i32.const	$push260=, 8
-	i32.add 	$push64=, $pop196, $pop260
+	i32.const	$push194=, 224
+	i32.add 	$push195=, $5, $pop194
+	i32.const	$push258=, 8
+	i32.add 	$push64=, $pop195, $pop258
 	i64.load	$push65=, 0($pop64)
 	i64.load	$push66=, 208($5)
-	i32.const	$push193=, 208
-	i32.add 	$push194=, $5, $pop193
-	i32.const	$push259=, 8
-	i32.add 	$push62=, $pop194, $pop259
+	i32.const	$push192=, 208
+	i32.add 	$push193=, $5, $pop192
+	i32.const	$push257=, 8
+	i32.add 	$push62=, $pop193, $pop257
 	i64.load	$push63=, 0($pop62)
-	call    	__addtf3@FUNCTION, $pop198, $pop67, $pop65, $pop66, $pop63
-	i32.const	$push199=, 176
-	i32.add 	$push200=, $5, $pop199
+	call    	__addtf3@FUNCTION, $pop197, $pop67, $pop65, $pop66, $pop63
+	i32.const	$push198=, 176
+	i32.add 	$push199=, $5, $pop198
 	i32.load	$push68=, 40($2)
-	call    	__floatsitf@FUNCTION, $pop200, $pop68
-	i32.const	$push205=, 160
-	i32.add 	$push206=, $5, $pop205
+	call    	__floatsitf@FUNCTION, $pop199, $pop68
+	i32.const	$push204=, 160
+	i32.add 	$push205=, $5, $pop204
 	i64.load	$push74=, 192($5)
-	i32.const	$push203=, 192
-	i32.add 	$push204=, $5, $pop203
-	i32.const	$push258=, 8
-	i32.add 	$push71=, $pop204, $pop258
+	i32.const	$push202=, 192
+	i32.add 	$push203=, $5, $pop202
+	i32.const	$push256=, 8
+	i32.add 	$push71=, $pop203, $pop256
 	i64.load	$push72=, 0($pop71)
 	i64.load	$push73=, 176($5)
-	i32.const	$push201=, 176
-	i32.add 	$push202=, $5, $pop201
-	i32.const	$push257=, 8
-	i32.add 	$push69=, $pop202, $pop257
+	i32.const	$push200=, 176
+	i32.add 	$push201=, $5, $pop200
+	i32.const	$push255=, 8
+	i32.add 	$push69=, $pop201, $pop255
 	i64.load	$push70=, 0($pop69)
-	call    	__addtf3@FUNCTION, $pop206, $pop74, $pop72, $pop73, $pop70
-	i32.const	$push207=, 144
-	i32.add 	$push208=, $5, $pop207
+	call    	__addtf3@FUNCTION, $pop205, $pop74, $pop72, $pop73, $pop70
+	i32.const	$push206=, 144
+	i32.add 	$push207=, $5, $pop206
 	i32.load	$push75=, 44($2)
-	call    	__floatsitf@FUNCTION, $pop208, $pop75
-	i32.const	$push213=, 128
-	i32.add 	$push214=, $5, $pop213
+	call    	__floatsitf@FUNCTION, $pop207, $pop75
+	i32.const	$push212=, 128
+	i32.add 	$push213=, $5, $pop212
 	i64.load	$push81=, 160($5)
-	i32.const	$push211=, 160
-	i32.add 	$push212=, $5, $pop211
-	i32.const	$push256=, 8
-	i32.add 	$push78=, $pop212, $pop256
+	i32.const	$push210=, 160
+	i32.add 	$push211=, $5, $pop210
+	i32.const	$push254=, 8
+	i32.add 	$push78=, $pop211, $pop254
 	i64.load	$push79=, 0($pop78)
 	i64.load	$push80=, 144($5)
-	i32.const	$push209=, 144
-	i32.add 	$push210=, $5, $pop209
-	i32.const	$push255=, 8
-	i32.add 	$push76=, $pop210, $pop255
+	i32.const	$push208=, 144
+	i32.add 	$push209=, $5, $pop208
+	i32.const	$push253=, 8
+	i32.add 	$push76=, $pop209, $pop253
 	i64.load	$push77=, 0($pop76)
-	call    	__addtf3@FUNCTION, $pop214, $pop81, $pop79, $pop80, $pop77
-	i32.const	$push215=, 112
-	i32.add 	$push216=, $5, $pop215
+	call    	__addtf3@FUNCTION, $pop213, $pop81, $pop79, $pop80, $pop77
+	i32.const	$push214=, 112
+	i32.add 	$push215=, $5, $pop214
 	i32.load	$push82=, 48($2)
-	call    	__floatsitf@FUNCTION, $pop216, $pop82
-	i32.const	$push221=, 96
-	i32.add 	$push222=, $5, $pop221
+	call    	__floatsitf@FUNCTION, $pop215, $pop82
+	i32.const	$push220=, 96
+	i32.add 	$push221=, $5, $pop220
 	i64.load	$push88=, 128($5)
-	i32.const	$push219=, 128
-	i32.add 	$push220=, $5, $pop219
-	i32.const	$push254=, 8
-	i32.add 	$push85=, $pop220, $pop254
+	i32.const	$push218=, 128
+	i32.add 	$push219=, $5, $pop218
+	i32.const	$push252=, 8
+	i32.add 	$push85=, $pop219, $pop252
 	i64.load	$push86=, 0($pop85)
 	i64.load	$push87=, 112($5)
-	i32.const	$push217=, 112
-	i32.add 	$push218=, $5, $pop217
-	i32.const	$push253=, 8
-	i32.add 	$push83=, $pop218, $pop253
+	i32.const	$push216=, 112
+	i32.add 	$push217=, $5, $pop216
+	i32.const	$push251=, 8
+	i32.add 	$push83=, $pop217, $pop251
 	i64.load	$push84=, 0($pop83)
-	call    	__addtf3@FUNCTION, $pop222, $pop88, $pop86, $pop87, $pop84
-	i32.const	$push223=, 80
-	i32.add 	$push224=, $5, $pop223
+	call    	__addtf3@FUNCTION, $pop221, $pop88, $pop86, $pop87, $pop84
+	i32.const	$push222=, 80
+	i32.add 	$push223=, $5, $pop222
 	i32.load	$push89=, 52($2)
-	call    	__floatsitf@FUNCTION, $pop224, $pop89
-	i32.const	$push229=, 64
-	i32.add 	$push230=, $5, $pop229
+	call    	__floatsitf@FUNCTION, $pop223, $pop89
+	i32.const	$push228=, 64
+	i32.add 	$push229=, $5, $pop228
 	i64.load	$push95=, 96($5)
-	i32.const	$push227=, 96
-	i32.add 	$push228=, $5, $pop227
-	i32.const	$push252=, 8
-	i32.add 	$push92=, $pop228, $pop252
+	i32.const	$push226=, 96
+	i32.add 	$push227=, $5, $pop226
+	i32.const	$push250=, 8
+	i32.add 	$push92=, $pop227, $pop250
 	i64.load	$push93=, 0($pop92)
 	i64.load	$push94=, 80($5)
-	i32.const	$push225=, 80
-	i32.add 	$push226=, $5, $pop225
-	i32.const	$push251=, 8
-	i32.add 	$push90=, $pop226, $pop251
+	i32.const	$push224=, 80
+	i32.add 	$push225=, $5, $pop224
+	i32.const	$push249=, 8
+	i32.add 	$push90=, $pop225, $pop249
 	i64.load	$push91=, 0($pop90)
-	call    	__addtf3@FUNCTION, $pop230, $pop95, $pop93, $pop94, $pop91
-	i32.const	$push231=, 48
-	i32.add 	$push232=, $5, $pop231
+	call    	__addtf3@FUNCTION, $pop229, $pop95, $pop93, $pop94, $pop91
+	i32.const	$push230=, 48
+	i32.add 	$push231=, $5, $pop230
 	i32.load	$push96=, 56($2)
-	call    	__floatsitf@FUNCTION, $pop232, $pop96
-	i32.const	$push237=, 32
-	i32.add 	$push238=, $5, $pop237
+	call    	__floatsitf@FUNCTION, $pop231, $pop96
+	i32.const	$push236=, 32
+	i32.add 	$push237=, $5, $pop236
 	i64.load	$push102=, 64($5)
-	i32.const	$push235=, 64
-	i32.add 	$push236=, $5, $pop235
-	i32.const	$push250=, 8
-	i32.add 	$push99=, $pop236, $pop250
+	i32.const	$push234=, 64
+	i32.add 	$push235=, $5, $pop234
+	i32.const	$push248=, 8
+	i32.add 	$push99=, $pop235, $pop248
 	i64.load	$push100=, 0($pop99)
 	i64.load	$push101=, 48($5)
-	i32.const	$push233=, 48
-	i32.add 	$push234=, $5, $pop233
-	i32.const	$push249=, 8
-	i32.add 	$push97=, $pop234, $pop249
+	i32.const	$push232=, 48
+	i32.add 	$push233=, $5, $pop232
+	i32.const	$push247=, 8
+	i32.add 	$push97=, $pop233, $pop247
 	i64.load	$push98=, 0($pop97)
-	call    	__addtf3@FUNCTION, $pop238, $pop102, $pop100, $pop101, $pop98
-	i32.const	$push239=, 16
-	i32.add 	$push240=, $5, $pop239
+	call    	__addtf3@FUNCTION, $pop237, $pop102, $pop100, $pop101, $pop98
+	i32.const	$push238=, 16
+	i32.add 	$push239=, $5, $pop238
 	i32.load	$push103=, 60($2)
-	call    	__floatsitf@FUNCTION, $pop240, $pop103
+	call    	__floatsitf@FUNCTION, $pop239, $pop103
 	i64.load	$push109=, 32($5)
-	i32.const	$push243=, 32
-	i32.add 	$push244=, $5, $pop243
-	i32.const	$push248=, 8
-	i32.add 	$push106=, $pop244, $pop248
+	i32.const	$push242=, 32
+	i32.add 	$push243=, $5, $pop242
+	i32.const	$push246=, 8
+	i32.add 	$push106=, $pop243, $pop246
 	i64.load	$push107=, 0($pop106)
 	i64.load	$push108=, 16($5)
-	i32.const	$push241=, 16
-	i32.add 	$push242=, $5, $pop241
-	i32.const	$push247=, 8
-	i32.add 	$push104=, $pop242, $pop247
+	i32.const	$push240=, 16
+	i32.add 	$push241=, $5, $pop240
+	i32.const	$push245=, 8
+	i32.add 	$push104=, $pop241, $pop245
 	i64.load	$push105=, 0($pop104)
 	call    	__addtf3@FUNCTION, $5, $pop109, $pop107, $pop108, $pop105
-	i32.const	$push246=, 8
-	i32.add 	$push110=, $0, $pop246
-	i32.const	$push245=, 8
-	i32.add 	$push111=, $5, $pop245
-	i64.load	$push112=, 0($pop111)
-	i64.store	0($pop110), $pop112
-	i64.load	$push113=, 0($5)
-	i64.store	0($0), $pop113
-	i32.const	$push120=, 0
-	i32.const	$push118=, 512
-	i32.add 	$push119=, $5, $pop118
-	i32.store	__stack_pointer($pop120), $pop119
+	i32.const	$push244=, 8
+	i32.add 	$push110=, $5, $pop244
+	i64.load	$push111=, 0($pop110)
+	i64.store	8($0), $pop111
+	i64.load	$push112=, 0($5)
+	i64.store	0($0), $pop112
+	i32.const	$push119=, 0
+	i32.const	$push117=, 512
+	i32.add 	$push118=, $5, $pop117
+	i32.store	__stack_pointer($pop119), $pop118
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -334,14 +331,88 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
-	i32.const	$push0=, 0
-	call    	exit@FUNCTION, $pop0
+	.local  	i32
+# %bb.0:                                # %entry
+	i32.const	$push37=, 0
+	i32.load	$push36=, __stack_pointer($pop37)
+	i32.const	$push38=, 144
+	i32.sub 	$0=, $pop36, $pop38
+	i32.const	$push39=, 0
+	i32.store	__stack_pointer($pop39), $0
+	i32.const	$push0=, 3
+	i32.store	88($0), $pop0
+	i64.const	$push1=, 21474836484
+	i64.store	92($0):p2align=2, $pop1
+	i32.const	$push2=, 8
+	i32.add 	$push3=, $0, $pop2
+	i64.load	$push4=, 88($0)
+	i64.store	0($pop3), $pop4
+	i64.const	$push5=, 30064771078
+	i64.store	100($0):p2align=2, $pop5
+	i32.const	$push6=, 16
+	i32.store	140($0), $pop6
+	i32.const	$push44=, 16
+	i32.add 	$push7=, $0, $pop44
+	i64.load	$push8=, 96($0)
+	i64.store	0($pop7), $pop8
+	i64.const	$push9=, 38654705672
+	i64.store	108($0):p2align=2, $pop9
+	i32.const	$push10=, 24
+	i32.add 	$push11=, $0, $pop10
+	i64.load	$push12=, 104($0)
+	i64.store	0($pop11), $pop12
+	i64.const	$push13=, 47244640266
+	i64.store	116($0):p2align=2, $pop13
+	i32.const	$push14=, 32
+	i32.add 	$push15=, $0, $pop14
+	i64.load	$push16=, 112($0)
+	i64.store	0($pop15), $pop16
+	i64.const	$push17=, 55834574860
+	i64.store	124($0):p2align=2, $pop17
+	i32.const	$push18=, 40
+	i32.add 	$push19=, $0, $pop18
+	i64.load	$push20=, 120($0)
+	i64.store	0($pop19), $pop20
+	i64.const	$push21=, 64424509454
+	i64.store	132($0):p2align=2, $pop21
+	i32.const	$push22=, 56
+	i32.add 	$push23=, $0, $pop22
+	i64.load	$push24=, 136($0)
+	i64.store	0($pop23), $pop24
+	i32.const	$push25=, 48
+	i32.add 	$push26=, $0, $pop25
+	i64.load	$push27=, 128($0)
+	i64.store	0($pop26), $pop27
+	i64.const	$push28=, 8589934593
+	i64.store	80($0), $pop28
+	i64.const	$push43=, 8589934593
+	i64.store	0($0), $pop43
+	i32.const	$push40=, 64
+	i32.add 	$push41=, $0, $pop40
+	i64.const	$push30=, 0
+	i64.const	$push29=, 4615125840554885120
+	call    	f@FUNCTION, $pop41, $0, $0, $pop30, $pop29
+	block   	
+	i64.load	$push33=, 64($0)
+	i64.load	$push32=, 72($0)
+	i64.const	$push42=, 0
+	i64.const	$push31=, 4615130513479303168
+	i32.call	$push34=, __eqtf2@FUNCTION, $pop33, $pop32, $pop42, $pop31
+	i32.eqz 	$push45=, $pop34
+	br_if   	0, $pop45       # 0: down to label0
+# %bb.1:                                # %if.then
+	call    	abort@FUNCTION
+	unreachable
+.LBB1_2:                                # %if.end
+	end_block                       # label0:
+	i32.const	$push35=, 0
+	call    	exit@FUNCTION, $pop35
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
+	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030914-2.c.s b/test/torture-s/20030914-2.c.s
index 309e3a294..908255811 100644
--- a/test/torture-s/20030914-2.c.s
+++ b/test/torture-s/20030914-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -38,5 +38,5 @@ gs:
 	.size	gs, 72
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20030916-1.c.s b/test/torture-s/20030916-1.c.s
index a9c9a8f75..8cca3002a 100644
--- a/test/torture-s/20030916-1.c.s
+++ b/test/torture-s/20030916-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	0($0):p2align=2, $pop0
 	i64.const	$push19=, 0
@@ -47,28 +47,26 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push22=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop19, $pop21
+	i32.const	$push22=, 0
+	i32.store	__stack_pointer($pop22), $0
 	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
 	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
+	i32.const	$push25=, 1
+	i32.store	0($pop0), $pop25
+	i32.const	$push24=, 4
+	i32.add 	$1=, $1, $pop24
+	i32.const	$push23=, 1024
+	i32.ne  	$push1=, $1, $pop23
 	br_if   	0, $pop1        # 0: up to label0
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push2=, 24
 	i32.add 	$push3=, $0, $pop2
@@ -76,50 +74,49 @@ main:                                   # @main
 	i64.store	0($pop3), $pop4
 	i32.const	$push5=, 16
 	i32.add 	$push6=, $0, $pop5
-	i64.const	$push36=, 0
-	i64.store	0($pop6), $pop36
+	i64.const	$push32=, 0
+	i64.store	0($pop6), $pop32
 	i32.const	$push7=, 1016
 	i32.add 	$push8=, $0, $pop7
-	i64.const	$push35=, 0
-	i64.store	0($pop8), $pop35
+	i64.const	$push31=, 0
+	i64.store	0($pop8), $pop31
 	i32.const	$push9=, 1008
 	i32.add 	$push10=, $0, $pop9
-	i64.const	$push34=, 0
-	i64.store	0($pop10), $pop34
+	i64.const	$push30=, 0
+	i64.store	0($pop10), $pop30
 	i32.const	$push11=, 1000
 	i32.add 	$push12=, $0, $pop11
-	i64.const	$push33=, 0
-	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
+	i64.const	$push29=, 0
+	i64.store	0($pop12), $pop29
+	i64.const	$push28=, 0
+	i64.store	8($0), $pop28
+	i64.const	$push27=, 0
+	i64.store	0($0), $pop27
+	i64.const	$push26=, 0
+	i64.store	992($0), $pop26
+	i32.const	$1=, 0
 	copy_local	$0=, $0
 .LBB1_3:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
 	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.const	$push34=, -8
+	i32.add 	$push13=, $1, $pop34
+	i32.const	$push33=, 240
+	i32.lt_u	$push14=, $pop13, $pop33
 	i32.ne  	$push16=, $pop15, $pop14
 	br_if   	1, $pop16       # 1: down to label1
-# BB#4:                                 # %for.cond1
+# %bb.4:                                # %for.cond1
                                         #   in Loop: Header=BB1_3 Depth=1
-	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
+	i32.const	$push37=, 1
+	i32.add 	$1=, $1, $pop37
+	i32.const	$push36=, 4
+	i32.add 	$0=, $0, $pop36
+	i32.const	$push35=, 255
+	i32.le_u	$push17=, $1, $pop35
 	br_if   	0, $pop17       # 0: up to label2
-# BB#5:                                 # %for.end10
+# %bb.5:                                # %for.end10
 	end_loop
 	i32.const	$push18=, 0
 	call    	exit@FUNCTION, $pop18
@@ -133,6 +130,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e3bf1f409..4ddfe08f1 100644
--- a/test/torture-s/20030920-1.c.s
+++ b/test/torture-s/20030920-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end5
+# %bb.0:                                # %if.end5
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20030928-1.c.s b/test/torture-s/20030928-1.c.s
index bcf297e6f..3dc883cc0 100644
--- a/test/torture-s/20030928-1.c.s
+++ b/test/torture-s/20030928-1.c.s
@@ -6,7 +6,7 @@
 	.type	get_addrs,@function
 get_addrs:                              # @get_addrs
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.const	$push1=, 1
 	i32.shl 	$push2=, $pop0, $pop1
@@ -66,7 +66,7 @@ get_addrs:                              # @get_addrs
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond2.7
+# %bb.0:                                # %for.cond2.7
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -116,5 +116,5 @@ main:                                   # @main
 	.size	.L.str.7, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20031003-1.c.s b/test/torture-s/20031003-1.c.s
index 7fd4caf25..9ff6031ab 100644
--- a/test/torture-s/20031003-1.c.s
+++ b/test/torture-s/20031003-1.c.s
@@ -7,7 +7,7 @@
 f1:                                     # @f1
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ f2:                                     # @f2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -42,4 +42,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20031010-1.c.s b/test/torture-s/20031010-1.c.s
index bfe451e30..3bdb8a83e 100644
--- a/test/torture-s/20031010-1.c.s
+++ b/test/torture-s/20031010-1.c.s
@@ -7,15 +7,15 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push4=, $2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	block   	
 	i32.eqz 	$push5=, $3
 	br_if   	0, $pop5        # 0: down to label1
-# BB#2:                                 # %if.then4
+# %bb.2:                                # %if.then4
 	i32.select	$push1=, $1, $0, $4
 	i32.select	$push0=, $0, $1, $4
 	i32.sub 	$push2=, $pop1, $pop0
@@ -38,7 +38,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 2
 	i32.const	$push1=, 3
@@ -48,7 +48,7 @@ main:                                   # @main
 	i32.call	$push3=, foo@FUNCTION, $pop2, $pop1, $pop0, $pop6, $pop5
 	i32.eqz 	$push7=, $pop3
 	br_if   	0, $pop7        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -60,5 +60,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20031011-1.c.s b/test/torture-s/20031011-1.c.s
index 48995f7e5..b6516ce2d 100644
--- a/test/torture-s/20031011-1.c.s
+++ b/test/torture-s/20031011-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20031012-1.c.s b/test/torture-s/20031012-1.c.s
index bcbe16952..70c581d7a 100644
--- a/test/torture-s/20031012-1.c.s
+++ b/test/torture-s/20031012-1.c.s
@@ -8,32 +8,30 @@ main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 15008
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $2=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
+	i32.sub 	$2=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $2
 	i32.const	$push1=, 205
 	i32.const	$push0=, 13371
-	i32.call	$push14=, memset@FUNCTION, $2, $pop1, $pop0
-	tee_local	$push13=, $2=, $pop14
+	i32.call	$drop=, memset@FUNCTION, $2, $pop1, $pop0
 	i32.const	$push12=, 0
-	i32.store8	13371($pop13), $pop12
+	i32.store8	13371($2), $pop12
 	block   	
 	i32.call	$push2=, strlen@FUNCTION, $2
 	i32.const	$push11=, 13371
 	i32.ne  	$push3=, $pop2, $pop11
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %foo.exit
+# %bb.1:                                # %foo.exit
 	i32.const	$push10=, 0
 	i32.const	$push8=, 15008
 	i32.add 	$push9=, $2, $pop8
 	i32.store	__stack_pointer($pop10), $pop9
-	i32.const	$push17=, 0
-	return  	$pop17
+	i32.const	$push13=, 0
+	return  	$pop13
 .LBB0_2:                                # %if.then.i
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -43,6 +41,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 21f46c15b..a425e98d5 100644
--- a/test/torture-s/20031020-1.c.s
+++ b/test/torture-s/20031020-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1024
 	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, -2147473648
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20031201-1.c.s b/test/torture-s/20031201-1.c.s
index c9aa9fa69..99a2fd356 100644
--- a/test/torture-s/20031201-1.c.s
+++ b/test/torture-s/20031201-1.c.s
@@ -7,19 +7,18 @@
 f1:                                     # @f1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	i($pop0), $0
 	i32.const	$push1=, 32
 	i32.store	4($0), $pop1
-	i32.const	$push7=, 32
-	i32.store	0($0), $pop7
+	i32.const	$push5=, 32
+	i32.store	0($0), $pop5
 	call    	f0@FUNCTION
-	i32.const	$push6=, 0
-	i32.load	$push5=, i($pop6)
-	tee_local	$push4=, $0=, $pop5
+	i32.const	$push4=, 0
+	i32.load	$0=, i($pop4)
 	i32.const	$push2=, 8
-	i32.store	4($pop4), $pop2
+	i32.store	4($0), $pop2
 	i32.const	$push3=, 8
 	i32.store	0($0), $pop3
 	call    	test@FUNCTION
@@ -34,30 +33,28 @@ f1:                                     # @f1
 	.type	f0,@function
 f0:                                     # @f0
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
-	i32.const	$push8=, 0
-	i32.load	$push7=, f0.washere($pop8)
-	tee_local	$push6=, $0=, $pop7
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$0=, f0.washere($pop7)
+	i32.const	$push6=, 0
 	i32.const	$push0=, 1
-	i32.add 	$push1=, $pop6, $pop0
-	i32.store	f0.washere($pop9), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	f0.washere($pop6), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push13=, 0
-	i32.load	$push12=, i($pop13)
-	tee_local	$push11=, $0=, $pop12
-	i32.load16_u	$push2=, 0($pop11)
-	i32.const	$push10=, 32
-	i32.ne  	$push3=, $pop2, $pop10
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push9=, 0
+	i32.load	$0=, i($pop9)
+	i32.load16_u	$push2=, 0($0)
+	i32.const	$push8=, 32
+	i32.ne  	$push3=, $pop2, $pop8
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false1
+# %bb.2:                                # %lor.lhs.false1
 	i32.load16_u	$push4=, 4($0)
-	i32.const	$push14=, 32
-	i32.ne  	$push5=, $pop4, $pop14
+	i32.const	$push10=, 32
+	i32.ne  	$push5=, $pop4, $pop10
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB1_4:                                # %if.then
 	end_block                       # label0:
@@ -73,21 +70,20 @@ f0:                                     # @f0
 	.type	test,@function
 test:                                   # @test
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push8=, i($pop0)
-	tee_local	$push7=, $0=, $pop8
-	i32.load16_u	$push1=, 0($pop7)
+	i32.load	$0=, i($pop0)
+	block   	
+	i32.load16_u	$push1=, 0($0)
 	i32.const	$push6=, 8
 	i32.ne  	$push2=, $pop1, $pop6
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load16_u	$push3=, 4($0)
-	i32.const	$push9=, 8
-	i32.ne  	$push4=, $pop3, $pop9
+	i32.const	$push7=, 8
+	i32.ne  	$push4=, $pop3, $pop7
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
 	unreachable
@@ -106,14 +102,13 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push3=, 0
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push7=, $pop0, $pop2
-	tee_local	$push6=, $0=, $pop7
-	i32.store	__stack_pointer($pop3), $pop6
+	i32.sub 	$0=, $pop0, $pop2
+	i32.const	$push3=, 0
+	i32.store	__stack_pointer($pop3), $0
 	i32.const	$push4=, 8
 	i32.add 	$push5=, $0, $pop4
 	i32.call	$drop=, f1@FUNCTION, $pop5
@@ -137,6 +132,6 @@ f0.washere:
 	.size	f0.washere, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e79dce172..f674d19de 100644
--- a/test/torture-s/20031204-1.c.s
+++ b/test/torture-s/20031204-1.c.s
@@ -7,7 +7,7 @@
 in_aton:                                # @in_aton
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 168496141
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -22,7 +22,7 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	copy_local	$4=, $0
 .LBB1_1:                                # %while.body
@@ -37,56 +37,51 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label3:
-	copy_local	$push30=, $6
-	tee_local	$push29=, $7=, $pop30
-	i32.const	$push28=, 1
-	i32.add 	$6=, $pop29, $pop28
-	i32.add 	$3=, $4, $5
-	i32.const	$push27=, 1
-	i32.add 	$push26=, $5, $pop27
-	tee_local	$push25=, $2=, $pop26
-	copy_local	$5=, $pop25
-	i32.load8_u	$push24=, 0($3)
-	tee_local	$push23=, $3=, $pop24
-	i32.const	$push22=, -48
-	i32.add 	$push1=, $pop23, $pop22
-	i32.const	$push21=, 255
-	i32.and 	$push2=, $pop1, $pop21
-	i32.const	$push20=, 10
-	i32.lt_u	$push3=, $pop2, $pop20
-	br_if   	0, $pop3        # 0: up to label3
-# BB#3:                                 # %while.end
+	copy_local	$7=, $6
+	i32.const	$push25=, 1
+	i32.add 	$3=, $5, $pop25
+	i32.const	$push24=, 1
+	i32.add 	$6=, $7, $pop24
+	i32.add 	$push1=, $4, $5
+	i32.load8_u	$2=, 0($pop1)
+	copy_local	$5=, $3
+	i32.const	$push23=, -48
+	i32.add 	$push2=, $2, $pop23
+	i32.const	$push22=, 255
+	i32.and 	$push3=, $pop2, $pop22
+	i32.const	$push21=, 10
+	i32.lt_u	$push4=, $pop3, $pop21
+	br_if   	0, $pop4        # 0: up to label3
+# %bb.3:                                # %while.end
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
 	block   	
-	i32.const	$push31=, 1
-	i32.eq  	$push4=, $2, $pop31
-	br_if   	0, $pop4        # 0: down to label4
-# BB#4:                                 # %lor.lhs.false
+	i32.const	$push26=, 1
+	i32.eq  	$push5=, $3, $pop26
+	br_if   	0, $pop5        # 0: down to label4
+# %bb.4:                                # %lor.lhs.false
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.add 	$push35=, $4, $2
-	tee_local	$push34=, $5=, $pop35
-	i32.const	$push33=, -1
-	i32.add 	$push0=, $pop34, $pop33
-	i32.sub 	$push5=, $pop0, $4
-	i32.const	$push32=, 4
-	i32.ge_s	$push6=, $pop5, $pop32
-	br_if   	2, $pop6        # 2: down to label1
-# BB#5:                                 # %if.end
+	i32.add 	$5=, $4, $3
+	i32.const	$push28=, -1
+	i32.add 	$push0=, $5, $pop28
+	i32.sub 	$push6=, $pop0, $4
+	i32.const	$push27=, 4
+	i32.ge_s	$push7=, $pop6, $pop27
+	br_if   	2, $pop7        # 2: down to label1
+# %bb.5:                                # %if.end
                                         #   in Loop: Header=BB1_1 Depth=1
+	i32.const	$push32=, 3
+	i32.eq  	$push8=, $1, $pop32
+	i32.const	$push31=, 255
+	i32.and 	$push9=, $2, $pop31
+	i32.const	$push30=, 46
+	i32.eq  	$push10=, $pop9, $pop30
+	i32.or  	$push11=, $pop8, $pop10
+	i32.add 	$1=, $1, $pop11
 	copy_local	$4=, $5
-	i32.const	$push41=, 3
-	i32.eq  	$push7=, $1, $pop41
-	i32.const	$push40=, 255
-	i32.and 	$push8=, $3, $pop40
-	i32.const	$push39=, 46
-	i32.eq  	$push9=, $pop8, $pop39
-	i32.or  	$push10=, $pop7, $pop9
-	i32.add 	$push38=, $1, $pop10
-	tee_local	$push37=, $1=, $pop38
-	i32.const	$push36=, 4
-	i32.lt_s	$push11=, $pop37, $pop36
-	br_if   	1, $pop11       # 1: up to label2
+	i32.const	$push29=, 4
+	i32.lt_u	$push12=, $1, $pop29
+	br_if   	1, $pop12       # 1: up to label2
 	br      	3               # 3: down to label0
 .LBB1_6:
 	end_block                       # label4:
@@ -95,39 +90,38 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
 	br      	1               # 1: down to label0
 .LBB1_7:                                # %lor.lhs.false.while.end25_crit_edge
 	end_block                       # label1:
-	i32.add 	$push12=, $4, $2
-	i32.const	$push13=, -1
-	i32.add 	$7=, $pop12, $pop13
+	i32.add 	$push13=, $4, $3
+	i32.const	$push14=, -1
+	i32.add 	$7=, $pop13, $pop14
 .LBB1_8:                                # %while.end25
 	end_block                       # label0:
 	i32.const	$5=, -1
 	block   	
-	i32.const	$push14=, 4
-	i32.ne  	$push15=, $1, $pop14
-	br_if   	0, $pop15       # 0: down to label5
-# BB#9:                                 # %land.lhs.true
+	i32.const	$push15=, 4
+	i32.ne  	$push16=, $1, $pop15
+	br_if   	0, $pop16       # 0: down to label5
+# %bb.9:                                # %land.lhs.true
+	i32.load8_u	$3=, 0($7)
 	block   	
-	i32.load8_u	$push43=, 0($7)
-	tee_local	$push42=, $6=, $pop43
-	i32.eqz 	$push44=, $pop42
-	br_if   	0, $pop44       # 0: down to label6
-# BB#10:                                # %land.lhs.true
-	i32.const	$push16=, 58
-	i32.ne  	$push17=, $6, $pop16
-	br_if   	1, $pop17       # 1: down to label5
-# BB#11:                                # %if.then39
-	i32.const	$push18=, 0
-	i32.store8	0($7), $pop18
-	i32.const	$push19=, 1
-	i32.add 	$7=, $7, $pop19
+	i32.eqz 	$push33=, $3
+	br_if   	0, $pop33       # 0: down to label6
+# %bb.10:                               # %land.lhs.true
+	i32.const	$push17=, 58
+	i32.ne  	$push18=, $3, $pop17
+	br_if   	1, $pop18       # 1: down to label5
+# %bb.11:                               # %if.then39
+	i32.const	$push19=, 0
+	i32.store8	0($7), $pop19
+	i32.const	$push20=, 1
+	i32.add 	$7=, $7, $pop20
 .LBB1_12:                               # %if.end41
 	end_block                       # label6:
 	i32.call	$drop=, strcpy@FUNCTION, $0, $7
 	i32.const	$5=, 168496141
 .LBB1_13:                               # %if.end43
 	end_block                       # label5:
-	copy_local	$push45=, $5
-                                        # fallthrough-return: $pop45
+	copy_local	$push34=, $5
+                                        # fallthrough-return: $pop34
 	.endfunc
 .Lfunc_end1:
 	.size	root_nfs_parse_addr, .Lfunc_end1-root_nfs_parse_addr
@@ -139,7 +133,7 @@ root_nfs_parse_addr:                    # @root_nfs_parse_addr
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 	i32.const	$3=, main.addr
 .LBB2_1:                                # %while.body.i
@@ -154,56 +148,51 @@ main:                                   # @main
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label10:
-	copy_local	$push32=, $5
-	tee_local	$push31=, $6=, $pop32
-	i32.const	$push30=, 1
-	i32.add 	$5=, $pop31, $pop30
-	i32.add 	$2=, $3, $4
-	i32.const	$push29=, 1
-	i32.add 	$push28=, $4, $pop29
-	tee_local	$push27=, $1=, $pop28
-	copy_local	$4=, $pop27
-	i32.load8_u	$push26=, 0($2)
-	tee_local	$push25=, $2=, $pop26
-	i32.const	$push24=, -48
-	i32.add 	$push1=, $pop25, $pop24
-	i32.const	$push23=, 255
-	i32.and 	$push2=, $pop1, $pop23
-	i32.const	$push22=, 10
-	i32.lt_u	$push3=, $pop2, $pop22
-	br_if   	0, $pop3        # 0: up to label10
-# BB#3:                                 # %while.end.i
+	copy_local	$6=, $5
+	i32.const	$push27=, 1
+	i32.add 	$2=, $4, $pop27
+	i32.const	$push26=, 1
+	i32.add 	$5=, $6, $pop26
+	i32.add 	$push1=, $3, $4
+	i32.load8_u	$1=, 0($pop1)
+	copy_local	$4=, $2
+	i32.const	$push25=, -48
+	i32.add 	$push2=, $1, $pop25
+	i32.const	$push24=, 255
+	i32.and 	$push3=, $pop2, $pop24
+	i32.const	$push23=, 10
+	i32.lt_u	$push4=, $pop3, $pop23
+	br_if   	0, $pop4        # 0: up to label10
+# %bb.3:                                # %while.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	block   	
-	i32.const	$push33=, 1
-	i32.eq  	$push4=, $1, $pop33
-	br_if   	0, $pop4        # 0: down to label11
-# BB#4:                                 # %lor.lhs.false.i
+	i32.const	$push28=, 1
+	i32.eq  	$push5=, $2, $pop28
+	br_if   	0, $pop5        # 0: down to label11
+# %bb.4:                                # %lor.lhs.false.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.add 	$push37=, $3, $1
-	tee_local	$push36=, $4=, $pop37
-	i32.const	$push35=, -1
-	i32.add 	$push0=, $pop36, $pop35
-	i32.sub 	$push5=, $pop0, $3
-	i32.const	$push34=, 4
-	i32.ge_s	$push6=, $pop5, $pop34
-	br_if   	2, $pop6        # 2: down to label8
-# BB#5:                                 # %if.end.i
+	i32.add 	$4=, $3, $2
+	i32.const	$push30=, -1
+	i32.add 	$push0=, $4, $pop30
+	i32.sub 	$push6=, $pop0, $3
+	i32.const	$push29=, 4
+	i32.ge_s	$push7=, $pop6, $pop29
+	br_if   	2, $pop7        # 2: down to label8
+# %bb.5:                                # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$push34=, 3
+	i32.eq  	$push8=, $0, $pop34
+	i32.const	$push33=, 255
+	i32.and 	$push9=, $1, $pop33
+	i32.const	$push32=, 46
+	i32.eq  	$push10=, $pop9, $pop32
+	i32.or  	$push11=, $pop8, $pop10
+	i32.add 	$0=, $0, $pop11
 	copy_local	$3=, $4
-	i32.const	$push43=, 3
-	i32.eq  	$push7=, $0, $pop43
-	i32.const	$push42=, 255
-	i32.and 	$push8=, $2, $pop42
-	i32.const	$push41=, 46
-	i32.eq  	$push9=, $pop8, $pop41
-	i32.or  	$push10=, $pop7, $pop9
-	i32.add 	$push40=, $0, $pop10
-	tee_local	$push39=, $0=, $pop40
-	i32.const	$push38=, 4
-	i32.lt_s	$push11=, $pop39, $pop38
-	br_if   	1, $pop11       # 1: up to label9
+	i32.const	$push31=, 4
+	i32.lt_u	$push12=, $0, $pop31
+	br_if   	1, $pop12       # 1: up to label9
 	br      	3               # 3: down to label7
 .LBB2_6:
 	end_block                       # label11:
@@ -212,36 +201,35 @@ main:                                   # @main
 	br      	1               # 1: down to label7
 .LBB2_7:                                # %lor.lhs.false.i.while.end25.i_crit_edge
 	end_block                       # label8:
-	i32.add 	$push12=, $3, $1
-	i32.const	$push13=, -1
-	i32.add 	$6=, $pop12, $pop13
+	i32.add 	$push13=, $3, $2
+	i32.const	$push14=, -1
+	i32.add 	$6=, $pop13, $pop14
 .LBB2_8:                                # %while.end25.i
 	end_block                       # label7:
 	block   	
-	i32.const	$push14=, 4
-	i32.ne  	$push15=, $0, $pop14
-	br_if   	0, $pop15       # 0: down to label12
-# BB#9:                                 # %land.lhs.true.i
+	i32.const	$push15=, 4
+	i32.ne  	$push16=, $0, $pop15
+	br_if   	0, $pop16       # 0: down to label12
+# %bb.9:                                # %land.lhs.true.i
+	i32.load8_u	$4=, 0($6)
 	block   	
-	i32.load8_u	$push45=, 0($6)
-	tee_local	$push44=, $4=, $pop45
-	i32.eqz 	$push46=, $pop44
-	br_if   	0, $pop46       # 0: down to label13
-# BB#10:                                # %land.lhs.true.i
-	i32.const	$push16=, 58
-	i32.ne  	$push17=, $4, $pop16
-	br_if   	1, $pop17       # 1: down to label12
-# BB#11:                                # %if.then39.i
-	i32.const	$push18=, 0
-	i32.store8	0($6), $pop18
-	i32.const	$push19=, 1
-	i32.add 	$6=, $6, $pop19
+	i32.eqz 	$push35=, $4
+	br_if   	0, $pop35       # 0: down to label13
+# %bb.10:                               # %land.lhs.true.i
+	i32.const	$push17=, 58
+	i32.ne  	$push18=, $4, $pop17
+	br_if   	1, $pop18       # 1: down to label12
+# %bb.11:                               # %if.then39.i
+	i32.const	$push19=, 0
+	i32.store8	0($6), $pop19
+	i32.const	$push20=, 1
+	i32.add 	$6=, $6, $pop20
 .LBB2_12:                               # %if.end
 	end_block                       # label13:
-	i32.const	$push20=, main.addr
-	i32.call	$drop=, strcpy@FUNCTION, $pop20, $6
-	i32.const	$push21=, 0
-	return  	$pop21
+	i32.const	$push21=, main.addr
+	i32.call	$drop=, strcpy@FUNCTION, $pop21, $6
+	i32.const	$push22=, 0
+	return  	$pop22
 .LBB2_13:                               # %if.then
 	end_block                       # label12:
 	call    	abort@FUNCTION
@@ -258,6 +246,6 @@ main.addr:
 	.size	main.addr, 19
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f3a381754..de989e93b 100644
--- a/test/torture-s/20031211-1.c.s
+++ b/test/torture-s/20031211-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 48879
 	i32.store	x($pop1), $pop0
@@ -27,5 +27,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20031211-2.c.s b/test/torture-s/20031211-2.c.s
index 937179a7c..89a2aad30 100644
--- a/test/torture-s/20031211-2.c.s
+++ b/test/torture-s/20031211-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -21,12 +21,12 @@ main:                                   # @main
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 3
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -37,6 +37,6 @@ foo:                                    # @foo
 	.size	foo, .Lfunc_end1-foo
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 60583fbab..39fce2bdc 100644
--- a/test/torture-s/20031214-1.c.s
+++ b/test/torture-s/20031214-1.c.s
@@ -6,7 +6,7 @@
 	.type	b,@function
 b:                                      # @b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,25 +19,21 @@ b:                                      # @b
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push17=, 0
-	i32.load	$push16=, k($pop17)
-	tee_local	$push15=, $1=, $pop16
-	i32.const	$push14=, 0
-	i32.load	$push13=, g+8($pop14)
-	tee_local	$push12=, $0=, $pop13
-	i32.gt_s	$push1=, $1, $0
-	i32.select	$push11=, $pop15, $pop12, $pop1
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$0=, g+8($pop0)
 	i32.const	$push9=, 0
-	i32.load	$push8=, g+12($pop9)
-	tee_local	$push7=, $0=, $pop8
-	i32.gt_s	$push2=, $1, $0
-	i32.select	$push3=, $pop10, $pop7, $pop2
+	i32.load	$1=, k($pop9)
+	i32.gt_s	$push1=, $1, $0
+	i32.select	$0=, $1, $0, $pop1
+	i32.const	$push8=, 0
+	i32.load	$1=, g+12($pop8)
+	i32.const	$push7=, 0
+	i32.gt_s	$push2=, $0, $1
+	i32.select	$push3=, $0, $1, $pop2
 	i32.const	$push4=, 1
 	i32.add 	$push5=, $pop3, $pop4
-	i32.store	k($pop0), $pop5
+	i32.store	k($pop7), $pop5
 	i32.const	$push6=, 0
                                         # fallthrough-return: $pop6
 	.endfunc
@@ -65,4 +61,4 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20031215-1.c.s b/test/torture-s/20031215-1.c.s
index bf3c8a7b7..b8f4121d2 100644
--- a/test/torture-s/20031215-1.c.s
+++ b/test/torture-s/20031215-1.c.s
@@ -5,7 +5,7 @@
 	.globl	test1
 	.type	test1,@function
 test1:                                  # @test1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -16,7 +16,7 @@ test1:                                  # @test1
 	.globl	test2
 	.type	test2,@function
 test2:                                  # @test2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -27,7 +27,7 @@ test2:                                  # @test2
 	.globl	test3
 	.type	test3,@function
 test3:                                  # @test3
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -39,7 +39,7 @@ test3:                                  # @test3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -68,4 +68,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20031216-1.c.s b/test/torture-s/20031216-1.c.s
index 730d386d7..ddda34b83 100644
--- a/test/torture-s/20031216-1.c.s
+++ b/test/torture-s/20031216-1.c.s
@@ -6,12 +6,12 @@
 	.type	DisplayNumber,@function
 DisplayNumber:                          # @DisplayNumber
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 154
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ DisplayNumber:                          # @DisplayNumber
 	.type	ReadNumber,@function
 ReadNumber:                             # @ReadNumber
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10092544
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -40,7 +40,7 @@ ReadNumber:                             # @ReadNumber
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -48,5 +48,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20040208-1.c.s b/test/torture-s/20040208-1.c.s
index 5a4a44e8b..979e43aef 100644
--- a/test/torture-s/20040208-1.c.s
+++ b/test/torture-s/20040208-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040218-1.c.s b/test/torture-s/20040218-1.c.s
index 45ae2cff2..ad5992b22 100644
--- a/test/torture-s/20040218-1.c.s
+++ b/test/torture-s/20040218-1.c.s
@@ -7,7 +7,7 @@
 xb:                                     # @xb
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_u	$push1=, 0($0)
 	i32.load	$push0=, 4($0)
 	i32.add 	$push2=, $pop1, $pop0
@@ -23,7 +23,7 @@ xb:                                     # @xb
 xw:                                     # @xw
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$push1=, 0($0)
 	i32.load	$push0=, 4($0)
 	i32.add 	$push2=, $pop1, $pop0
@@ -39,7 +39,7 @@ xw:                                     # @xw
 yb:                                     # @yb
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_u	$push1=, 0($0)
 	i32.load16_u	$push0=, 2($0)
 	i32.add 	$push2=, $pop1, $pop0
@@ -59,14 +59,13 @@ yb:                                     # @yb
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push23=, $pop12, $pop14
-	tee_local	$push22=, $0=, $pop23
-	i32.store	__stack_pointer($pop15), $pop22
+	i32.sub 	$0=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $0
 	i64.const	$push0=, 68723771703295
 	i64.store	8($0), $pop0
 	i32.const	$push1=, 1048641535
@@ -78,21 +77,21 @@ main:                                   # @main
 	i32.const	$push2=, 16255
 	i32.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push18=, 8
 	i32.add 	$push19=, $0, $pop18
 	i32.call	$push6=, xw@FUNCTION, $pop19
 	i32.const	$push5=, 81535
 	i32.ne  	$push7=, $pop6, $pop5
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false4
+# %bb.2:                                # %lor.lhs.false4
 	i32.const	$push20=, 4
 	i32.add 	$push21=, $0, $pop20
 	i32.call	$push9=, yb@FUNCTION, $pop21
 	i32.const	$push8=, 16255
 	i32.ne  	$push10=, $pop9, $pop8
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push11=, 0
 	call    	exit@FUNCTION, $pop11
 	unreachable
@@ -105,6 +104,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7f5cea4e8..c9a491c06 100644
--- a/test/torture-s/20040223-1.c.s
+++ b/test/torture-s/20040223-1.c.s
@@ -6,12 +6,12 @@
 	.type	a,@function
 a:                                      # @a
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1234
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ a:                                      # @a
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,5 +35,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20040307-1.c.s b/test/torture-s/20040307-1.c.s
index 79161e971..db5f33361 100644
--- a/test/torture-s/20040307-1.c.s
+++ b/test/torture-s/20040307-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# %bb.0:                                # %if.end6
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040309-1.c.s b/test/torture-s/20040309-1.c.s
index 09e55059a..4c4f91f47 100644
--- a/test/torture-s/20040309-1.c.s
+++ b/test/torture-s/20040309-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 16
 	i32.shl 	$push3=, $0, $pop2
 	i32.const	$push4=, 31
@@ -26,7 +26,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end16
+# %bb.0:                                # %if.end16
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,4 +34,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040311-1.c.s b/test/torture-s/20040311-1.c.s
index 3276104e6..05e87d02c 100644
--- a/test/torture-s/20040311-1.c.s
+++ b/test/torture-s/20040311-1.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -52,7 +52,7 @@ test3:                                  # @test3
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -66,7 +66,7 @@ test4:                                  # @test4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end44
+# %bb.0:                                # %if.end44
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -74,4 +74,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040313-1.c.s b/test/torture-s/20040313-1.c.s
index 497bddb23..2466e11db 100644
--- a/test/torture-s/20040313-1.c.s
+++ b/test/torture-s/20040313-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040319-1.c.s b/test/torture-s/20040319-1.c.s
index 66da61b82..06fc7032e 100644
--- a/test/torture-s/20040319-1.c.s
+++ b/test/torture-s/20040319-1.c.s
@@ -7,7 +7,7 @@
 blah:                                   # @blah
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 1
 	i32.const	$push2=, 0
 	i32.sub 	$push3=, $pop2, $0
@@ -25,7 +25,7 @@ blah:                                   # @blah
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.else
+# %bb.0:                                # %if.else
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -34,5 +34,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040331-1.c.s b/test/torture-s/20040331-1.c.s
index 256f74ed2..39b32fe3b 100644
--- a/test/torture-s/20040331-1.c.s
+++ b/test/torture-s/20040331-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040409-1.c.s b/test/torture-s/20040409-1.c.s
index 083a5f07b..9937b6425 100644
--- a/test/torture-s/20040409-1.c.s
+++ b/test/torture-s/20040409-1.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ test1:                                  # @test1
 test1u:                                 # @test1u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ test1u:                                 # @test1u
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.or  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -52,7 +52,7 @@ test2:                                  # @test2
 test2u:                                 # @test2u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -67,7 +67,7 @@ test2u:                                 # @test2u
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -82,7 +82,7 @@ test3:                                  # @test3
 test3u:                                 # @test3u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -97,7 +97,7 @@ test3u:                                 # @test3u
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -112,7 +112,7 @@ test4:                                  # @test4
 test4u:                                 # @test4u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -127,7 +127,7 @@ test4u:                                 # @test4u
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.or  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -142,7 +142,7 @@ test5:                                  # @test5
 test5u:                                 # @test5u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -157,7 +157,7 @@ test5u:                                 # @test5u
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -172,7 +172,7 @@ test6:                                  # @test6
 test6u:                                 # @test6u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -186,18 +186,18 @@ test6u:                                 # @test6u
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	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
+# %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
+# %bb.2:                                # %if.end20
 	return
 .LBB12_3:                               # %if.then
 	end_block                       # label0:
@@ -213,13 +213,13 @@ test:                                   # @test
 	.type	testu,@function
 testu:                                  # @testu
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %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 label1
-# BB#1:                                 # %if.end20
+# %bb.1:                                # %if.end20
 	return
 .LBB13_2:                               # %if.then
 	end_block                       # label1:
@@ -235,7 +235,7 @@ testu:                                  # @testu
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -243,5 +243,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end14-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20040409-2.c.s b/test/torture-s/20040409-2.c.s
index be57483f6..f06e62bab 100644
--- a/test/torture-s/20040409-2.c.s
+++ b/test/torture-s/20040409-2.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ test1:                                  # @test1
 test1u:                                 # @test1u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ test1u:                                 # @test1u
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -52,7 +52,7 @@ test2:                                  # @test2
 test2u:                                 # @test2u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -67,7 +67,7 @@ test2u:                                 # @test2u
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push2=, 4660
@@ -84,7 +84,7 @@ test3:                                  # @test3
 test3u:                                 # @test3u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -99,7 +99,7 @@ test3u:                                 # @test3u
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push2=, 4660
@@ -116,7 +116,7 @@ test4:                                  # @test4
 test4u:                                 # @test4u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -131,7 +131,7 @@ test4u:                                 # @test4u
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -146,7 +146,7 @@ test5:                                  # @test5
 test5u:                                 # @test5u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -161,7 +161,7 @@ test5u:                                 # @test5u
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -176,7 +176,7 @@ test6:                                  # @test6
 test6u:                                 # @test6u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -191,7 +191,7 @@ test6u:                                 # @test6u
 test7:                                  # @test7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -206,7 +206,7 @@ test7:                                  # @test7
 test7u:                                 # @test7u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -221,7 +221,7 @@ test7u:                                 # @test7u
 test8:                                  # @test8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -236,7 +236,7 @@ test8:                                  # @test8
 test8u:                                 # @test8u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -251,7 +251,7 @@ test8u:                                 # @test8u
 test9:                                  # @test9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push2=, 4660
@@ -268,7 +268,7 @@ test9:                                  # @test9
 test9u:                                 # @test9u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -283,7 +283,7 @@ test9u:                                 # @test9u
 test10:                                 # @test10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push2=, 4660
@@ -300,7 +300,7 @@ test10:                                 # @test10
 test10u:                                # @test10u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -315,7 +315,7 @@ test10u:                                # @test10u
 test11:                                 # @test11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -330,7 +330,7 @@ test11:                                 # @test11
 test11u:                                # @test11u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -345,7 +345,7 @@ test11u:                                # @test11u
 test12:                                 # @test12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -360,7 +360,7 @@ test12:                                 # @test12
 test12u:                                # @test12u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -374,20 +374,20 @@ test12u:                                # @test12u
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
 	i32.ne  	$push2=, $pop1, $1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end4
+# %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
+# %bb.2:                                # %if.end44
 	return
 .LBB24_3:                               # %if.then
 	end_block                       # label0:
@@ -403,13 +403,13 @@ test:                                   # @test
 	.type	testu,@function
 testu:                                  # @testu
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -2147478988
 	i32.xor 	$push1=, $0, $pop0
 	i32.ne  	$push2=, $pop1, $1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %if.end44
+# %bb.1:                                # %if.end44
 	return
 .LBB25_2:                               # %if.then
 	end_block                       # label1:
@@ -425,7 +425,7 @@ testu:                                  # @testu
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -433,5 +433,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end26-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20040409-3.c.s b/test/torture-s/20040409-3.c.s
index 8a6c346ca..97ebd87c6 100644
--- a/test/torture-s/20040409-3.c.s
+++ b/test/torture-s/20040409-3.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ test1:                                  # @test1
 test1u:                                 # @test1u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ test1u:                                 # @test1u
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.xor 	$push1=, $0, $pop0
 	i32.const	$push2=, 2147483647
@@ -54,7 +54,7 @@ test2:                                  # @test2
 test2u:                                 # @test2u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -69,7 +69,7 @@ test2u:                                 # @test2u
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -84,7 +84,7 @@ test3:                                  # @test3
 test3u:                                 # @test3u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -99,7 +99,7 @@ test3u:                                 # @test3u
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -114,7 +114,7 @@ test4:                                  # @test4
 test4u:                                 # @test4u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -129,7 +129,7 @@ test4u:                                 # @test4u
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.xor 	$push1=, $0, $pop0
 	i32.const	$push2=, 2147483647
@@ -146,7 +146,7 @@ test5:                                  # @test5
 test5u:                                 # @test5u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -161,7 +161,7 @@ test5u:                                 # @test5u
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -176,7 +176,7 @@ test6:                                  # @test6
 test6u:                                 # @test6u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483647
 	i32.xor 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -190,20 +190,20 @@ test6u:                                 # @test6u
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	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
+# %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
+# %bb.2:                                # %if.end20
 	return
 .LBB12_3:                               # %if.then
 	end_block                       # label0:
@@ -219,13 +219,13 @@ test:                                   # @test
 	.type	testu,@function
 testu:                                  # @testu
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %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 label1
-# BB#1:                                 # %if.end20
+# %bb.1:                                # %if.end20
 	return
 .LBB13_2:                               # %if.then
 	end_block                       # label1:
@@ -241,7 +241,7 @@ testu:                                  # @testu
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -249,5 +249,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end14-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20040411-1.c.s b/test/torture-s/20040411-1.c.s
index 3a4eeffca..226197dca 100644
--- a/test/torture-s/20040411-1.c.s
+++ b/test/torture-s/20040411-1.c.s
@@ -7,12 +7,11 @@
 sub1:                                   # @sub1
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
-	i32.add 	$push9=, $0, $pop0
-	tee_local	$push8=, $0=, $pop9
+	i32.add 	$0=, $0, $pop0
 	i32.const	$push7=, 2
-	i32.shl 	$push4=, $pop8, $pop7
+	i32.shl 	$push4=, $0, $pop7
 	i32.const	$push2=, 12
 	i32.mul 	$push3=, $0, $pop2
 	i32.const	$push6=, 2
@@ -29,7 +28,7 @@ sub1:                                   # @sub1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,4 +36,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040625-1.c.s b/test/torture-s/20040625-1.c.s
index e8b91b086..b53709aad 100644
--- a/test/torture-s/20040625-1.c.s
+++ b/test/torture-s/20040625-1.c.s
@@ -7,11 +7,11 @@
 maybe_next:                             # @maybe_next
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push0=, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.load	$0=, 0($0):p2align=0
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
@@ -28,14 +28,13 @@ maybe_next:                             # @maybe_next
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push11=, $pop4, $pop6
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop7), $pop10
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.store	8($0), $0
 	block   	
 	i32.const	$push8=, 8
@@ -44,7 +43,7 @@ main:                                   # @main
 	i32.call	$push1=, maybe_next@FUNCTION, $pop9, $pop0
 	i32.ne  	$push2=, $pop1, $0
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	call    	exit@FUNCTION, $pop3
 	unreachable
@@ -57,6 +56,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 43ee1e38c..40f209881 100644
--- a/test/torture-s/20040629-1.c.s
+++ b/test/torture-s/20040629-1.c.s
@@ -6,7 +6,7 @@
 	.type	ret1,@function
 ret1:                                   # @ret1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b($pop0)
 	i32.const	$push2=, 63
@@ -22,7 +22,7 @@ ret1:                                   # @ret1
 	.type	ret2,@function
 ret2:                                   # @ret2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b($pop0)
 	i32.const	$push2=, 6
@@ -40,7 +40,7 @@ ret2:                                   # @ret2
 	.type	ret3,@function
 ret3:                                   # @ret3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b($pop0)
 	i32.const	$push2=, 17
@@ -56,7 +56,7 @@ ret3:                                   # @ret3
 	.type	ret4,@function
 ret4:                                   # @ret4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c($pop0)
 	i32.const	$push2=, 31
@@ -72,7 +72,7 @@ ret4:                                   # @ret4
 	.type	ret5,@function
 ret5:                                   # @ret5
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c($pop0)
 	i32.const	$push2=, 5
@@ -90,7 +90,7 @@ ret5:                                   # @ret5
 	.type	ret6,@function
 ret6:                                   # @ret6
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c($pop0)
 	i32.const	$push2=, 6
@@ -106,7 +106,7 @@ ret6:                                   # @ret6
 	.type	ret7,@function
 ret7:                                   # @ret7
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, d($pop0)
                                         # fallthrough-return: $pop1
@@ -120,7 +120,7 @@ ret7:                                   # @ret7
 	.type	ret8,@function
 ret8:                                   # @ret8
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, d+2($pop0)
                                         # fallthrough-return: $pop1
@@ -134,7 +134,7 @@ ret8:                                   # @ret8
 	.type	ret9,@function
 ret9:                                   # @ret9
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, d+3($pop0)
                                         # fallthrough-return: $pop1
@@ -149,18 +149,17 @@ ret9:                                   # @ret9
 fn1_1:                                  # @fn1_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.add 	$push3=, $pop7, $0
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
@@ -173,20 +172,19 @@ fn1_1:                                  # @fn1_1
 fn2_1:                                  # @fn2_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.add 	$push5=, $pop9, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.const	$push6=, 131008
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
@@ -198,7 +196,7 @@ fn2_1:                                  # @fn2_1
 	.type	fn3_1,@function
 fn3_1:                                  # @fn3_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b($pop5)
@@ -218,18 +216,17 @@ fn3_1:                                  # @fn3_1
 fn4_1:                                  # @fn4_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.add 	$push3=, $pop7, $0
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 31
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
@@ -242,20 +239,19 @@ fn4_1:                                  # @fn4_1
 fn5_1:                                  # @fn5_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 5
 	i32.shl 	$push4=, $0, $pop3
-	i32.add 	$push5=, $pop9, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.const	$push6=, 32
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end13:
@@ -267,7 +263,7 @@ fn5_1:                                  # @fn5_1
 	.type	fn6_1,@function
 fn6_1:                                  # @fn6_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c($pop5)
@@ -286,7 +282,7 @@ fn6_1:                                  # @fn6_1
 	.type	fn7_1,@function
 fn7_1:                                  # @fn7_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, d($pop3)
@@ -303,7 +299,7 @@ fn7_1:                                  # @fn7_1
 	.type	fn8_1,@function
 fn8_1:                                  # @fn8_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -324,7 +320,7 @@ fn8_1:                                  # @fn8_1
 	.type	fn9_1,@function
 fn9_1:                                  # @fn9_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d($pop5)
@@ -344,19 +340,18 @@ fn9_1:                                  # @fn9_1
 fn1_2:                                  # @fn1_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end18:
@@ -369,19 +364,18 @@ fn1_2:                                  # @fn1_2
 fn2_2:                                  # @fn2_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 64
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end19:
@@ -393,7 +387,7 @@ fn2_2:                                  # @fn2_2
 	.type	fn3_2,@function
 fn3_2:                                  # @fn3_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -412,19 +406,18 @@ fn3_2:                                  # @fn3_2
 fn4_2:                                  # @fn4_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end21:
@@ -436,7 +429,7 @@ fn4_2:                                  # @fn4_2
 	.type	fn5_2,@function
 fn5_2:                                  # @fn5_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -454,7 +447,7 @@ fn5_2:                                  # @fn5_2
 	.type	fn6_2,@function
 fn6_2:                                  # @fn6_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -472,7 +465,7 @@ fn6_2:                                  # @fn6_2
 	.type	fn7_2,@function
 fn7_2:                                  # @fn7_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -490,7 +483,7 @@ fn7_2:                                  # @fn7_2
 	.type	fn8_2,@function
 fn8_2:                                  # @fn8_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -510,7 +503,7 @@ fn8_2:                                  # @fn8_2
 	.type	fn9_2,@function
 fn9_2:                                  # @fn9_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -529,19 +522,18 @@ fn9_2:                                  # @fn9_2
 fn1_3:                                  # @fn1_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end27:
@@ -554,19 +546,18 @@ fn1_3:                                  # @fn1_3
 fn2_3:                                  # @fn2_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 64
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end28:
@@ -578,7 +569,7 @@ fn2_3:                                  # @fn2_3
 	.type	fn3_3,@function
 fn3_3:                                  # @fn3_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -597,19 +588,18 @@ fn3_3:                                  # @fn3_3
 fn4_3:                                  # @fn4_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end30:
@@ -621,7 +611,7 @@ fn4_3:                                  # @fn4_3
 	.type	fn5_3,@function
 fn5_3:                                  # @fn5_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -639,7 +629,7 @@ fn5_3:                                  # @fn5_3
 	.type	fn6_3,@function
 fn6_3:                                  # @fn6_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -657,7 +647,7 @@ fn6_3:                                  # @fn6_3
 	.type	fn7_3,@function
 fn7_3:                                  # @fn7_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -675,7 +665,7 @@ fn7_3:                                  # @fn7_3
 	.type	fn8_3,@function
 fn8_3:                                  # @fn8_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -695,7 +685,7 @@ fn8_3:                                  # @fn8_3
 	.type	fn9_3,@function
 fn9_3:                                  # @fn9_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -714,18 +704,17 @@ fn9_3:                                  # @fn9_3
 fn1_4:                                  # @fn1_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.sub 	$push3=, $pop7, $0
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
+	i32.sub 	$push3=, $1, $0
 	i32.const	$push4=, 63
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end36:
@@ -738,20 +727,19 @@ fn1_4:                                  # @fn1_4
 fn2_4:                                  # @fn2_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, 131008
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end37:
@@ -764,20 +752,19 @@ fn2_4:                                  # @fn2_4
 fn3_4:                                  # @fn3_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, -131072
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end38:
@@ -790,18 +777,17 @@ fn3_4:                                  # @fn3_4
 fn4_4:                                  # @fn4_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.sub 	$push3=, $pop7, $0
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
+	i32.sub 	$push3=, $1, $0
 	i32.const	$push4=, 31
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end39:
@@ -814,20 +800,19 @@ fn4_4:                                  # @fn4_4
 fn5_4:                                  # @fn5_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 5
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, 32
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end40:
@@ -840,20 +825,19 @@ fn5_4:                                  # @fn5_4
 fn6_4:                                  # @fn6_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, -64
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end41:
@@ -865,7 +849,7 @@ fn6_4:                                  # @fn6_4
 	.type	fn7_4,@function
 fn7_4:                                  # @fn7_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, d($pop3)
@@ -882,7 +866,7 @@ fn7_4:                                  # @fn7_4
 	.type	fn8_4,@function
 fn8_4:                                  # @fn8_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -903,7 +887,7 @@ fn8_4:                                  # @fn8_4
 	.type	fn9_4,@function
 fn9_4:                                  # @fn9_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -925,19 +909,18 @@ fn9_4:                                  # @fn9_4
 fn1_5:                                  # @fn1_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 63
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end45:
@@ -950,19 +933,18 @@ fn1_5:                                  # @fn1_5
 fn2_5:                                  # @fn2_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 131008
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 131008
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end46:
@@ -974,7 +956,7 @@ fn2_5:                                  # @fn2_5
 	.type	fn3_5,@function
 fn3_5:                                  # @fn3_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -993,19 +975,18 @@ fn3_5:                                  # @fn3_5
 fn4_5:                                  # @fn4_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 31
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end48:
@@ -1017,7 +998,7 @@ fn4_5:                                  # @fn4_5
 	.type	fn5_5,@function
 fn5_5:                                  # @fn5_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1035,7 +1016,7 @@ fn5_5:                                  # @fn5_5
 	.type	fn6_5,@function
 fn6_5:                                  # @fn6_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1053,7 +1034,7 @@ fn6_5:                                  # @fn6_5
 	.type	fn7_5,@function
 fn7_5:                                  # @fn7_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1071,7 +1052,7 @@ fn7_5:                                  # @fn7_5
 	.type	fn8_5,@function
 fn8_5:                                  # @fn8_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -1091,7 +1072,7 @@ fn8_5:                                  # @fn8_5
 	.type	fn9_5,@function
 fn9_5:                                  # @fn9_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1110,19 +1091,18 @@ fn9_5:                                  # @fn9_5
 fn1_6:                                  # @fn1_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 63
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end54:
@@ -1135,19 +1115,18 @@ fn1_6:                                  # @fn1_6
 fn2_6:                                  # @fn2_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 131008
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 131008
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end55:
@@ -1159,7 +1138,7 @@ fn2_6:                                  # @fn2_6
 	.type	fn3_6,@function
 fn3_6:                                  # @fn3_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -1178,19 +1157,18 @@ fn3_6:                                  # @fn3_6
 fn4_6:                                  # @fn4_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 31
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end57:
@@ -1202,7 +1180,7 @@ fn4_6:                                  # @fn4_6
 	.type	fn5_6,@function
 fn5_6:                                  # @fn5_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1220,7 +1198,7 @@ fn5_6:                                  # @fn5_6
 	.type	fn6_6,@function
 fn6_6:                                  # @fn6_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1238,7 +1216,7 @@ fn6_6:                                  # @fn6_6
 	.type	fn7_6,@function
 fn7_6:                                  # @fn7_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1256,7 +1234,7 @@ fn7_6:                                  # @fn7_6
 	.type	fn8_6,@function
 fn8_6:                                  # @fn8_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -1276,7 +1254,7 @@ fn8_6:                                  # @fn8_6
 	.type	fn9_6,@function
 fn9_6:                                  # @fn9_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1294,7 +1272,7 @@ fn9_6:                                  # @fn9_6
 	.type	fn1_7,@function
 fn1_7:                                  # @fn1_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -64
 	i32.or  	$push1=, $0, $pop0
@@ -1313,7 +1291,7 @@ fn1_7:                                  # @fn1_7
 	.type	fn2_7,@function
 fn2_7:                                  # @fn2_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
@@ -1334,7 +1312,7 @@ fn2_7:                                  # @fn2_7
 	.type	fn3_7,@function
 fn3_7:                                  # @fn3_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b($pop7)
@@ -1355,7 +1333,7 @@ fn3_7:                                  # @fn3_7
 	.type	fn4_7,@function
 fn4_7:                                  # @fn4_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -32
 	i32.or  	$push1=, $0, $pop0
@@ -1374,7 +1352,7 @@ fn4_7:                                  # @fn4_7
 	.type	fn5_7,@function
 fn5_7:                                  # @fn5_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
@@ -1395,7 +1373,7 @@ fn5_7:                                  # @fn5_7
 	.type	fn6_7,@function
 fn6_7:                                  # @fn6_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c($pop7)
@@ -1416,7 +1394,7 @@ fn6_7:                                  # @fn6_7
 	.type	fn7_7,@function
 fn7_7:                                  # @fn7_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -65536
 	i32.or  	$push1=, $0, $pop0
@@ -1435,7 +1413,7 @@ fn7_7:                                  # @fn7_7
 	.type	fn8_7,@function
 fn8_7:                                  # @fn8_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
@@ -1456,7 +1434,7 @@ fn8_7:                                  # @fn8_7
 	.type	fn9_7,@function
 fn9_7:                                  # @fn9_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d($pop7)
@@ -1477,7 +1455,7 @@ fn9_7:                                  # @fn9_7
 	.type	fn1_8,@function
 fn1_8:                                  # @fn1_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b($pop5)
@@ -1496,7 +1474,7 @@ fn1_8:                                  # @fn1_8
 	.type	fn2_8,@function
 fn2_8:                                  # @fn2_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b($pop7)
@@ -1518,20 +1496,19 @@ fn2_8:                                  # @fn2_8
 fn3_8:                                  # @fn3_8
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -131072
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.or  	$push5=, $pop4, $pop1
 	i32.const	$push6=, 131071
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	b($pop2), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end74:
@@ -1543,7 +1520,7 @@ fn3_8:                                  # @fn3_8
 	.type	fn4_8,@function
 fn4_8:                                  # @fn4_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c($pop5)
@@ -1562,7 +1539,7 @@ fn4_8:                                  # @fn4_8
 	.type	fn5_8,@function
 fn5_8:                                  # @fn5_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c($pop7)
@@ -1584,20 +1561,19 @@ fn5_8:                                  # @fn5_8
 fn6_8:                                  # @fn6_8
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -64
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.or  	$push5=, $pop4, $pop1
 	i32.const	$push6=, 63
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	c($pop2), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end77:
@@ -1609,7 +1585,7 @@ fn6_8:                                  # @fn6_8
 	.type	fn7_8,@function
 fn7_8:                                  # @fn7_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d($pop5)
@@ -1628,7 +1604,7 @@ fn7_8:                                  # @fn7_8
 	.type	fn8_8,@function
 fn8_8:                                  # @fn8_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d($pop7)
@@ -1649,7 +1625,7 @@ fn8_8:                                  # @fn8_8
 	.type	fn9_8,@function
 fn9_8:                                  # @fn9_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -1670,7 +1646,7 @@ fn9_8:                                  # @fn9_8
 	.type	fn1_9,@function
 fn1_9:                                  # @fn1_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b($pop5)
@@ -1689,7 +1665,7 @@ fn1_9:                                  # @fn1_9
 	.type	fn2_9,@function
 fn2_9:                                  # @fn2_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b($pop7)
@@ -1711,20 +1687,19 @@ fn2_9:                                  # @fn2_9
 fn3_9:                                  # @fn3_9
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -131072
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.xor 	$push5=, $pop4, $pop1
 	i32.const	$push6=, 131071
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	b($pop2), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end83:
@@ -1736,7 +1711,7 @@ fn3_9:                                  # @fn3_9
 	.type	fn4_9,@function
 fn4_9:                                  # @fn4_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c($pop5)
@@ -1755,7 +1730,7 @@ fn4_9:                                  # @fn4_9
 	.type	fn5_9,@function
 fn5_9:                                  # @fn5_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c($pop7)
@@ -1777,20 +1752,19 @@ fn5_9:                                  # @fn5_9
 fn6_9:                                  # @fn6_9
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -64
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.xor 	$push5=, $pop4, $pop1
 	i32.const	$push6=, 63
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	c($pop2), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end86:
@@ -1802,7 +1776,7 @@ fn6_9:                                  # @fn6_9
 	.type	fn7_9,@function
 fn7_9:                                  # @fn7_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d($pop5)
@@ -1821,7 +1795,7 @@ fn7_9:                                  # @fn7_9
 	.type	fn8_9,@function
 fn8_9:                                  # @fn8_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d($pop7)
@@ -1842,7 +1816,7 @@ fn8_9:                                  # @fn8_9
 	.type	fn9_9,@function
 fn9_9:                                  # @fn9_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -1864,18 +1838,17 @@ fn9_9:                                  # @fn9_9
 fn1_a:                                  # @fn1_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push1=, -64
-	i32.and 	$push2=, $pop7, $pop1
+	i32.and 	$push2=, $1, $pop1
 	i32.const	$push3=, 63
 	i32.and 	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.or  	$push6=, $pop2, $pop5
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end90:
@@ -1888,13 +1861,12 @@ fn1_a:                                  # @fn1_a
 fn2_a:                                  # @fn2_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, b($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, b($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.div_u	$push7=, $pop6, $0
@@ -1903,7 +1875,7 @@ fn2_a:                                  # @fn2_a
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	b($pop0), $pop9
+	i32.store	b($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end91:
@@ -1916,20 +1888,19 @@ fn2_a:                                  # @fn2_a
 fn3_a:                                  # @fn3_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.const	$push8=, 17
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end92:
@@ -1942,18 +1913,17 @@ fn3_a:                                  # @fn3_a
 fn4_a:                                  # @fn4_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push1=, -32
-	i32.and 	$push2=, $pop7, $pop1
+	i32.and 	$push2=, $1, $pop1
 	i32.const	$push3=, 31
 	i32.and 	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.or  	$push6=, $pop2, $pop5
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end93:
@@ -1966,13 +1936,12 @@ fn4_a:                                  # @fn4_a
 fn5_a:                                  # @fn5_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, c($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, c($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
 	i32.div_u	$push7=, $pop6, $0
@@ -1981,7 +1950,7 @@ fn5_a:                                  # @fn5_a
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	c($pop0), $pop9
+	i32.store	c($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end94:
@@ -1994,20 +1963,19 @@ fn5_a:                                  # @fn5_a
 fn6_a:                                  # @fn6_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.const	$push8=, 6
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end95:
@@ -2019,7 +1987,7 @@ fn6_a:                                  # @fn6_a
 	.type	fn7_a,@function
 fn7_a:                                  # @fn7_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load16_u	$push1=, d($pop3)
@@ -2036,7 +2004,7 @@ fn7_a:                                  # @fn7_a
 	.type	fn8_a,@function
 fn8_a:                                  # @fn8_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+2($pop3)
@@ -2053,7 +2021,7 @@ fn8_a:                                  # @fn8_a
 	.type	fn9_a,@function
 fn9_a:                                  # @fn9_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+3($pop3)
@@ -2071,18 +2039,17 @@ fn9_a:                                  # @fn9_a
 fn1_b:                                  # @fn1_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop7, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end99:
@@ -2095,13 +2062,12 @@ fn1_b:                                  # @fn1_b
 fn2_b:                                  # @fn2_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, b($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, b($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.rem_u	$push7=, $pop6, $0
@@ -2110,7 +2076,7 @@ fn2_b:                                  # @fn2_b
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	b($pop0), $pop9
+	i32.store	b($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end100:
@@ -2123,20 +2089,19 @@ fn2_b:                                  # @fn2_b
 fn3_b:                                  # @fn3_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push8=, 17
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end101:
@@ -2149,18 +2114,17 @@ fn3_b:                                  # @fn3_b
 fn4_b:                                  # @fn4_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop7, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end102:
@@ -2173,13 +2137,12 @@ fn4_b:                                  # @fn4_b
 fn5_b:                                  # @fn5_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, c($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, c($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
 	i32.rem_u	$push7=, $pop6, $0
@@ -2188,7 +2151,7 @@ fn5_b:                                  # @fn5_b
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	c($pop0), $pop9
+	i32.store	c($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end103:
@@ -2201,20 +2164,19 @@ fn5_b:                                  # @fn5_b
 fn6_b:                                  # @fn6_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push8=, 6
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end104:
@@ -2226,7 +2188,7 @@ fn6_b:                                  # @fn6_b
 	.type	fn7_b,@function
 fn7_b:                                  # @fn7_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load16_u	$push1=, d($pop3)
@@ -2243,7 +2205,7 @@ fn7_b:                                  # @fn7_b
 	.type	fn8_b,@function
 fn8_b:                                  # @fn8_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+2($pop3)
@@ -2260,7 +2222,7 @@ fn8_b:                                  # @fn8_b
 	.type	fn9_b,@function
 fn9_b:                                  # @fn9_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+3($pop3)
@@ -2278,19 +2240,18 @@ fn9_b:                                  # @fn9_b
 fn1_c:                                  # @fn1_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 3
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end108:
@@ -2303,19 +2264,18 @@ fn1_c:                                  # @fn1_c
 fn2_c:                                  # @fn2_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 192
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end109:
@@ -2327,7 +2287,7 @@ fn2_c:                                  # @fn2_c
 	.type	fn3_c,@function
 fn3_c:                                  # @fn3_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2346,19 +2306,18 @@ fn3_c:                                  # @fn3_c
 fn4_c:                                  # @fn4_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 3
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end111:
@@ -2370,7 +2329,7 @@ fn4_c:                                  # @fn4_c
 	.type	fn5_c,@function
 fn5_c:                                  # @fn5_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2388,7 +2347,7 @@ fn5_c:                                  # @fn5_c
 	.type	fn6_c,@function
 fn6_c:                                  # @fn6_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2406,7 +2365,7 @@ fn6_c:                                  # @fn6_c
 	.type	fn7_c,@function
 fn7_c:                                  # @fn7_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2424,7 +2383,7 @@ fn7_c:                                  # @fn7_c
 	.type	fn8_c,@function
 fn8_c:                                  # @fn8_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -2444,7 +2403,7 @@ fn8_c:                                  # @fn8_c
 	.type	fn9_c,@function
 fn9_c:                                  # @fn9_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2463,19 +2422,18 @@ fn9_c:                                  # @fn9_c
 fn1_d:                                  # @fn1_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 57
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end117:
@@ -2488,19 +2446,18 @@ fn1_d:                                  # @fn1_d
 fn2_d:                                  # @fn2_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 130624
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end118:
@@ -2512,7 +2469,7 @@ fn2_d:                                  # @fn2_d
 	.type	fn3_d,@function
 fn3_d:                                  # @fn3_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2531,19 +2488,18 @@ fn3_d:                                  # @fn3_d
 fn4_d:                                  # @fn4_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 25
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end120:
@@ -2555,7 +2511,7 @@ fn4_d:                                  # @fn4_d
 	.type	fn5_d,@function
 fn5_d:                                  # @fn5_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2573,7 +2529,7 @@ fn5_d:                                  # @fn5_d
 	.type	fn6_d,@function
 fn6_d:                                  # @fn6_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2591,7 +2547,7 @@ fn6_d:                                  # @fn6_d
 	.type	fn7_d,@function
 fn7_d:                                  # @fn7_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2609,7 +2565,7 @@ fn7_d:                                  # @fn7_d
 	.type	fn8_d,@function
 fn8_d:                                  # @fn8_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -2629,7 +2585,7 @@ fn8_d:                                  # @fn8_d
 	.type	fn9_d,@function
 fn9_d:                                  # @fn9_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2647,7 +2603,7 @@ fn9_d:                                  # @fn9_d
 	.type	fn1_e,@function
 fn1_e:                                  # @fn1_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2665,7 +2621,7 @@ fn1_e:                                  # @fn1_e
 	.type	fn2_e,@function
 fn2_e:                                  # @fn2_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2683,7 +2639,7 @@ fn2_e:                                  # @fn2_e
 	.type	fn3_e,@function
 fn3_e:                                  # @fn3_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2701,7 +2657,7 @@ fn3_e:                                  # @fn3_e
 	.type	fn4_e,@function
 fn4_e:                                  # @fn4_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2719,7 +2675,7 @@ fn4_e:                                  # @fn4_e
 	.type	fn5_e,@function
 fn5_e:                                  # @fn5_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end130:
@@ -2731,7 +2687,7 @@ fn5_e:                                  # @fn5_e
 	.type	fn6_e,@function
 fn6_e:                                  # @fn6_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2749,7 +2705,7 @@ fn6_e:                                  # @fn6_e
 	.type	fn7_e,@function
 fn7_e:                                  # @fn7_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2767,7 +2723,7 @@ fn7_e:                                  # @fn7_e
 	.type	fn8_e,@function
 fn8_e:                                  # @fn8_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2785,7 +2741,7 @@ fn8_e:                                  # @fn8_e
 	.type	fn9_e,@function
 fn9_e:                                  # @fn9_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2803,7 +2759,7 @@ fn9_e:                                  # @fn9_e
 	.type	fn1_f,@function
 fn1_f:                                  # @fn1_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2821,7 +2777,7 @@ fn1_f:                                  # @fn1_f
 	.type	fn2_f,@function
 fn2_f:                                  # @fn2_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2839,7 +2795,7 @@ fn2_f:                                  # @fn2_f
 	.type	fn3_f,@function
 fn3_f:                                  # @fn3_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2857,7 +2813,7 @@ fn3_f:                                  # @fn3_f
 	.type	fn4_f,@function
 fn4_f:                                  # @fn4_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2875,7 +2831,7 @@ fn4_f:                                  # @fn4_f
 	.type	fn5_f,@function
 fn5_f:                                  # @fn5_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2893,7 +2849,7 @@ fn5_f:                                  # @fn5_f
 	.type	fn6_f,@function
 fn6_f:                                  # @fn6_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2911,7 +2867,7 @@ fn6_f:                                  # @fn6_f
 	.type	fn7_f,@function
 fn7_f:                                  # @fn7_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2929,7 +2885,7 @@ fn7_f:                                  # @fn7_f
 	.type	fn8_f,@function
 fn8_f:                                  # @fn8_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2947,7 +2903,7 @@ fn8_f:                                  # @fn8_f
 	.type	fn9_f,@function
 fn9_f:                                  # @fn9_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2965,7 +2921,7 @@ fn9_f:                                  # @fn9_f
 	.type	fn1_g,@function
 fn1_g:                                  # @fn1_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2983,7 +2939,7 @@ fn1_g:                                  # @fn1_g
 	.type	fn2_g,@function
 fn2_g:                                  # @fn2_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -3001,7 +2957,7 @@ fn2_g:                                  # @fn2_g
 	.type	fn3_g,@function
 fn3_g:                                  # @fn3_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -3019,7 +2975,7 @@ fn3_g:                                  # @fn3_g
 	.type	fn4_g,@function
 fn4_g:                                  # @fn4_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3037,7 +2993,7 @@ fn4_g:                                  # @fn4_g
 	.type	fn5_g,@function
 fn5_g:                                  # @fn5_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3055,7 +3011,7 @@ fn5_g:                                  # @fn5_g
 	.type	fn6_g,@function
 fn6_g:                                  # @fn6_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3073,7 +3029,7 @@ fn6_g:                                  # @fn6_g
 	.type	fn7_g,@function
 fn7_g:                                  # @fn7_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3091,7 +3047,7 @@ fn7_g:                                  # @fn7_g
 	.type	fn8_g,@function
 fn8_g:                                  # @fn8_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3109,7 +3065,7 @@ fn8_g:                                  # @fn8_g
 	.type	fn9_g,@function
 fn9_g:                                  # @fn9_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3128,19 +3084,18 @@ fn9_g:                                  # @fn9_g
 fn1_h:                                  # @fn1_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.div_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end153:
@@ -3153,13 +3108,12 @@ fn1_h:                                  # @fn1_h
 fn2_h:                                  # @fn2_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, b($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load	$1=, b($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop12, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 17
@@ -3169,7 +3123,7 @@ fn2_h:                                  # @fn2_h
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push10=, $pop9, $pop2
-	i32.store	b($pop0), $pop10
+	i32.store	b($pop12), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end154:
@@ -3182,19 +3136,18 @@ fn2_h:                                  # @fn2_h
 fn3_h:                                  # @fn3_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 2228224
-	i32.div_u	$push4=, $pop8, $pop3
+	i32.div_u	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end155:
@@ -3207,19 +3160,18 @@ fn3_h:                                  # @fn3_h
 fn4_h:                                  # @fn4_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.div_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end156:
@@ -3231,7 +3183,7 @@ fn4_h:                                  # @fn4_h
 	.type	fn5_h,@function
 fn5_h:                                  # @fn5_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3250,19 +3202,18 @@ fn5_h:                                  # @fn5_h
 fn6_h:                                  # @fn6_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1088
-	i32.div_u	$push4=, $pop8, $pop3
+	i32.div_u	$push4=, $1, $pop3
 	i32.const	$push5=, 6
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end158:
@@ -3274,7 +3225,7 @@ fn6_h:                                  # @fn6_h
 	.type	fn7_h,@function
 fn7_h:                                  # @fn7_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load16_u	$push1=, d($pop4)
@@ -3292,7 +3243,7 @@ fn7_h:                                  # @fn7_h
 	.type	fn8_h,@function
 fn8_h:                                  # @fn8_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+2($pop4)
@@ -3310,7 +3261,7 @@ fn8_h:                                  # @fn8_h
 	.type	fn9_h,@function
 fn9_h:                                  # @fn9_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3329,19 +3280,18 @@ fn9_h:                                  # @fn9_h
 fn1_i:                                  # @fn1_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end162:
@@ -3354,13 +3304,12 @@ fn1_i:                                  # @fn1_i
 fn2_i:                                  # @fn2_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, b($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load	$1=, b($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop12, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 19
@@ -3370,7 +3319,7 @@ fn2_i:                                  # @fn2_i
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push10=, $pop9, $pop2
-	i32.store	b($pop0), $pop10
+	i32.store	b($pop12), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end163:
@@ -3383,13 +3332,12 @@ fn2_i:                                  # @fn2_i
 fn3_i:                                  # @fn3_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, b($pop12)
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$1=, b($pop0)
+	i32.const	$push10=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop10, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push9=, 17
@@ -3397,7 +3345,7 @@ fn3_i:                                  # @fn3_i
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop10), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end164:
@@ -3410,19 +3358,18 @@ fn3_i:                                  # @fn3_i
 fn4_i:                                  # @fn4_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end165:
@@ -3434,7 +3381,7 @@ fn4_i:                                  # @fn4_i
 	.type	fn5_i,@function
 fn5_i:                                  # @fn5_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end166:
@@ -3447,13 +3394,12 @@ fn5_i:                                  # @fn5_i
 fn6_i:                                  # @fn6_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, c($pop12)
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$1=, c($pop0)
+	i32.const	$push10=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop10, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push9=, 6
@@ -3461,7 +3407,7 @@ fn6_i:                                  # @fn6_i
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop10), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end167:
@@ -3473,7 +3419,7 @@ fn6_i:                                  # @fn6_i
 	.type	fn7_i,@function
 fn7_i:                                  # @fn7_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load16_u	$push1=, d($pop4)
@@ -3491,7 +3437,7 @@ fn7_i:                                  # @fn7_i
 	.type	fn8_i,@function
 fn8_i:                                  # @fn8_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+2($pop4)
@@ -3509,7 +3455,7 @@ fn8_i:                                  # @fn8_i
 	.type	fn9_i,@function
 fn9_i:                                  # @fn9_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+3($pop4)
@@ -3527,7 +3473,7 @@ fn9_i:                                  # @fn9_i
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end1610
+# %bb.0:                                # %if.end1610
 	i32.const	$push1=, 0
 	i32.const	$push0=, -2147483595
 	i32.store	c($pop1), $pop0
@@ -3571,4 +3517,4 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040703-1.c.s b/test/torture-s/20040703-1.c.s
index f0f95910c..2654f8d65 100644
--- a/test/torture-s/20040703-1.c.s
+++ b/test/torture-s/20040703-1.c.s
@@ -6,12 +6,8 @@
 	.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	$push94=, 0
-	i32.load	$push93=, __stack_pointer($pop94)
-	i32.const	$push95=, 16
-	i32.sub 	$12=, $pop93, $pop95
+	.local  	i32, i32, i64, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -21,57 +17,53 @@ num_lshift:                             # @num_lshift
 	block   	
 	i32.ge_u	$push0=, $3, $2
 	br_if   	0, $pop0        # 0: down to label6
-# BB#1:                                 # %if.else
-	i32.load	$push103=, 4($1)
-	tee_local	$push102=, $5=, $pop103
-	copy_local	$7=, $pop102
-	i32.load	$push101=, 0($1)
-	tee_local	$push100=, $4=, $pop101
-	copy_local	$9=, $pop100
-	copy_local	$8=, $3
+# %bb.1:                                # %if.else
+	i32.load	$5=, 4($1)
+	i32.load	$4=, 0($1)
+	copy_local	$8=, $5
+	copy_local	$11=, $4
+	copy_local	$9=, $3
 	block   	
 	i32.const	$push9=, 32
 	i32.lt_u	$push10=, $3, $pop9
 	br_if   	0, $pop10       # 0: down to label7
-# BB#2:                                 # %if.then5
+# %bb.2:                                # %if.then5
 	i32.store	0($1), $5
-	i32.const	$7=, 0
+	i32.const	$8=, 0
 	i32.const	$push11=, 4
 	i32.add 	$push12=, $1, $pop11
-	i32.const	$push104=, 0
-	i32.store	0($pop12), $pop104
+	i32.const	$push97=, 0
+	i32.store	0($pop12), $pop97
 	i32.const	$push13=, -32
-	i32.add 	$8=, $3, $pop13
-	copy_local	$9=, $5
+	i32.add 	$9=, $3, $pop13
+	copy_local	$11=, $5
 .LBB0_3:                                # %if.end
 	end_block                       # label7:
-	i32.eqz 	$push125=, $8
-	br_if   	1, $pop125      # 1: down to label5
-# BB#4:                                 # %if.then10
+	i32.eqz 	$push102=, $9
+	br_if   	1, $pop102      # 1: down to label5
+# %bb.4:                                # %if.then10
+	i32.shl 	$10=, $8, $9
 	i32.const	$push14=, 4
 	i32.add 	$push15=, $1, $pop14
-	i32.shl 	$push108=, $7, $8
-	tee_local	$push107=, $10=, $pop108
-	i32.store	0($pop15), $pop107
+	i32.store	0($pop15), $10
 	i32.const	$push17=, 32
-	i32.sub 	$push18=, $pop17, $8
-	i32.shr_u	$push19=, $7, $pop18
-	i32.shl 	$push16=, $9, $8
-	i32.or  	$push106=, $pop19, $pop16
-	tee_local	$push105=, $9=, $pop106
-	i32.store	0($1), $pop105
+	i32.sub 	$push18=, $pop17, $9
+	i32.shr_u	$push19=, $8, $pop18
+	i32.shl 	$push16=, $11, $9
+	i32.or  	$11=, $pop19, $pop16
+	i32.store	0($1), $11
 	br      	2               # 2: down to label4
 .LBB0_5:                                # %if.then
 	end_block                       # label6:
 	i32.load	$push1=, 8($1)
-	i32.eqz 	$push126=, $pop1
-	br_if   	2, $pop126      # 2: down to label3
-# BB#6:                                 # %if.then.land.end_crit_edge
+	i32.eqz 	$push103=, $pop1
+	br_if   	2, $pop103      # 2: down to label3
+# %bb.6:                                # %if.then.land.end_crit_edge
 	i32.const	$2=, 0
 	br      	3               # 3: down to label2
 .LBB0_7:
 	end_block                       # label5:
-	copy_local	$10=, $7
+	copy_local	$10=, $8
 .LBB0_8:                                # %if.end18
 	end_block                       # label4:
 	i32.const	$push22=, 8
@@ -82,27 +74,26 @@ num_lshift:                             # @num_lshift
 	i32.const	$push20=, 33
 	i32.lt_u	$push21=, $2, $pop20
 	br_if   	0, $pop21       # 0: down to label9
-# BB#9:                                 # %if.then.i
+# %bb.9:                                # %if.then.i
 	i32.const	$push30=, -32
-	i32.add 	$push110=, $2, $pop30
-	tee_local	$push109=, $8=, $pop110
+	i32.add 	$9=, $2, $pop30
 	i32.const	$push31=, 31
-	i32.gt_u	$push32=, $pop109, $pop31
+	i32.gt_u	$push32=, $9, $pop31
 	br_if   	1, $pop32       # 1: down to label8
-# BB#10:                                # %if.then2.i
+# %bb.10:                               # %if.then2.i
 	i32.const	$push33=, 1
-	i32.shl 	$push34=, $pop33, $8
+	i32.shl 	$push34=, $pop33, $9
 	i32.const	$push35=, -1
 	i32.add 	$push36=, $pop34, $pop35
-	i32.and 	$9=, $9, $pop36
+	i32.and 	$11=, $11, $pop36
 	br      	1               # 1: down to label8
 .LBB0_11:                               # %if.else.i
 	end_block                       # label9:
-	i32.const	$9=, 0
+	i32.const	$11=, 0
 	i32.const	$push24=, 32
 	i32.eq  	$push25=, $2, $pop24
 	br_if   	0, $pop25       # 0: down to label8
-# BB#12:                                # %if.then5.i
+# %bb.12:                               # %if.then5.i
 	i32.const	$push26=, 1
 	i32.shl 	$push27=, $pop26, $2
 	i32.const	$push28=, -1
@@ -110,16 +101,18 @@ num_lshift:                             # @num_lshift
 	i32.and 	$10=, $10, $pop29
 .LBB0_13:                               # %num_trim.exit
 	end_block                       # label8:
-	i32.store	0($1), $9
+	i32.store	0($1), $11
 	i32.const	$push37=, 4
 	i32.add 	$push38=, $1, $pop37
 	i32.store	0($pop38), $10
 	i32.wrap/i64	$push39=, $6
-	i32.eqz 	$push127=, $pop39
-	br_if   	2, $pop127      # 2: down to label1
-# BB#14:                                # %if.then21
-	i32.const	$push40=, 0
-	i32.store	12($1), $pop40
+	i32.eqz 	$push104=, $pop39
+	br_if   	2, $pop104      # 2: down to label1
+# %bb.14:                               # %if.then21
+	i32.const	$push40=, 12
+	i32.add 	$push41=, $1, $pop40
+	i32.const	$push42=, 0
+	i32.store	0($pop41), $pop42
 	br      	3               # 3: down to label0
 .LBB0_15:                               # %land.rhs
 	end_block                       # label3:
@@ -136,145 +129,129 @@ num_lshift:                             # @num_lshift
 	i64.const	$push8=, 0
 	i64.store	0($1):p2align=2, $pop8
 	br      	1               # 1: down to label0
-.LBB0_17:                               # %if.else3.i
+.LBB0_17:                               # %if.else23
 	end_block                       # label1:
-	i32.store	8($12), $9
-	i32.store	4($12), $10
-	i32.const	$push43=, -1
-	i32.const	$push50=, 0
-	i32.const	$push41=, 32
-	i32.gt_u	$push113=, $2, $pop41
-	tee_local	$push112=, $8=, $pop113
-	i32.select	$push42=, $9, $10, $pop112
-	i32.const	$push47=, 1
-	i32.const	$push44=, -33
-	i32.const	$push111=, -1
-	i32.select	$push45=, $pop44, $pop111, $8
-	i32.add 	$push46=, $pop45, $2
-	i32.shl 	$push48=, $pop47, $pop46
-	i32.and 	$push49=, $pop42, $pop48
-	i32.select	$8=, $pop43, $pop50, $pop49
 	block   	
 	block   	
 	block   	
-	i32.const	$push51=, 31
-	i32.gt_u	$push52=, $2, $pop51
-	br_if   	0, $pop52       # 0: down to label12
-# BB#18:                                # %if.then5.i61
-	i32.store	8($12), $8
-	i32.const	$push96=, 4
-	i32.add 	$push97=, $12, $pop96
-	copy_local	$7=, $pop97
-	copy_local	$11=, $2
-	br      	1               # 1: down to label11
-.LBB0_19:                               # %if.else8.i
+	block   	
+	i32.const	$push98=, 32
+	i32.le_u	$push43=, $2, $pop98
+	br_if   	0, $pop43       # 0: down to label13
+# %bb.18:                               # %if.else8.i
+	i32.const	$push58=, -1
+	i32.const	$push57=, 0
+	i32.const	$push54=, 1
+	i32.const	$push52=, -33
+	i32.add 	$push53=, $2, $pop52
+	i32.shl 	$push55=, $pop54, $pop53
+	i32.and 	$push56=, $11, $pop55
+	i32.select	$8=, $pop58, $pop57, $pop56
+	i32.const	$push59=, 63
+	i32.le_u	$push60=, $2, $pop59
+	br_if   	1, $pop60       # 1: down to label12
+	br      	3               # 3: down to label10
+.LBB0_19:                               # %if.else3.i
+	end_block                       # label13:
+	i32.const	$push44=, -1
+	i32.const	$push49=, 0
+	i32.const	$push46=, 1
+	i32.const	$push100=, -1
+	i32.add 	$push45=, $2, $pop100
+	i32.shl 	$push47=, $pop46, $pop45
+	i32.and 	$push48=, $10, $pop47
+	i32.select	$8=, $pop44, $pop49, $pop48
+	i32.const	$push99=, 32
+	i32.ne  	$push50=, $2, $pop99
+	br_if   	1, $pop50       # 1: down to label11
+.LBB0_20:                               # %if.then10.i
 	end_block                       # label12:
-	i32.const	$push53=, 63
-	i32.gt_u	$push54=, $2, $pop53
-	br_if   	1, $pop54       # 1: down to label10
-# BB#20:                                # %if.then10.i
-	i32.const	$push55=, -32
-	i32.add 	$11=, $2, $pop55
-	i32.const	$push98=, 8
-	i32.add 	$push99=, $12, $pop98
-	copy_local	$7=, $pop99
-	copy_local	$10=, $9
-.LBB0_21:                               # %if.end15.sink.split.i
+	i32.const	$push61=, -32
+	i32.add 	$push62=, $2, $pop61
+	i32.shl 	$push63=, $8, $pop62
+	i32.or  	$11=, $pop63, $11
+	br      	1               # 1: down to label10
+.LBB0_21:                               # %if.then5.i64
 	end_block                       # label11:
-	i32.shl 	$push56=, $8, $11
-	i32.or  	$push57=, $10, $pop56
-	i32.store	0($7), $pop57
+	i32.shl 	$push51=, $8, $2
+	i32.or  	$10=, $pop51, $10
+	copy_local	$11=, $8
 .LBB0_22:                               # %if.end15.i
 	end_block                       # label10:
-	block   	
-	i32.const	$push58=, 32
-	i32.lt_u	$push59=, $3, $pop58
-	br_if   	0, $pop59       # 0: down to label13
-# BB#23:                                # %if.then17.i
-	i32.load	$push60=, 8($12)
-	i32.store	4($12), $pop60
-	i32.store	8($12), $8
-	i32.const	$push61=, -32
-	i32.add 	$3=, $3, $pop61
-.LBB0_24:                               # %if.end22.i
-	end_block                       # label13:
+	i32.const	$push64=, 31
+	i32.gt_u	$9=, $3, $pop64
+	i32.const	$push65=, -32
+	i32.add 	$push66=, $3, $pop65
+	i32.select	$3=, $pop66, $3, $9
+	i32.select	$7=, $8, $11, $9
+	i32.select	$11=, $11, $10, $9
 	block   	
 	block   	
-	i32.eqz 	$push128=, $3
-	br_if   	0, $pop128      # 0: down to label15
-# BB#25:                                # %if.end38.sink.split.i
-	i32.load	$push121=, 8($12)
-	tee_local	$push120=, $10=, $pop121
-	i32.const	$push64=, 32
-	i32.sub 	$push119=, $pop64, $3
-	tee_local	$push118=, $7=, $pop119
-	i32.shl 	$push65=, $pop120, $pop118
-	i32.load	$push62=, 4($12)
-	i32.shr_u	$push63=, $pop62, $3
-	i32.or  	$push117=, $pop65, $pop63
-	tee_local	$push116=, $9=, $pop117
-	i32.store	4($12), $pop116
-	i32.shr_u	$push66=, $10, $3
-	i32.shl 	$push67=, $8, $7
-	i32.or  	$push115=, $pop66, $pop67
-	tee_local	$push114=, $3=, $pop115
-	i32.store	8($12), $pop114
+	i32.eqz 	$push105=, $3
+	br_if   	0, $pop105      # 0: down to label15
+# %bb.23:                               # %if.then24.i
+	i32.const	$push68=, 32
+	i32.sub 	$10=, $pop68, $3
+	i32.shr_u	$push67=, $7, $3
+	i32.shl 	$push69=, $8, $10
+	i32.or  	$9=, $pop67, $pop69
+	i32.shl 	$push71=, $7, $10
+	i32.shr_u	$push70=, $11, $3
+	i32.or  	$11=, $pop71, $pop70
 	br      	1               # 1: down to label14
-.LBB0_26:                               # %if.end22.if.end38_crit_edge.i
+.LBB0_24:
 	end_block                       # label15:
-	i32.load	$9=, 4($12)
-	i32.load	$3=, 8($12)
-.LBB0_27:                               # %if.end38.i
+	copy_local	$9=, $7
+.LBB0_25:                               # %if.end38.i
 	end_block                       # label14:
 	block   	
 	block   	
-	i32.const	$push68=, 33
-	i32.lt_u	$push69=, $2, $pop68
-	br_if   	0, $pop69       # 0: down to label17
-# BB#28:                                # %if.then.i.i
-	i32.const	$push76=, -32
-	i32.add 	$push123=, $2, $pop76
-	tee_local	$push122=, $2=, $pop123
-	i32.const	$push77=, 31
-	i32.gt_u	$push78=, $pop122, $pop77
-	br_if   	1, $pop78       # 1: down to label16
-# BB#29:                                # %if.then2.i.i
-	i32.const	$push79=, 1
-	i32.shl 	$push80=, $pop79, $2
-	i32.const	$push81=, -1
-	i32.add 	$push82=, $pop80, $pop81
-	i32.and 	$3=, $3, $pop82
+	i32.const	$push72=, 33
+	i32.lt_u	$push73=, $2, $pop72
+	br_if   	0, $pop73       # 0: down to label17
+# %bb.26:                               # %if.then.i61.i
+	i32.const	$push80=, -32
+	i32.add 	$2=, $2, $pop80
+	i32.const	$push81=, 31
+	i32.gt_u	$push82=, $2, $pop81
+	br_if   	1, $pop82       # 1: down to label16
+# %bb.27:                               # %if.then2.i.i
+	i32.const	$push83=, 1
+	i32.shl 	$push84=, $pop83, $2
+	i32.const	$push85=, -1
+	i32.add 	$push86=, $pop84, $pop85
+	i32.and 	$9=, $9, $pop86
 	br      	1               # 1: down to label16
-.LBB0_30:                               # %if.else.i.i
+.LBB0_28:                               # %if.else.i.i
 	end_block                       # label17:
-	i32.const	$3=, 0
-	i32.const	$push70=, 32
-	i32.eq  	$push71=, $2, $pop70
-	br_if   	0, $pop71       # 0: down to label16
-# BB#31:                                # %if.then5.i.i
-	i32.const	$push72=, 1
-	i32.shl 	$push73=, $pop72, $2
-	i32.const	$push74=, -1
-	i32.add 	$push75=, $pop73, $pop74
-	i32.and 	$9=, $9, $pop75
-.LBB0_32:                               # %num_rshift.exit
+	i32.const	$9=, 0
+	i32.const	$push74=, 32
+	i32.eq  	$push75=, $2, $pop74
+	br_if   	0, $pop75       # 0: down to label16
+# %bb.29:                               # %if.then5.i.i
+	i32.const	$push76=, 1
+	i32.shl 	$push77=, $pop76, $2
+	i32.const	$push78=, -1
+	i32.add 	$push79=, $pop77, $pop78
+	i32.and 	$11=, $11, $pop79
+.LBB0_30:                               # %num_rshift.exit
 	end_block                       # label16:
-	i32.const	$push86=, 12
-	i32.add 	$push87=, $1, $pop86
-	i32.ne  	$push84=, $5, $9
-	i32.ne  	$push83=, $4, $3
-	i32.or  	$push85=, $pop84, $pop83
-	i32.store	0($pop87), $pop85
-.LBB0_33:                               # %if.end36
+	i32.const	$push90=, 12
+	i32.add 	$push91=, $1, $pop90
+	i32.ne  	$push88=, $5, $11
+	i32.ne  	$push87=, $4, $9
+	i32.or  	$push89=, $pop88, $pop87
+	i32.store	0($pop91), $pop89
+.LBB0_31:                               # %if.end36
 	end_block                       # label0:
-	i64.load	$push88=, 0($1):p2align=2
-	i64.store	0($0):p2align=2, $pop88
-	i32.const	$push89=, 8
-	i32.add 	$push90=, $0, $pop89
-	i32.const	$push124=, 8
-	i32.add 	$push91=, $1, $pop124
-	i64.load	$push92=, 0($pop91):p2align=2
-	i64.store	0($pop90):p2align=2, $pop92
+	i64.load	$push92=, 0($1):p2align=2
+	i64.store	0($0):p2align=2, $pop92
+	i32.const	$push93=, 8
+	i32.add 	$push94=, $0, $pop93
+	i32.const	$push101=, 8
+	i32.add 	$push95=, $1, $pop101
+	i64.load	$push96=, 0($pop95):p2align=2
+	i64.store	0($pop94):p2align=2, $pop96
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -286,45 +263,92 @@ num_lshift:                             # @num_lshift
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	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
-	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
+	.local  	i32, i32, i32, i32, i32, i32, i64, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push27=, 0
+	i32.load	$0=, n($pop27)
+	block   	
+	i32.const	$push0=, 63
+	i32.gt_u	$push1=, $0, $pop0
+	br_if   	0, $pop1        # 0: down to label18
+# %bb.1:                                # %if.else.i
+	i32.const	$push31=, 0
+	i64.load32_u	$6=, num+8($pop31)
+	i32.const	$push30=, 0
+	i32.load	$2=, num+4($pop30)
+	i32.const	$push29=, 0
+	i32.load	$1=, num($pop29)
+	i32.const	$push2=, 31
+	i32.gt_u	$7=, $0, $pop2
+	i32.const	$push3=, -32
+	i32.add 	$push4=, $0, $pop3
+	i32.select	$3=, $pop4, $0, $7
+	i32.select	$9=, $2, $1, $7
+	i32.const	$push28=, 0
+	i32.select	$7=, $pop28, $2, $7
+	block   	
+	i32.eqz 	$push33=, $3
+	br_if   	0, $pop33       # 0: down to label19
+# %bb.2:                                # %if.then10.i
+	i32.const	$push6=, 32
+	i32.sub 	$push7=, $pop6, $3
+	i32.shr_u	$push8=, $7, $pop7
+	i32.shl 	$push5=, $9, $3
+	i32.or  	$9=, $pop8, $pop5
+	i32.shl 	$7=, $7, $3
+.LBB1_3:                                # %if.end18.i
+	end_block                       # label19:
+	block   	
+	i32.wrap/i64	$push9=, $6
+	br_if   	0, $pop9        # 0: down to label20
+# %bb.4:                                # %if.else23.i
+	i32.const	$push10=, 31
+	i32.gt_u	$0=, $0, $pop10
+	i32.const	$push32=, 31
+	i32.shr_s	$4=, $9, $pop32
+	i32.select	$5=, $4, $9, $0
+	i32.select	$0=, $9, $7, $0
+	block   	
 	block   	
-	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	$push10=, 16($0)
-	br_if   	0, $pop10       # 0: down to label18
-# BB#2:                                 # %if.end3
-	i32.load	$push11=, 28($0)
-	br_if   	0, $pop11       # 0: down to label18
-# BB#3:                                 # %if.end6
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
+	br_if   	0, $3           # 0: down to label22
+# %bb.5:
+	copy_local	$4=, $5
+	br      	1               # 1: down to label21
+.LBB1_6:                                # %if.then24.i.i
+	end_block                       # label22:
+	i32.const	$push12=, 32
+	i32.sub 	$8=, $pop12, $3
+	i32.shr_u	$push11=, $5, $3
+	i32.shl 	$push13=, $4, $8
+	i32.or  	$4=, $pop11, $pop13
+	i32.shl 	$push15=, $5, $8
+	i32.shr_u	$push14=, $0, $3
+	i32.or  	$0=, $pop15, $pop14
+.LBB1_7:                                # %if.end38.i.i
+	end_block                       # label21:
+	i32.ne  	$push17=, $2, $0
+	i32.ne  	$push16=, $1, $4
+	i32.or  	$push18=, $pop17, $pop16
+	i64.extend_u/i32	$push19=, $pop18
+	i64.const	$push20=, 32
+	i64.shl 	$push21=, $pop19, $pop20
+	i64.or  	$6=, $pop21, $6
+.LBB1_8:                                # %num_lshift.exit
+	end_block                       # label20:
+	i32.const	$push22=, 196608
+	i32.ne  	$push23=, $7, $pop22
+	br_if   	0, $pop23       # 0: down to label18
+# %bb.9:                                # %if.end
+	br_if   	0, $9           # 0: down to label18
+# %bb.10:                               # %if.end3
+	i64.const	$push24=, 4294967296
+	i64.ge_u	$push25=, $6, $pop24
+	br_if   	0, $pop25       # 0: down to label18
+# %bb.11:                               # %if.end6
+	i32.const	$push26=, 0
+	call    	exit@FUNCTION, $pop26
 	unreachable
-.LBB1_4:                                # %if.then
+.LBB1_12:                               # %if.then
 	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
@@ -363,6 +387,6 @@ num:
 	.size	num, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2e782ad27..184c1fc3b 100644
--- a/test/torture-s/20040704-1.c.s
+++ b/test/torture-s/20040704-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040705-1.c.s b/test/torture-s/20040705-1.c.s
index 2ca53549b..f21678a41 100644
--- a/test/torture-s/20040705-1.c.s
+++ b/test/torture-s/20040705-1.c.s
@@ -6,7 +6,7 @@
 	.type	ret1,@function
 ret1:                                   # @ret1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b+8($pop0)
 	i32.const	$push2=, 63
@@ -22,7 +22,7 @@ ret1:                                   # @ret1
 	.type	ret2,@function
 ret2:                                   # @ret2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b+8($pop0)
 	i32.const	$push2=, 6
@@ -40,7 +40,7 @@ ret2:                                   # @ret2
 	.type	ret3,@function
 ret3:                                   # @ret3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b+8($pop0)
 	i32.const	$push2=, 17
@@ -56,7 +56,7 @@ ret3:                                   # @ret3
 	.type	ret4,@function
 ret4:                                   # @ret4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c+8($pop0)
 	i32.const	$push2=, 31
@@ -72,7 +72,7 @@ ret4:                                   # @ret4
 	.type	ret5,@function
 ret5:                                   # @ret5
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c+8($pop0)
 	i32.const	$push2=, 5
@@ -90,7 +90,7 @@ ret5:                                   # @ret5
 	.type	ret6,@function
 ret6:                                   # @ret6
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c+8($pop0)
 	i32.const	$push2=, 6
@@ -106,7 +106,7 @@ ret6:                                   # @ret6
 	.type	ret7,@function
 ret7:                                   # @ret7
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, d+8($pop0)
                                         # fallthrough-return: $pop1
@@ -120,7 +120,7 @@ ret7:                                   # @ret7
 	.type	ret8,@function
 ret8:                                   # @ret8
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, d+10($pop0)
                                         # fallthrough-return: $pop1
@@ -134,7 +134,7 @@ ret8:                                   # @ret8
 	.type	ret9,@function
 ret9:                                   # @ret9
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, d+11($pop0)
                                         # fallthrough-return: $pop1
@@ -149,18 +149,17 @@ ret9:                                   # @ret9
 fn1_1:                                  # @fn1_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b+8($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.add 	$push3=, $pop7, $0
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push7=, 0
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
@@ -173,20 +172,19 @@ fn1_1:                                  # @fn1_1
 fn2_1:                                  # @fn2_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.add 	$push5=, $pop9, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.const	$push6=, 131008
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b+8($pop0), $pop8
+	i32.store	b+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
@@ -198,7 +196,7 @@ fn2_1:                                  # @fn2_1
 	.type	fn3_1,@function
 fn3_1:                                  # @fn3_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b+8($pop5)
@@ -218,18 +216,17 @@ fn3_1:                                  # @fn3_1
 fn4_1:                                  # @fn4_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c+8($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.add 	$push3=, $pop7, $0
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push7=, 0
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 31
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c+8($pop0), $pop6
+	i32.store	c+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
@@ -242,20 +239,19 @@ fn4_1:                                  # @fn4_1
 fn5_1:                                  # @fn5_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 5
 	i32.shl 	$push4=, $0, $pop3
-	i32.add 	$push5=, $pop9, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.const	$push6=, 32
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c+8($pop0), $pop8
+	i32.store	c+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end13:
@@ -267,7 +263,7 @@ fn5_1:                                  # @fn5_1
 	.type	fn6_1,@function
 fn6_1:                                  # @fn6_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c+8($pop5)
@@ -286,7 +282,7 @@ fn6_1:                                  # @fn6_1
 	.type	fn7_1,@function
 fn7_1:                                  # @fn7_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, d+8($pop3)
@@ -303,7 +299,7 @@ fn7_1:                                  # @fn7_1
 	.type	fn8_1,@function
 fn8_1:                                  # @fn8_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d+8($pop7)
@@ -324,7 +320,7 @@ fn8_1:                                  # @fn8_1
 	.type	fn9_1,@function
 fn9_1:                                  # @fn9_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d+8($pop5)
@@ -344,19 +340,18 @@ fn9_1:                                  # @fn9_1
 fn1_2:                                  # @fn1_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end18:
@@ -369,19 +364,18 @@ fn1_2:                                  # @fn1_2
 fn2_2:                                  # @fn2_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 64
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end19:
@@ -393,7 +387,7 @@ fn2_2:                                  # @fn2_2
 	.type	fn3_2,@function
 fn3_2:                                  # @fn3_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -412,19 +406,18 @@ fn3_2:                                  # @fn3_2
 fn4_2:                                  # @fn4_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end21:
@@ -436,7 +429,7 @@ fn4_2:                                  # @fn4_2
 	.type	fn5_2,@function
 fn5_2:                                  # @fn5_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -454,7 +447,7 @@ fn5_2:                                  # @fn5_2
 	.type	fn6_2,@function
 fn6_2:                                  # @fn6_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -472,7 +465,7 @@ fn6_2:                                  # @fn6_2
 	.type	fn7_2,@function
 fn7_2:                                  # @fn7_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -490,7 +483,7 @@ fn7_2:                                  # @fn7_2
 	.type	fn8_2,@function
 fn8_2:                                  # @fn8_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d+8($pop6)
@@ -510,7 +503,7 @@ fn8_2:                                  # @fn8_2
 	.type	fn9_2,@function
 fn9_2:                                  # @fn9_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -529,19 +522,18 @@ fn9_2:                                  # @fn9_2
 fn1_3:                                  # @fn1_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end27:
@@ -554,19 +546,18 @@ fn1_3:                                  # @fn1_3
 fn2_3:                                  # @fn2_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 64
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end28:
@@ -578,7 +569,7 @@ fn2_3:                                  # @fn2_3
 	.type	fn3_3,@function
 fn3_3:                                  # @fn3_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -597,19 +588,18 @@ fn3_3:                                  # @fn3_3
 fn4_3:                                  # @fn4_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end30:
@@ -621,7 +611,7 @@ fn4_3:                                  # @fn4_3
 	.type	fn5_3,@function
 fn5_3:                                  # @fn5_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -639,7 +629,7 @@ fn5_3:                                  # @fn5_3
 	.type	fn6_3,@function
 fn6_3:                                  # @fn6_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -657,7 +647,7 @@ fn6_3:                                  # @fn6_3
 	.type	fn7_3,@function
 fn7_3:                                  # @fn7_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -675,7 +665,7 @@ fn7_3:                                  # @fn7_3
 	.type	fn8_3,@function
 fn8_3:                                  # @fn8_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d+8($pop6)
@@ -695,7 +685,7 @@ fn8_3:                                  # @fn8_3
 	.type	fn9_3,@function
 fn9_3:                                  # @fn9_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -714,18 +704,17 @@ fn9_3:                                  # @fn9_3
 fn1_4:                                  # @fn1_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b+8($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.sub 	$push3=, $pop7, $0
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push7=, 0
+	i32.sub 	$push3=, $1, $0
 	i32.const	$push4=, 63
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end36:
@@ -738,20 +727,19 @@ fn1_4:                                  # @fn1_4
 fn2_4:                                  # @fn2_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, 131008
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b+8($pop0), $pop8
+	i32.store	b+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end37:
@@ -764,20 +752,19 @@ fn2_4:                                  # @fn2_4
 fn3_4:                                  # @fn3_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, -131072
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b+8($pop0), $pop8
+	i32.store	b+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end38:
@@ -790,18 +777,17 @@ fn3_4:                                  # @fn3_4
 fn4_4:                                  # @fn4_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c+8($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.sub 	$push3=, $pop7, $0
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push7=, 0
+	i32.sub 	$push3=, $1, $0
 	i32.const	$push4=, 31
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c+8($pop0), $pop6
+	i32.store	c+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end39:
@@ -814,20 +800,19 @@ fn4_4:                                  # @fn4_4
 fn5_4:                                  # @fn5_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 5
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, 32
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c+8($pop0), $pop8
+	i32.store	c+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end40:
@@ -840,20 +825,19 @@ fn5_4:                                  # @fn5_4
 fn6_4:                                  # @fn6_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, -64
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c+8($pop0), $pop8
+	i32.store	c+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end41:
@@ -865,7 +849,7 @@ fn6_4:                                  # @fn6_4
 	.type	fn7_4,@function
 fn7_4:                                  # @fn7_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, d+8($pop3)
@@ -882,7 +866,7 @@ fn7_4:                                  # @fn7_4
 	.type	fn8_4,@function
 fn8_4:                                  # @fn8_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d+8($pop7)
@@ -903,7 +887,7 @@ fn8_4:                                  # @fn8_4
 	.type	fn9_4,@function
 fn9_4:                                  # @fn9_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d+8($pop7)
@@ -925,19 +909,18 @@ fn9_4:                                  # @fn9_4
 fn1_5:                                  # @fn1_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 63
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end45:
@@ -950,19 +933,18 @@ fn1_5:                                  # @fn1_5
 fn2_5:                                  # @fn2_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 131008
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 131008
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end46:
@@ -974,7 +956,7 @@ fn2_5:                                  # @fn2_5
 	.type	fn3_5,@function
 fn3_5:                                  # @fn3_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -993,19 +975,18 @@ fn3_5:                                  # @fn3_5
 fn4_5:                                  # @fn4_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 31
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c+8($pop0), $pop6
+	i32.store	c+8($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end48:
@@ -1017,7 +998,7 @@ fn4_5:                                  # @fn4_5
 	.type	fn5_5,@function
 fn5_5:                                  # @fn5_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -1035,7 +1016,7 @@ fn5_5:                                  # @fn5_5
 	.type	fn6_5,@function
 fn6_5:                                  # @fn6_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -1053,7 +1034,7 @@ fn6_5:                                  # @fn6_5
 	.type	fn7_5,@function
 fn7_5:                                  # @fn7_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -1071,7 +1052,7 @@ fn7_5:                                  # @fn7_5
 	.type	fn8_5,@function
 fn8_5:                                  # @fn8_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d+8($pop6)
@@ -1091,7 +1072,7 @@ fn8_5:                                  # @fn8_5
 	.type	fn9_5,@function
 fn9_5:                                  # @fn9_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -1110,19 +1091,18 @@ fn9_5:                                  # @fn9_5
 fn1_6:                                  # @fn1_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 63
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end54:
@@ -1135,19 +1115,18 @@ fn1_6:                                  # @fn1_6
 fn2_6:                                  # @fn2_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 131008
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 131008
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end55:
@@ -1159,7 +1138,7 @@ fn2_6:                                  # @fn2_6
 	.type	fn3_6,@function
 fn3_6:                                  # @fn3_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -1178,19 +1157,18 @@ fn3_6:                                  # @fn3_6
 fn4_6:                                  # @fn4_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 31
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c+8($pop0), $pop6
+	i32.store	c+8($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end57:
@@ -1202,7 +1180,7 @@ fn4_6:                                  # @fn4_6
 	.type	fn5_6,@function
 fn5_6:                                  # @fn5_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -1220,7 +1198,7 @@ fn5_6:                                  # @fn5_6
 	.type	fn6_6,@function
 fn6_6:                                  # @fn6_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -1238,7 +1216,7 @@ fn6_6:                                  # @fn6_6
 	.type	fn7_6,@function
 fn7_6:                                  # @fn7_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -1256,7 +1234,7 @@ fn7_6:                                  # @fn7_6
 	.type	fn8_6,@function
 fn8_6:                                  # @fn8_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d+8($pop6)
@@ -1276,7 +1254,7 @@ fn8_6:                                  # @fn8_6
 	.type	fn9_6,@function
 fn9_6:                                  # @fn9_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -1294,7 +1272,7 @@ fn9_6:                                  # @fn9_6
 	.type	fn1_7,@function
 fn1_7:                                  # @fn1_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -64
 	i32.or  	$push1=, $0, $pop0
@@ -1313,7 +1291,7 @@ fn1_7:                                  # @fn1_7
 	.type	fn2_7,@function
 fn2_7:                                  # @fn2_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
@@ -1334,7 +1312,7 @@ fn2_7:                                  # @fn2_7
 	.type	fn3_7,@function
 fn3_7:                                  # @fn3_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b+8($pop7)
@@ -1355,7 +1333,7 @@ fn3_7:                                  # @fn3_7
 	.type	fn4_7,@function
 fn4_7:                                  # @fn4_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -32
 	i32.or  	$push1=, $0, $pop0
@@ -1374,7 +1352,7 @@ fn4_7:                                  # @fn4_7
 	.type	fn5_7,@function
 fn5_7:                                  # @fn5_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
@@ -1395,7 +1373,7 @@ fn5_7:                                  # @fn5_7
 	.type	fn6_7,@function
 fn6_7:                                  # @fn6_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c+8($pop7)
@@ -1416,7 +1394,7 @@ fn6_7:                                  # @fn6_7
 	.type	fn7_7,@function
 fn7_7:                                  # @fn7_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -65536
 	i32.or  	$push1=, $0, $pop0
@@ -1435,7 +1413,7 @@ fn7_7:                                  # @fn7_7
 	.type	fn8_7,@function
 fn8_7:                                  # @fn8_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
@@ -1456,7 +1434,7 @@ fn8_7:                                  # @fn8_7
 	.type	fn9_7,@function
 fn9_7:                                  # @fn9_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d+8($pop7)
@@ -1477,7 +1455,7 @@ fn9_7:                                  # @fn9_7
 	.type	fn1_8,@function
 fn1_8:                                  # @fn1_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b+8($pop5)
@@ -1496,7 +1474,7 @@ fn1_8:                                  # @fn1_8
 	.type	fn2_8,@function
 fn2_8:                                  # @fn2_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b+8($pop7)
@@ -1518,20 +1496,19 @@ fn2_8:                                  # @fn2_8
 fn3_8:                                  # @fn3_8
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -131072
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.or  	$push5=, $pop4, $pop1
 	i32.const	$push6=, 131071
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	b+8($pop2), $pop8
+	i32.store	b+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end74:
@@ -1543,7 +1520,7 @@ fn3_8:                                  # @fn3_8
 	.type	fn4_8,@function
 fn4_8:                                  # @fn4_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c+8($pop5)
@@ -1562,7 +1539,7 @@ fn4_8:                                  # @fn4_8
 	.type	fn5_8,@function
 fn5_8:                                  # @fn5_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c+8($pop7)
@@ -1584,20 +1561,19 @@ fn5_8:                                  # @fn5_8
 fn6_8:                                  # @fn6_8
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -64
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.or  	$push5=, $pop4, $pop1
 	i32.const	$push6=, 63
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	c+8($pop2), $pop8
+	i32.store	c+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end77:
@@ -1609,7 +1585,7 @@ fn6_8:                                  # @fn6_8
 	.type	fn7_8,@function
 fn7_8:                                  # @fn7_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d+8($pop5)
@@ -1628,7 +1604,7 @@ fn7_8:                                  # @fn7_8
 	.type	fn8_8,@function
 fn8_8:                                  # @fn8_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d+8($pop7)
@@ -1649,7 +1625,7 @@ fn8_8:                                  # @fn8_8
 	.type	fn9_8,@function
 fn9_8:                                  # @fn9_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d+8($pop7)
@@ -1670,7 +1646,7 @@ fn9_8:                                  # @fn9_8
 	.type	fn1_9,@function
 fn1_9:                                  # @fn1_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b+8($pop5)
@@ -1689,7 +1665,7 @@ fn1_9:                                  # @fn1_9
 	.type	fn2_9,@function
 fn2_9:                                  # @fn2_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b+8($pop7)
@@ -1711,20 +1687,19 @@ fn2_9:                                  # @fn2_9
 fn3_9:                                  # @fn3_9
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -131072
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.xor 	$push5=, $pop4, $pop1
 	i32.const	$push6=, 131071
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	b+8($pop2), $pop8
+	i32.store	b+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end83:
@@ -1736,7 +1711,7 @@ fn3_9:                                  # @fn3_9
 	.type	fn4_9,@function
 fn4_9:                                  # @fn4_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c+8($pop5)
@@ -1755,7 +1730,7 @@ fn4_9:                                  # @fn4_9
 	.type	fn5_9,@function
 fn5_9:                                  # @fn5_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c+8($pop7)
@@ -1777,20 +1752,19 @@ fn5_9:                                  # @fn5_9
 fn6_9:                                  # @fn6_9
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -64
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.xor 	$push5=, $pop4, $pop1
 	i32.const	$push6=, 63
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	c+8($pop2), $pop8
+	i32.store	c+8($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end86:
@@ -1802,7 +1776,7 @@ fn6_9:                                  # @fn6_9
 	.type	fn7_9,@function
 fn7_9:                                  # @fn7_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d+8($pop5)
@@ -1821,7 +1795,7 @@ fn7_9:                                  # @fn7_9
 	.type	fn8_9,@function
 fn8_9:                                  # @fn8_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d+8($pop7)
@@ -1842,7 +1816,7 @@ fn8_9:                                  # @fn8_9
 	.type	fn9_9,@function
 fn9_9:                                  # @fn9_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d+8($pop7)
@@ -1864,18 +1838,17 @@ fn9_9:                                  # @fn9_9
 fn1_a:                                  # @fn1_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b+8($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push1=, -64
-	i32.and 	$push2=, $pop7, $pop1
+	i32.and 	$push2=, $1, $pop1
 	i32.const	$push3=, 63
 	i32.and 	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.or  	$push6=, $pop2, $pop5
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end90:
@@ -1888,13 +1861,12 @@ fn1_a:                                  # @fn1_a
 fn2_a:                                  # @fn2_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, b+8($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.div_u	$push7=, $pop6, $0
@@ -1903,7 +1875,7 @@ fn2_a:                                  # @fn2_a
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	b+8($pop0), $pop9
+	i32.store	b+8($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end91:
@@ -1916,20 +1888,19 @@ fn2_a:                                  # @fn2_a
 fn3_a:                                  # @fn3_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.const	$push8=, 17
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end92:
@@ -1942,18 +1913,17 @@ fn3_a:                                  # @fn3_a
 fn4_a:                                  # @fn4_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c+8($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push1=, -32
-	i32.and 	$push2=, $pop7, $pop1
+	i32.and 	$push2=, $1, $pop1
 	i32.const	$push3=, 31
 	i32.and 	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.or  	$push6=, $pop2, $pop5
-	i32.store	c+8($pop0), $pop6
+	i32.store	c+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end93:
@@ -1966,13 +1936,12 @@ fn4_a:                                  # @fn4_a
 fn5_a:                                  # @fn5_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, c+8($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
 	i32.div_u	$push7=, $pop6, $0
@@ -1981,7 +1950,7 @@ fn5_a:                                  # @fn5_a
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	c+8($pop0), $pop9
+	i32.store	c+8($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end94:
@@ -1994,20 +1963,19 @@ fn5_a:                                  # @fn5_a
 fn6_a:                                  # @fn6_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.const	$push8=, 6
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end95:
@@ -2019,7 +1987,7 @@ fn6_a:                                  # @fn6_a
 	.type	fn7_a,@function
 fn7_a:                                  # @fn7_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load16_u	$push1=, d+8($pop3)
@@ -2036,7 +2004,7 @@ fn7_a:                                  # @fn7_a
 	.type	fn8_a,@function
 fn8_a:                                  # @fn8_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+10($pop3)
@@ -2053,7 +2021,7 @@ fn8_a:                                  # @fn8_a
 	.type	fn9_a,@function
 fn9_a:                                  # @fn9_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+11($pop3)
@@ -2071,18 +2039,17 @@ fn9_a:                                  # @fn9_a
 fn1_b:                                  # @fn1_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b+8($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop7, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b+8($pop0), $pop6
+	i32.store	b+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end99:
@@ -2095,13 +2062,12 @@ fn1_b:                                  # @fn1_b
 fn2_b:                                  # @fn2_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, b+8($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.rem_u	$push7=, $pop6, $0
@@ -2110,7 +2076,7 @@ fn2_b:                                  # @fn2_b
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	b+8($pop0), $pop9
+	i32.store	b+8($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end100:
@@ -2123,20 +2089,19 @@ fn2_b:                                  # @fn2_b
 fn3_b:                                  # @fn3_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push8=, 17
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end101:
@@ -2149,18 +2114,17 @@ fn3_b:                                  # @fn3_b
 fn4_b:                                  # @fn4_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c+8($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop7, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c+8($pop0), $pop6
+	i32.store	c+8($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end102:
@@ -2173,13 +2137,12 @@ fn4_b:                                  # @fn4_b
 fn5_b:                                  # @fn5_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, c+8($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
 	i32.rem_u	$push7=, $pop6, $0
@@ -2188,7 +2151,7 @@ fn5_b:                                  # @fn5_b
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	c+8($pop0), $pop9
+	i32.store	c+8($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end103:
@@ -2201,20 +2164,19 @@ fn5_b:                                  # @fn5_b
 fn6_b:                                  # @fn6_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c+8($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push8=, 6
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end104:
@@ -2226,7 +2188,7 @@ fn6_b:                                  # @fn6_b
 	.type	fn7_b,@function
 fn7_b:                                  # @fn7_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load16_u	$push1=, d+8($pop3)
@@ -2243,7 +2205,7 @@ fn7_b:                                  # @fn7_b
 	.type	fn8_b,@function
 fn8_b:                                  # @fn8_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+10($pop3)
@@ -2260,7 +2222,7 @@ fn8_b:                                  # @fn8_b
 	.type	fn9_b,@function
 fn9_b:                                  # @fn9_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+11($pop3)
@@ -2278,19 +2240,18 @@ fn9_b:                                  # @fn9_b
 fn1_c:                                  # @fn1_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 3
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end108:
@@ -2303,19 +2264,18 @@ fn1_c:                                  # @fn1_c
 fn2_c:                                  # @fn2_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 192
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end109:
@@ -2327,7 +2287,7 @@ fn2_c:                                  # @fn2_c
 	.type	fn3_c,@function
 fn3_c:                                  # @fn3_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2346,19 +2306,18 @@ fn3_c:                                  # @fn3_c
 fn4_c:                                  # @fn4_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 3
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end111:
@@ -2370,7 +2329,7 @@ fn4_c:                                  # @fn4_c
 	.type	fn5_c,@function
 fn5_c:                                  # @fn5_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2388,7 +2347,7 @@ fn5_c:                                  # @fn5_c
 	.type	fn6_c,@function
 fn6_c:                                  # @fn6_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2406,7 +2365,7 @@ fn6_c:                                  # @fn6_c
 	.type	fn7_c,@function
 fn7_c:                                  # @fn7_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2424,7 +2383,7 @@ fn7_c:                                  # @fn7_c
 	.type	fn8_c,@function
 fn8_c:                                  # @fn8_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d+8($pop6)
@@ -2444,7 +2403,7 @@ fn8_c:                                  # @fn8_c
 	.type	fn9_c,@function
 fn9_c:                                  # @fn9_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2463,19 +2422,18 @@ fn9_c:                                  # @fn9_c
 fn1_d:                                  # @fn1_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 57
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end117:
@@ -2488,19 +2446,18 @@ fn1_d:                                  # @fn1_d
 fn2_d:                                  # @fn2_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 130624
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end118:
@@ -2512,7 +2469,7 @@ fn2_d:                                  # @fn2_d
 	.type	fn3_d,@function
 fn3_d:                                  # @fn3_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2531,19 +2488,18 @@ fn3_d:                                  # @fn3_d
 fn4_d:                                  # @fn4_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 25
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end120:
@@ -2555,7 +2511,7 @@ fn4_d:                                  # @fn4_d
 	.type	fn5_d,@function
 fn5_d:                                  # @fn5_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2573,7 +2529,7 @@ fn5_d:                                  # @fn5_d
 	.type	fn6_d,@function
 fn6_d:                                  # @fn6_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2591,7 +2547,7 @@ fn6_d:                                  # @fn6_d
 	.type	fn7_d,@function
 fn7_d:                                  # @fn7_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2609,7 +2565,7 @@ fn7_d:                                  # @fn7_d
 	.type	fn8_d,@function
 fn8_d:                                  # @fn8_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d+8($pop6)
@@ -2629,7 +2585,7 @@ fn8_d:                                  # @fn8_d
 	.type	fn9_d,@function
 fn9_d:                                  # @fn9_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2647,7 +2603,7 @@ fn9_d:                                  # @fn9_d
 	.type	fn1_e,@function
 fn1_e:                                  # @fn1_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2665,7 +2621,7 @@ fn1_e:                                  # @fn1_e
 	.type	fn2_e,@function
 fn2_e:                                  # @fn2_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2683,7 +2639,7 @@ fn2_e:                                  # @fn2_e
 	.type	fn3_e,@function
 fn3_e:                                  # @fn3_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2701,7 +2657,7 @@ fn3_e:                                  # @fn3_e
 	.type	fn4_e,@function
 fn4_e:                                  # @fn4_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2719,7 +2675,7 @@ fn4_e:                                  # @fn4_e
 	.type	fn5_e,@function
 fn5_e:                                  # @fn5_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end130:
@@ -2731,7 +2687,7 @@ fn5_e:                                  # @fn5_e
 	.type	fn6_e,@function
 fn6_e:                                  # @fn6_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2749,7 +2705,7 @@ fn6_e:                                  # @fn6_e
 	.type	fn7_e,@function
 fn7_e:                                  # @fn7_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2767,7 +2723,7 @@ fn7_e:                                  # @fn7_e
 	.type	fn8_e,@function
 fn8_e:                                  # @fn8_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2785,7 +2741,7 @@ fn8_e:                                  # @fn8_e
 	.type	fn9_e,@function
 fn9_e:                                  # @fn9_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2803,7 +2759,7 @@ fn9_e:                                  # @fn9_e
 	.type	fn1_f,@function
 fn1_f:                                  # @fn1_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2821,7 +2777,7 @@ fn1_f:                                  # @fn1_f
 	.type	fn2_f,@function
 fn2_f:                                  # @fn2_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2839,7 +2795,7 @@ fn2_f:                                  # @fn2_f
 	.type	fn3_f,@function
 fn3_f:                                  # @fn3_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2857,7 +2813,7 @@ fn3_f:                                  # @fn3_f
 	.type	fn4_f,@function
 fn4_f:                                  # @fn4_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2875,7 +2831,7 @@ fn4_f:                                  # @fn4_f
 	.type	fn5_f,@function
 fn5_f:                                  # @fn5_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2893,7 +2849,7 @@ fn5_f:                                  # @fn5_f
 	.type	fn6_f,@function
 fn6_f:                                  # @fn6_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -2911,7 +2867,7 @@ fn6_f:                                  # @fn6_f
 	.type	fn7_f,@function
 fn7_f:                                  # @fn7_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2929,7 +2885,7 @@ fn7_f:                                  # @fn7_f
 	.type	fn8_f,@function
 fn8_f:                                  # @fn8_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2947,7 +2903,7 @@ fn8_f:                                  # @fn8_f
 	.type	fn9_f,@function
 fn9_f:                                  # @fn9_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -2965,7 +2921,7 @@ fn9_f:                                  # @fn9_f
 	.type	fn1_g,@function
 fn1_g:                                  # @fn1_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -2983,7 +2939,7 @@ fn1_g:                                  # @fn1_g
 	.type	fn2_g,@function
 fn2_g:                                  # @fn2_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -3001,7 +2957,7 @@ fn2_g:                                  # @fn2_g
 	.type	fn3_g,@function
 fn3_g:                                  # @fn3_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b+8($pop4)
@@ -3019,7 +2975,7 @@ fn3_g:                                  # @fn3_g
 	.type	fn4_g,@function
 fn4_g:                                  # @fn4_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -3037,7 +2993,7 @@ fn4_g:                                  # @fn4_g
 	.type	fn5_g,@function
 fn5_g:                                  # @fn5_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -3055,7 +3011,7 @@ fn5_g:                                  # @fn5_g
 	.type	fn6_g,@function
 fn6_g:                                  # @fn6_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -3073,7 +3029,7 @@ fn6_g:                                  # @fn6_g
 	.type	fn7_g,@function
 fn7_g:                                  # @fn7_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -3091,7 +3047,7 @@ fn7_g:                                  # @fn7_g
 	.type	fn8_g,@function
 fn8_g:                                  # @fn8_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -3109,7 +3065,7 @@ fn8_g:                                  # @fn8_g
 	.type	fn9_g,@function
 fn9_g:                                  # @fn9_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -3128,19 +3084,18 @@ fn9_g:                                  # @fn9_g
 fn1_h:                                  # @fn1_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.div_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end153:
@@ -3153,13 +3108,12 @@ fn1_h:                                  # @fn1_h
 fn2_h:                                  # @fn2_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, b+8($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop12, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 17
@@ -3169,7 +3123,7 @@ fn2_h:                                  # @fn2_h
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push10=, $pop9, $pop2
-	i32.store	b+8($pop0), $pop10
+	i32.store	b+8($pop12), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end154:
@@ -3182,19 +3136,18 @@ fn2_h:                                  # @fn2_h
 fn3_h:                                  # @fn3_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 2228224
-	i32.div_u	$push4=, $pop8, $pop3
+	i32.div_u	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end155:
@@ -3207,19 +3160,18 @@ fn3_h:                                  # @fn3_h
 fn4_h:                                  # @fn4_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.div_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end156:
@@ -3231,7 +3183,7 @@ fn4_h:                                  # @fn4_h
 	.type	fn5_h,@function
 fn5_h:                                  # @fn5_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c+8($pop4)
@@ -3250,19 +3202,18 @@ fn5_h:                                  # @fn5_h
 fn6_h:                                  # @fn6_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1088
-	i32.div_u	$push4=, $pop8, $pop3
+	i32.div_u	$push4=, $1, $pop3
 	i32.const	$push5=, 6
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end158:
@@ -3274,7 +3225,7 @@ fn6_h:                                  # @fn6_h
 	.type	fn7_h,@function
 fn7_h:                                  # @fn7_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load16_u	$push1=, d+8($pop4)
@@ -3292,7 +3243,7 @@ fn7_h:                                  # @fn7_h
 	.type	fn8_h,@function
 fn8_h:                                  # @fn8_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+10($pop4)
@@ -3310,7 +3261,7 @@ fn8_h:                                  # @fn8_h
 	.type	fn9_h,@function
 fn9_h:                                  # @fn9_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d+8($pop4)
@@ -3329,19 +3280,18 @@ fn9_h:                                  # @fn9_h
 fn1_i:                                  # @fn1_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b+8($pop0), $pop7
+	i32.store	b+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end162:
@@ -3354,13 +3304,12 @@ fn1_i:                                  # @fn1_i
 fn2_i:                                  # @fn2_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, b+8($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop12, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 19
@@ -3370,7 +3319,7 @@ fn2_i:                                  # @fn2_i
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push10=, $pop9, $pop2
-	i32.store	b+8($pop0), $pop10
+	i32.store	b+8($pop12), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end163:
@@ -3383,13 +3332,12 @@ fn2_i:                                  # @fn2_i
 fn3_i:                                  # @fn3_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, b+8($pop12)
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$1=, b+8($pop0)
+	i32.const	$push10=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop10, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push9=, 17
@@ -3397,7 +3345,7 @@ fn3_i:                                  # @fn3_i
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b+8($pop0), $pop8
+	i32.store	b+8($pop10), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end164:
@@ -3410,19 +3358,18 @@ fn3_i:                                  # @fn3_i
 fn4_i:                                  # @fn4_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c+8($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c+8($pop0), $pop7
+	i32.store	c+8($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end165:
@@ -3434,7 +3381,7 @@ fn4_i:                                  # @fn4_i
 	.type	fn5_i,@function
 fn5_i:                                  # @fn5_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end166:
@@ -3447,13 +3394,12 @@ fn5_i:                                  # @fn5_i
 fn6_i:                                  # @fn6_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, c+8($pop12)
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$1=, c+8($pop0)
+	i32.const	$push10=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop10, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push9=, 6
@@ -3461,7 +3407,7 @@ fn6_i:                                  # @fn6_i
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c+8($pop0), $pop8
+	i32.store	c+8($pop10), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end167:
@@ -3473,7 +3419,7 @@ fn6_i:                                  # @fn6_i
 	.type	fn7_i,@function
 fn7_i:                                  # @fn7_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load16_u	$push1=, d+8($pop4)
@@ -3491,7 +3437,7 @@ fn7_i:                                  # @fn7_i
 	.type	fn8_i,@function
 fn8_i:                                  # @fn8_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+10($pop4)
@@ -3509,7 +3455,7 @@ fn8_i:                                  # @fn8_i
 	.type	fn9_i,@function
 fn9_i:                                  # @fn9_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+11($pop4)
@@ -3527,7 +3473,7 @@ fn9_i:                                  # @fn9_i
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end1610
+# %bb.0:                                # %if.end1610
 	i32.const	$push1=, 0
 	i32.const	$push0=, -2147483595
 	i32.store	c+8($pop1), $pop0
@@ -3571,4 +3517,4 @@ d:
 	.size	d, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040705-2.c.s b/test/torture-s/20040705-2.c.s
index 541891d11..802f0c730 100644
--- a/test/torture-s/20040705-2.c.s
+++ b/test/torture-s/20040705-2.c.s
@@ -6,7 +6,7 @@
 	.type	ret1,@function
 ret1:                                   # @ret1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b($pop0)
 	i32.const	$push2=, 63
@@ -22,7 +22,7 @@ ret1:                                   # @ret1
 	.type	ret2,@function
 ret2:                                   # @ret2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b($pop0)
 	i32.const	$push2=, 6
@@ -40,7 +40,7 @@ ret2:                                   # @ret2
 	.type	ret3,@function
 ret3:                                   # @ret3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, b($pop0)
 	i32.const	$push2=, 17
@@ -56,7 +56,7 @@ ret3:                                   # @ret3
 	.type	ret4,@function
 ret4:                                   # @ret4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c($pop0)
 	i32.const	$push2=, 31
@@ -72,7 +72,7 @@ ret4:                                   # @ret4
 	.type	ret5,@function
 ret5:                                   # @ret5
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c($pop0)
 	i32.const	$push2=, 5
@@ -90,7 +90,7 @@ ret5:                                   # @ret5
 	.type	ret6,@function
 ret6:                                   # @ret6
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, c($pop0)
 	i32.const	$push2=, 6
@@ -106,7 +106,7 @@ ret6:                                   # @ret6
 	.type	ret7,@function
 ret7:                                   # @ret7
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, d($pop0)
                                         # fallthrough-return: $pop1
@@ -120,7 +120,7 @@ ret7:                                   # @ret7
 	.type	ret8,@function
 ret8:                                   # @ret8
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, d+2($pop0)
                                         # fallthrough-return: $pop1
@@ -134,7 +134,7 @@ ret8:                                   # @ret8
 	.type	ret9,@function
 ret9:                                   # @ret9
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, d+3($pop0)
                                         # fallthrough-return: $pop1
@@ -149,18 +149,17 @@ ret9:                                   # @ret9
 fn1_1:                                  # @fn1_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.add 	$push3=, $pop7, $0
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
@@ -173,20 +172,19 @@ fn1_1:                                  # @fn1_1
 fn2_1:                                  # @fn2_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.add 	$push5=, $pop9, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.const	$push6=, 131008
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
@@ -198,7 +196,7 @@ fn2_1:                                  # @fn2_1
 	.type	fn3_1,@function
 fn3_1:                                  # @fn3_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b($pop5)
@@ -218,18 +216,17 @@ fn3_1:                                  # @fn3_1
 fn4_1:                                  # @fn4_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.add 	$push3=, $pop7, $0
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 31
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
@@ -242,20 +239,19 @@ fn4_1:                                  # @fn4_1
 fn5_1:                                  # @fn5_1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 5
 	i32.shl 	$push4=, $0, $pop3
-	i32.add 	$push5=, $pop9, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.const	$push6=, 32
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end13:
@@ -267,7 +263,7 @@ fn5_1:                                  # @fn5_1
 	.type	fn6_1,@function
 fn6_1:                                  # @fn6_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c($pop5)
@@ -286,7 +282,7 @@ fn6_1:                                  # @fn6_1
 	.type	fn7_1,@function
 fn7_1:                                  # @fn7_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, d($pop3)
@@ -303,7 +299,7 @@ fn7_1:                                  # @fn7_1
 	.type	fn8_1,@function
 fn8_1:                                  # @fn8_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -324,7 +320,7 @@ fn8_1:                                  # @fn8_1
 	.type	fn9_1,@function
 fn9_1:                                  # @fn9_1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d($pop5)
@@ -344,19 +340,18 @@ fn9_1:                                  # @fn9_1
 fn1_2:                                  # @fn1_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end18:
@@ -369,19 +364,18 @@ fn1_2:                                  # @fn1_2
 fn2_2:                                  # @fn2_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 64
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end19:
@@ -393,7 +387,7 @@ fn2_2:                                  # @fn2_2
 	.type	fn3_2,@function
 fn3_2:                                  # @fn3_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -412,19 +406,18 @@ fn3_2:                                  # @fn3_2
 fn4_2:                                  # @fn4_2
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end21:
@@ -436,7 +429,7 @@ fn4_2:                                  # @fn4_2
 	.type	fn5_2,@function
 fn5_2:                                  # @fn5_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -454,7 +447,7 @@ fn5_2:                                  # @fn5_2
 	.type	fn6_2,@function
 fn6_2:                                  # @fn6_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -472,7 +465,7 @@ fn6_2:                                  # @fn6_2
 	.type	fn7_2,@function
 fn7_2:                                  # @fn7_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -490,7 +483,7 @@ fn7_2:                                  # @fn7_2
 	.type	fn8_2,@function
 fn8_2:                                  # @fn8_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -510,7 +503,7 @@ fn8_2:                                  # @fn8_2
 	.type	fn9_2,@function
 fn9_2:                                  # @fn9_2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -529,19 +522,18 @@ fn9_2:                                  # @fn9_2
 fn1_3:                                  # @fn1_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end27:
@@ -554,19 +546,18 @@ fn1_3:                                  # @fn1_3
 fn2_3:                                  # @fn2_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 64
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end28:
@@ -578,7 +569,7 @@ fn2_3:                                  # @fn2_3
 	.type	fn3_3,@function
 fn3_3:                                  # @fn3_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -597,19 +588,18 @@ fn3_3:                                  # @fn3_3
 fn4_3:                                  # @fn4_3
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end30:
@@ -621,7 +611,7 @@ fn4_3:                                  # @fn4_3
 	.type	fn5_3,@function
 fn5_3:                                  # @fn5_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -639,7 +629,7 @@ fn5_3:                                  # @fn5_3
 	.type	fn6_3,@function
 fn6_3:                                  # @fn6_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -657,7 +647,7 @@ fn6_3:                                  # @fn6_3
 	.type	fn7_3,@function
 fn7_3:                                  # @fn7_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -675,7 +665,7 @@ fn7_3:                                  # @fn7_3
 	.type	fn8_3,@function
 fn8_3:                                  # @fn8_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -695,7 +685,7 @@ fn8_3:                                  # @fn8_3
 	.type	fn9_3,@function
 fn9_3:                                  # @fn9_3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -714,18 +704,17 @@ fn9_3:                                  # @fn9_3
 fn1_4:                                  # @fn1_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.sub 	$push3=, $pop7, $0
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
+	i32.sub 	$push3=, $1, $0
 	i32.const	$push4=, 63
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end36:
@@ -738,20 +727,19 @@ fn1_4:                                  # @fn1_4
 fn2_4:                                  # @fn2_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, 131008
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end37:
@@ -764,20 +752,19 @@ fn2_4:                                  # @fn2_4
 fn3_4:                                  # @fn3_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, -131072
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end38:
@@ -790,18 +777,17 @@ fn3_4:                                  # @fn3_4
 fn4_4:                                  # @fn4_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
-	i32.sub 	$push3=, $pop7, $0
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
+	i32.sub 	$push3=, $1, $0
 	i32.const	$push4=, 31
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end39:
@@ -814,20 +800,19 @@ fn4_4:                                  # @fn4_4
 fn5_4:                                  # @fn5_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 5
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, 32
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end40:
@@ -840,20 +825,19 @@ fn5_4:                                  # @fn5_4
 fn6_4:                                  # @fn6_4
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
 	i32.shl 	$push4=, $0, $pop3
-	i32.sub 	$push5=, $pop9, $pop4
+	i32.sub 	$push5=, $1, $pop4
 	i32.const	$push6=, -64
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end41:
@@ -865,7 +849,7 @@ fn6_4:                                  # @fn6_4
 	.type	fn7_4,@function
 fn7_4:                                  # @fn7_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, d($pop3)
@@ -882,7 +866,7 @@ fn7_4:                                  # @fn7_4
 	.type	fn8_4,@function
 fn8_4:                                  # @fn8_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -903,7 +887,7 @@ fn8_4:                                  # @fn8_4
 	.type	fn9_4,@function
 fn9_4:                                  # @fn9_4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -925,19 +909,18 @@ fn9_4:                                  # @fn9_4
 fn1_5:                                  # @fn1_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 63
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end45:
@@ -950,19 +933,18 @@ fn1_5:                                  # @fn1_5
 fn2_5:                                  # @fn2_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 131008
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 131008
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end46:
@@ -974,7 +956,7 @@ fn2_5:                                  # @fn2_5
 	.type	fn3_5,@function
 fn3_5:                                  # @fn3_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -993,19 +975,18 @@ fn3_5:                                  # @fn3_5
 fn4_5:                                  # @fn4_5
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 31
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end48:
@@ -1017,7 +998,7 @@ fn4_5:                                  # @fn4_5
 	.type	fn5_5,@function
 fn5_5:                                  # @fn5_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1035,7 +1016,7 @@ fn5_5:                                  # @fn5_5
 	.type	fn6_5,@function
 fn6_5:                                  # @fn6_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1053,7 +1034,7 @@ fn6_5:                                  # @fn6_5
 	.type	fn7_5,@function
 fn7_5:                                  # @fn7_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1071,7 +1052,7 @@ fn7_5:                                  # @fn7_5
 	.type	fn8_5,@function
 fn8_5:                                  # @fn8_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -1091,7 +1072,7 @@ fn8_5:                                  # @fn8_5
 	.type	fn9_5,@function
 fn9_5:                                  # @fn9_5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1110,19 +1091,18 @@ fn9_5:                                  # @fn9_5
 fn1_6:                                  # @fn1_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 63
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end54:
@@ -1135,19 +1115,18 @@ fn1_6:                                  # @fn1_6
 fn2_6:                                  # @fn2_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 131008
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 131008
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end55:
@@ -1159,7 +1138,7 @@ fn2_6:                                  # @fn2_6
 	.type	fn3_6,@function
 fn3_6:                                  # @fn3_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -1178,19 +1157,18 @@ fn3_6:                                  # @fn3_6
 fn4_6:                                  # @fn4_6
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push7=, 31
 	i32.and 	$push5=, $pop4, $pop7
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop8), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end57:
@@ -1202,7 +1180,7 @@ fn4_6:                                  # @fn4_6
 	.type	fn5_6,@function
 fn5_6:                                  # @fn5_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1220,7 +1198,7 @@ fn5_6:                                  # @fn5_6
 	.type	fn6_6,@function
 fn6_6:                                  # @fn6_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -1238,7 +1216,7 @@ fn6_6:                                  # @fn6_6
 	.type	fn7_6,@function
 fn7_6:                                  # @fn7_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1256,7 +1234,7 @@ fn7_6:                                  # @fn7_6
 	.type	fn8_6,@function
 fn8_6:                                  # @fn8_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -1276,7 +1254,7 @@ fn8_6:                                  # @fn8_6
 	.type	fn9_6,@function
 fn9_6:                                  # @fn9_6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -1294,7 +1272,7 @@ fn9_6:                                  # @fn9_6
 	.type	fn1_7,@function
 fn1_7:                                  # @fn1_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -64
 	i32.or  	$push1=, $0, $pop0
@@ -1313,7 +1291,7 @@ fn1_7:                                  # @fn1_7
 	.type	fn2_7,@function
 fn2_7:                                  # @fn2_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
@@ -1334,7 +1312,7 @@ fn2_7:                                  # @fn2_7
 	.type	fn3_7,@function
 fn3_7:                                  # @fn3_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b($pop7)
@@ -1355,7 +1333,7 @@ fn3_7:                                  # @fn3_7
 	.type	fn4_7,@function
 fn4_7:                                  # @fn4_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -32
 	i32.or  	$push1=, $0, $pop0
@@ -1374,7 +1352,7 @@ fn4_7:                                  # @fn4_7
 	.type	fn5_7,@function
 fn5_7:                                  # @fn5_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
@@ -1395,7 +1373,7 @@ fn5_7:                                  # @fn5_7
 	.type	fn6_7,@function
 fn6_7:                                  # @fn6_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c($pop7)
@@ -1416,7 +1394,7 @@ fn6_7:                                  # @fn6_7
 	.type	fn7_7,@function
 fn7_7:                                  # @fn7_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, -65536
 	i32.or  	$push1=, $0, $pop0
@@ -1435,7 +1413,7 @@ fn7_7:                                  # @fn7_7
 	.type	fn8_7,@function
 fn8_7:                                  # @fn8_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
@@ -1456,7 +1434,7 @@ fn8_7:                                  # @fn8_7
 	.type	fn9_7,@function
 fn9_7:                                  # @fn9_7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d($pop7)
@@ -1477,7 +1455,7 @@ fn9_7:                                  # @fn9_7
 	.type	fn1_8,@function
 fn1_8:                                  # @fn1_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b($pop5)
@@ -1496,7 +1474,7 @@ fn1_8:                                  # @fn1_8
 	.type	fn2_8,@function
 fn2_8:                                  # @fn2_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b($pop7)
@@ -1518,20 +1496,19 @@ fn2_8:                                  # @fn2_8
 fn3_8:                                  # @fn3_8
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -131072
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.or  	$push5=, $pop4, $pop1
 	i32.const	$push6=, 131071
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	b($pop2), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end74:
@@ -1543,7 +1520,7 @@ fn3_8:                                  # @fn3_8
 	.type	fn4_8,@function
 fn4_8:                                  # @fn4_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c($pop5)
@@ -1562,7 +1539,7 @@ fn4_8:                                  # @fn4_8
 	.type	fn5_8,@function
 fn5_8:                                  # @fn5_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c($pop7)
@@ -1584,20 +1561,19 @@ fn5_8:                                  # @fn5_8
 fn6_8:                                  # @fn6_8
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -64
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.or  	$push5=, $pop4, $pop1
 	i32.const	$push6=, 63
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	c($pop2), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end77:
@@ -1609,7 +1585,7 @@ fn6_8:                                  # @fn6_8
 	.type	fn7_8,@function
 fn7_8:                                  # @fn7_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d($pop5)
@@ -1628,7 +1604,7 @@ fn7_8:                                  # @fn7_8
 	.type	fn8_8,@function
 fn8_8:                                  # @fn8_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d($pop7)
@@ -1649,7 +1625,7 @@ fn8_8:                                  # @fn8_8
 	.type	fn9_8,@function
 fn9_8:                                  # @fn9_8
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -1670,7 +1646,7 @@ fn9_8:                                  # @fn9_8
 	.type	fn1_9,@function
 fn1_9:                                  # @fn1_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, b($pop5)
@@ -1689,7 +1665,7 @@ fn1_9:                                  # @fn1_9
 	.type	fn2_9,@function
 fn2_9:                                  # @fn2_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, b($pop7)
@@ -1711,20 +1687,19 @@ fn2_9:                                  # @fn2_9
 fn3_9:                                  # @fn3_9
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -131072
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.xor 	$push5=, $pop4, $pop1
 	i32.const	$push6=, 131071
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	b($pop2), $pop8
+	i32.store	b($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end83:
@@ -1736,7 +1711,7 @@ fn3_9:                                  # @fn3_9
 	.type	fn4_9,@function
 fn4_9:                                  # @fn4_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, c($pop5)
@@ -1755,7 +1730,7 @@ fn4_9:                                  # @fn4_9
 	.type	fn5_9,@function
 fn5_9:                                  # @fn5_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, c($pop7)
@@ -1777,20 +1752,19 @@ fn5_9:                                  # @fn5_9
 fn6_9:                                  # @fn6_9
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop2)
+	i32.const	$push9=, 0
 	i32.const	$push3=, -64
-	i32.and 	$push4=, $pop9, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push0=, 6
 	i32.shl 	$push1=, $0, $pop0
 	i32.xor 	$push5=, $pop4, $pop1
 	i32.const	$push6=, 63
 	i32.and 	$push7=, $1, $pop6
 	i32.or  	$push8=, $pop5, $pop7
-	i32.store	c($pop2), $pop8
+	i32.store	c($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end86:
@@ -1802,7 +1776,7 @@ fn6_9:                                  # @fn6_9
 	.type	fn7_9,@function
 fn7_9:                                  # @fn7_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push5=, 0
 	i32.load	$push3=, d($pop5)
@@ -1821,7 +1795,7 @@ fn7_9:                                  # @fn7_9
 	.type	fn8_9,@function
 fn8_9:                                  # @fn8_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push7=, 0
 	i32.load	$push5=, d($pop7)
@@ -1842,7 +1816,7 @@ fn8_9:                                  # @fn8_9
 	.type	fn9_9,@function
 fn9_9:                                  # @fn9_9
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, d($pop7)
@@ -1864,18 +1838,17 @@ fn9_9:                                  # @fn9_9
 fn1_a:                                  # @fn1_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push1=, -64
-	i32.and 	$push2=, $pop7, $pop1
+	i32.and 	$push2=, $1, $pop1
 	i32.const	$push3=, 63
 	i32.and 	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.or  	$push6=, $pop2, $pop5
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end90:
@@ -1888,13 +1861,12 @@ fn1_a:                                  # @fn1_a
 fn2_a:                                  # @fn2_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, b($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, b($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.div_u	$push7=, $pop6, $0
@@ -1903,7 +1875,7 @@ fn2_a:                                  # @fn2_a
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	b($pop0), $pop9
+	i32.store	b($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end91:
@@ -1916,20 +1888,19 @@ fn2_a:                                  # @fn2_a
 fn3_a:                                  # @fn3_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.const	$push8=, 17
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end92:
@@ -1942,18 +1913,17 @@ fn3_a:                                  # @fn3_a
 fn4_a:                                  # @fn4_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push1=, -32
-	i32.and 	$push2=, $pop7, $pop1
+	i32.and 	$push2=, $1, $pop1
 	i32.const	$push3=, 31
 	i32.and 	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.or  	$push6=, $pop2, $pop5
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end93:
@@ -1966,13 +1936,12 @@ fn4_a:                                  # @fn4_a
 fn5_a:                                  # @fn5_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, c($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, c($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
 	i32.div_u	$push7=, $pop6, $0
@@ -1981,7 +1950,7 @@ fn5_a:                                  # @fn5_a
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	c($pop0), $pop9
+	i32.store	c($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end94:
@@ -1994,20 +1963,19 @@ fn5_a:                                  # @fn5_a
 fn6_a:                                  # @fn6_a
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.div_u	$push5=, $pop4, $0
 	i32.const	$push8=, 6
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end95:
@@ -2019,7 +1987,7 @@ fn6_a:                                  # @fn6_a
 	.type	fn7_a,@function
 fn7_a:                                  # @fn7_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load16_u	$push1=, d($pop3)
@@ -2036,7 +2004,7 @@ fn7_a:                                  # @fn7_a
 	.type	fn8_a,@function
 fn8_a:                                  # @fn8_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+2($pop3)
@@ -2053,7 +2021,7 @@ fn8_a:                                  # @fn8_a
 	.type	fn9_a,@function
 fn9_a:                                  # @fn9_a
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+3($pop3)
@@ -2071,18 +2039,17 @@ fn9_a:                                  # @fn9_a
 fn1_b:                                  # @fn1_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, b($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop7, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	b($pop0), $pop6
+	i32.store	b($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end99:
@@ -2095,13 +2062,12 @@ fn1_b:                                  # @fn1_b
 fn2_b:                                  # @fn2_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, b($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, b($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.rem_u	$push7=, $pop6, $0
@@ -2110,7 +2076,7 @@ fn2_b:                                  # @fn2_b
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	b($pop0), $pop9
+	i32.store	b($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end100:
@@ -2123,20 +2089,19 @@ fn2_b:                                  # @fn2_b
 fn3_b:                                  # @fn3_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, b($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, b($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push8=, 17
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end101:
@@ -2149,18 +2114,17 @@ fn3_b:                                  # @fn3_b
 fn4_b:                                  # @fn4_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push8=, c($pop9)
-	tee_local	$push7=, $1=, $pop8
+	i32.load	$1=, c($pop0)
+	i32.const	$push7=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop7, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store	c($pop0), $pop6
+	i32.store	c($pop7), $pop6
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end102:
@@ -2173,13 +2137,12 @@ fn4_b:                                  # @fn4_b
 fn5_b:                                  # @fn5_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push13=, 0
-	i32.load	$push12=, c($pop13)
-	tee_local	$push11=, $1=, $pop12
+	i32.load	$1=, c($pop0)
+	i32.const	$push11=, 0
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop11, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 1
 	i32.and 	$push6=, $pop4, $pop5
 	i32.rem_u	$push7=, $pop6, $0
@@ -2188,7 +2151,7 @@ fn5_b:                                  # @fn5_b
 	i32.const	$push1=, -33
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push9=, $pop8, $pop2
-	i32.store	c($pop0), $pop9
+	i32.store	c($pop11), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end103:
@@ -2201,20 +2164,19 @@ fn5_b:                                  # @fn5_b
 fn6_b:                                  # @fn6_b
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, c($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, c($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop9, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.rem_u	$push5=, $pop4, $0
 	i32.const	$push8=, 6
 	i32.shl 	$push6=, $pop5, $pop8
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop9), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end104:
@@ -2226,7 +2188,7 @@ fn6_b:                                  # @fn6_b
 	.type	fn7_b,@function
 fn7_b:                                  # @fn7_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load16_u	$push1=, d($pop3)
@@ -2243,7 +2205,7 @@ fn7_b:                                  # @fn7_b
 	.type	fn8_b,@function
 fn8_b:                                  # @fn8_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+2($pop3)
@@ -2260,7 +2222,7 @@ fn8_b:                                  # @fn8_b
 	.type	fn9_b,@function
 fn9_b:                                  # @fn9_b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load8_u	$push1=, d+3($pop3)
@@ -2278,19 +2240,18 @@ fn9_b:                                  # @fn9_b
 fn1_c:                                  # @fn1_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 3
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end108:
@@ -2303,19 +2264,18 @@ fn1_c:                                  # @fn1_c
 fn2_c:                                  # @fn2_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 192
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end109:
@@ -2327,7 +2287,7 @@ fn2_c:                                  # @fn2_c
 	.type	fn3_c,@function
 fn3_c:                                  # @fn3_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2346,19 +2306,18 @@ fn3_c:                                  # @fn3_c
 fn4_c:                                  # @fn4_c
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 3
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end111:
@@ -2370,7 +2329,7 @@ fn4_c:                                  # @fn4_c
 	.type	fn5_c,@function
 fn5_c:                                  # @fn5_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2388,7 +2347,7 @@ fn5_c:                                  # @fn5_c
 	.type	fn6_c,@function
 fn6_c:                                  # @fn6_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2406,7 +2365,7 @@ fn6_c:                                  # @fn6_c
 	.type	fn7_c,@function
 fn7_c:                                  # @fn7_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2424,7 +2383,7 @@ fn7_c:                                  # @fn7_c
 	.type	fn8_c,@function
 fn8_c:                                  # @fn8_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -2444,7 +2403,7 @@ fn8_c:                                  # @fn8_c
 	.type	fn9_c,@function
 fn9_c:                                  # @fn9_c
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2463,19 +2422,18 @@ fn9_c:                                  # @fn9_c
 fn1_d:                                  # @fn1_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 57
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 63
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end117:
@@ -2488,19 +2446,18 @@ fn1_d:                                  # @fn1_d
 fn2_d:                                  # @fn2_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 130624
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 131008
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end118:
@@ -2512,7 +2469,7 @@ fn2_d:                                  # @fn2_d
 	.type	fn3_d,@function
 fn3_d:                                  # @fn3_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2531,19 +2488,18 @@ fn3_d:                                  # @fn3_d
 fn4_d:                                  # @fn4_d
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 25
-	i32.add 	$push4=, $pop8, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.const	$push5=, 31
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end120:
@@ -2555,7 +2511,7 @@ fn4_d:                                  # @fn4_d
 	.type	fn5_d,@function
 fn5_d:                                  # @fn5_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2573,7 +2529,7 @@ fn5_d:                                  # @fn5_d
 	.type	fn6_d,@function
 fn6_d:                                  # @fn6_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2591,7 +2547,7 @@ fn6_d:                                  # @fn6_d
 	.type	fn7_d,@function
 fn7_d:                                  # @fn7_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2609,7 +2565,7 @@ fn7_d:                                  # @fn7_d
 	.type	fn8_d,@function
 fn8_d:                                  # @fn8_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, d($pop6)
@@ -2629,7 +2585,7 @@ fn8_d:                                  # @fn8_d
 	.type	fn9_d,@function
 fn9_d:                                  # @fn9_d
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2647,7 +2603,7 @@ fn9_d:                                  # @fn9_d
 	.type	fn1_e,@function
 fn1_e:                                  # @fn1_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2665,7 +2621,7 @@ fn1_e:                                  # @fn1_e
 	.type	fn2_e,@function
 fn2_e:                                  # @fn2_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2683,7 +2639,7 @@ fn2_e:                                  # @fn2_e
 	.type	fn3_e,@function
 fn3_e:                                  # @fn3_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2701,7 +2657,7 @@ fn3_e:                                  # @fn3_e
 	.type	fn4_e,@function
 fn4_e:                                  # @fn4_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2719,7 +2675,7 @@ fn4_e:                                  # @fn4_e
 	.type	fn5_e,@function
 fn5_e:                                  # @fn5_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end130:
@@ -2731,7 +2687,7 @@ fn5_e:                                  # @fn5_e
 	.type	fn6_e,@function
 fn6_e:                                  # @fn6_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2749,7 +2705,7 @@ fn6_e:                                  # @fn6_e
 	.type	fn7_e,@function
 fn7_e:                                  # @fn7_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2767,7 +2723,7 @@ fn7_e:                                  # @fn7_e
 	.type	fn8_e,@function
 fn8_e:                                  # @fn8_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2785,7 +2741,7 @@ fn8_e:                                  # @fn8_e
 	.type	fn9_e,@function
 fn9_e:                                  # @fn9_e
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2803,7 +2759,7 @@ fn9_e:                                  # @fn9_e
 	.type	fn1_f,@function
 fn1_f:                                  # @fn1_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2821,7 +2777,7 @@ fn1_f:                                  # @fn1_f
 	.type	fn2_f,@function
 fn2_f:                                  # @fn2_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2839,7 +2795,7 @@ fn2_f:                                  # @fn2_f
 	.type	fn3_f,@function
 fn3_f:                                  # @fn3_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2857,7 +2813,7 @@ fn3_f:                                  # @fn3_f
 	.type	fn4_f,@function
 fn4_f:                                  # @fn4_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2875,7 +2831,7 @@ fn4_f:                                  # @fn4_f
 	.type	fn5_f,@function
 fn5_f:                                  # @fn5_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2893,7 +2849,7 @@ fn5_f:                                  # @fn5_f
 	.type	fn6_f,@function
 fn6_f:                                  # @fn6_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -2911,7 +2867,7 @@ fn6_f:                                  # @fn6_f
 	.type	fn7_f,@function
 fn7_f:                                  # @fn7_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2929,7 +2885,7 @@ fn7_f:                                  # @fn7_f
 	.type	fn8_f,@function
 fn8_f:                                  # @fn8_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2947,7 +2903,7 @@ fn8_f:                                  # @fn8_f
 	.type	fn9_f,@function
 fn9_f:                                  # @fn9_f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -2965,7 +2921,7 @@ fn9_f:                                  # @fn9_f
 	.type	fn1_g,@function
 fn1_g:                                  # @fn1_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -2983,7 +2939,7 @@ fn1_g:                                  # @fn1_g
 	.type	fn2_g,@function
 fn2_g:                                  # @fn2_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -3001,7 +2957,7 @@ fn2_g:                                  # @fn2_g
 	.type	fn3_g,@function
 fn3_g:                                  # @fn3_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, b($pop4)
@@ -3019,7 +2975,7 @@ fn3_g:                                  # @fn3_g
 	.type	fn4_g,@function
 fn4_g:                                  # @fn4_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3037,7 +2993,7 @@ fn4_g:                                  # @fn4_g
 	.type	fn5_g,@function
 fn5_g:                                  # @fn5_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3055,7 +3011,7 @@ fn5_g:                                  # @fn5_g
 	.type	fn6_g,@function
 fn6_g:                                  # @fn6_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3073,7 +3029,7 @@ fn6_g:                                  # @fn6_g
 	.type	fn7_g,@function
 fn7_g:                                  # @fn7_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3091,7 +3047,7 @@ fn7_g:                                  # @fn7_g
 	.type	fn8_g,@function
 fn8_g:                                  # @fn8_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3109,7 +3065,7 @@ fn8_g:                                  # @fn8_g
 	.type	fn9_g,@function
 fn9_g:                                  # @fn9_g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3128,19 +3084,18 @@ fn9_g:                                  # @fn9_g
 fn1_h:                                  # @fn1_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.div_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end153:
@@ -3153,13 +3108,12 @@ fn1_h:                                  # @fn1_h
 fn2_h:                                  # @fn2_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, b($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load	$1=, b($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop12, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 17
@@ -3169,7 +3123,7 @@ fn2_h:                                  # @fn2_h
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push10=, $pop9, $pop2
-	i32.store	b($pop0), $pop10
+	i32.store	b($pop12), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end154:
@@ -3182,19 +3136,18 @@ fn2_h:                                  # @fn2_h
 fn3_h:                                  # @fn3_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 2228224
-	i32.div_u	$push4=, $pop8, $pop3
+	i32.div_u	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end155:
@@ -3207,19 +3160,18 @@ fn3_h:                                  # @fn3_h
 fn4_h:                                  # @fn4_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 17
 	i32.div_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end156:
@@ -3231,7 +3183,7 @@ fn4_h:                                  # @fn4_h
 	.type	fn5_h,@function
 fn5_h:                                  # @fn5_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, c($pop4)
@@ -3250,19 +3202,18 @@ fn5_h:                                  # @fn5_h
 fn6_h:                                  # @fn6_h
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1088
-	i32.div_u	$push4=, $pop8, $pop3
+	i32.div_u	$push4=, $1, $pop3
 	i32.const	$push5=, 6
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end158:
@@ -3274,7 +3225,7 @@ fn6_h:                                  # @fn6_h
 	.type	fn7_h,@function
 fn7_h:                                  # @fn7_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load16_u	$push1=, d($pop4)
@@ -3292,7 +3243,7 @@ fn7_h:                                  # @fn7_h
 	.type	fn8_h,@function
 fn8_h:                                  # @fn8_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+2($pop4)
@@ -3310,7 +3261,7 @@ fn8_h:                                  # @fn8_h
 	.type	fn9_h,@function
 fn9_h:                                  # @fn9_h
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, d($pop4)
@@ -3329,19 +3280,18 @@ fn9_h:                                  # @fn9_h
 fn1_i:                                  # @fn1_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, b($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 63
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	b($pop0), $pop7
+	i32.store	b($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end162:
@@ -3354,13 +3304,12 @@ fn1_i:                                  # @fn1_i
 fn2_i:                                  # @fn2_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, b($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load	$1=, b($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop12, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 2047
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 19
@@ -3370,7 +3319,7 @@ fn2_i:                                  # @fn2_i
 	i32.const	$push1=, -131009
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push10=, $pop9, $pop2
-	i32.store	b($pop0), $pop10
+	i32.store	b($pop12), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end163:
@@ -3383,13 +3332,12 @@ fn2_i:                                  # @fn2_i
 fn3_i:                                  # @fn3_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, b($pop12)
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$1=, b($pop0)
+	i32.const	$push10=, 0
 	i32.const	$push3=, 17
-	i32.shr_u	$push4=, $pop10, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push9=, 17
@@ -3397,7 +3345,7 @@ fn3_i:                                  # @fn3_i
 	i32.const	$push1=, 131071
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	b($pop0), $pop8
+	i32.store	b($pop10), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end164:
@@ -3410,19 +3358,18 @@ fn3_i:                                  # @fn3_i
 fn4_i:                                  # @fn4_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, c($pop10)
-	tee_local	$push8=, $1=, $pop9
+	i32.load	$1=, c($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 31
-	i32.and 	$push4=, $pop8, $pop3
+	i32.and 	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push1=, -32
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	c($pop0), $pop7
+	i32.store	c($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end165:
@@ -3434,7 +3381,7 @@ fn4_i:                                  # @fn4_i
 	.type	fn5_i,@function
 fn5_i:                                  # @fn5_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end166:
@@ -3447,13 +3394,12 @@ fn5_i:                                  # @fn5_i
 fn6_i:                                  # @fn6_i
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.load	$push11=, c($pop12)
-	tee_local	$push10=, $1=, $pop11
+	i32.load	$1=, c($pop0)
+	i32.const	$push10=, 0
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop10, $pop3
+	i32.shr_u	$push4=, $1, $pop3
 	i32.const	$push5=, 19
 	i32.rem_u	$push6=, $pop4, $pop5
 	i32.const	$push9=, 6
@@ -3461,7 +3407,7 @@ fn6_i:                                  # @fn6_i
 	i32.const	$push1=, 63
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store	c($pop0), $pop8
+	i32.store	c($pop10), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end167:
@@ -3473,7 +3419,7 @@ fn6_i:                                  # @fn6_i
 	.type	fn7_i,@function
 fn7_i:                                  # @fn7_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load16_u	$push1=, d($pop4)
@@ -3491,7 +3437,7 @@ fn7_i:                                  # @fn7_i
 	.type	fn8_i,@function
 fn8_i:                                  # @fn8_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+2($pop4)
@@ -3509,7 +3455,7 @@ fn8_i:                                  # @fn8_i
 	.type	fn9_i,@function
 fn9_i:                                  # @fn9_i
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load8_u	$push1=, d+3($pop4)
@@ -3527,7 +3473,7 @@ fn9_i:                                  # @fn9_i
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end1610
+# %bb.0:                                # %if.end1610
 	i32.const	$push1=, 0
 	i32.const	$push0=, -2147483595
 	i32.store	c($pop1), $pop0
@@ -3571,4 +3517,4 @@ d:
 	.size	d, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040706-1.c.s b/test/torture-s/20040706-1.c.s
index dcdb345b3..04b805fb0 100644
--- a/test/torture-s/20040706-1.c.s
+++ b/test/torture-s/20040706-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040707-1.c.s b/test/torture-s/20040707-1.c.s
index e9e2c3718..458e8ae6e 100644
--- a/test/torture-s/20040707-1.c.s
+++ b/test/torture-s/20040707-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -27,5 +27,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040709-1.c.s b/test/torture-s/20040709-1.c.s
index d448de3d0..3d3b87321 100644
--- a/test/torture-s/20040709-1.c.s
+++ b/test/torture-s/20040709-1.c.s
@@ -7,16 +7,15 @@
 myrnd:                                  # @myrnd
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push1=, myrnd.s($pop11)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push10=, $pop3, $pop4
-	tee_local	$push9=, $0=, $pop10
-	i32.store	myrnd.s($pop0), $pop9
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push9=, 0
+	i32.store	myrnd.s($pop9), $0
 	i32.const	$push5=, 16
 	i32.shr_u	$push6=, $0, $pop5
 	i32.const	$push7=, 2047
@@ -32,7 +31,7 @@ myrnd:                                  # @myrnd
 	.type	retmeA,@function
 retmeA:                                 # @retmeA
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -47,7 +46,7 @@ retmeA:                                 # @retmeA
 fn1A:                                   # @fn1A
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push3=, sA($pop2)
 	i32.const	$push0=, 17
@@ -67,7 +66,7 @@ fn1A:                                   # @fn1A
 fn2A:                                   # @fn2A
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sA($pop0)
 	i32.const	$push2=, 17
@@ -88,7 +87,7 @@ fn2A:                                   # @fn2A
 	.type	retitA,@function
 retitA:                                 # @retitA
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sA($pop0)
 	i32.const	$push2=, 17
@@ -105,15 +104,14 @@ retitA:                                 # @retitA
 fn3A:                                   # @fn3A
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sA($pop8)
+	i32.load	$push3=, sA($pop2)
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sA($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sA($pop6), $0
 	i32.const	$push5=, 17
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -127,81 +125,70 @@ fn3A:                                   # @fn3A
 	.type	testA,@function
 testA:                                  # @testA
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push87=, 0
-	i32.const	$push86=, 0
-	i32.load	$push0=, myrnd.s($pop86)
-	i32.const	$push85=, 1103515245
-	i32.mul 	$push1=, $pop0, $pop85
-	i32.const	$push84=, 12345
-	i32.add 	$push83=, $pop1, $pop84
-	tee_local	$push82=, $1=, $pop83
-	i32.const	$push81=, 16
-	i32.shr_u	$push2=, $pop82, $pop81
-	i32.store8	sA($pop87), $pop2
-	i32.const	$push80=, 0
-	i32.const	$push79=, 1103515245
-	i32.mul 	$push3=, $1, $pop79
-	i32.const	$push78=, 12345
-	i32.add 	$push77=, $pop3, $pop78
-	tee_local	$push76=, $1=, $pop77
-	i32.const	$push75=, 16
-	i32.shr_u	$push4=, $pop76, $pop75
-	i32.store8	sA+1($pop80), $pop4
-	i32.const	$push74=, 0
-	i32.const	$push73=, 1103515245
-	i32.mul 	$push5=, $1, $pop73
-	i32.const	$push72=, 12345
-	i32.add 	$push71=, $pop5, $pop72
-	tee_local	$push70=, $1=, $pop71
-	i32.const	$push69=, 16
-	i32.shr_u	$push6=, $pop70, $pop69
-	i32.store8	sA+2($pop74), $pop6
-	i32.const	$push68=, 0
-	i32.const	$push67=, 1103515245
-	i32.mul 	$push7=, $1, $pop67
-	i32.const	$push66=, 12345
-	i32.add 	$push65=, $pop7, $pop66
-	tee_local	$push64=, $1=, $pop65
-	i32.const	$push63=, 16
-	i32.shr_u	$push8=, $pop64, $pop63
-	i32.store8	sA+3($pop68), $pop8
+# %bb.0:                                # %entry
+	i32.const	$push65=, 0
+	i32.load	$push0=, myrnd.s($pop65)
+	i32.const	$push64=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop64
+	i32.const	$push63=, 12345
+	i32.add 	$1=, $pop1, $pop63
 	i32.const	$push62=, 0
-	i32.const	$push61=, 1103515245
-	i32.mul 	$push9=, $1, $pop61
-	i32.const	$push60=, 12345
-	i32.add 	$push59=, $pop9, $pop60
-	tee_local	$push58=, $3=, $pop59
-	i32.const	$push57=, 1103515245
-	i32.mul 	$push10=, $pop58, $pop57
-	i32.const	$push56=, 12345
-	i32.add 	$push55=, $pop10, $pop56
-	tee_local	$push54=, $1=, $pop55
-	i32.store	myrnd.s($pop62), $pop54
-	i32.const	$push53=, 0
-	i32.const	$push52=, 16
-	i32.shr_u	$push11=, $3, $pop52
-	i32.const	$push51=, 2047
-	i32.and 	$push50=, $pop11, $pop51
-	tee_local	$push49=, $3=, $pop50
-	i32.const	$push48=, 17
-	i32.shl 	$push12=, $pop49, $pop48
-	i32.const	$push47=, 0
-	i32.load	$push46=, sA($pop47)
-	tee_local	$push45=, $0=, $pop46
-	i32.const	$push44=, 131071
-	i32.and 	$push43=, $pop45, $pop44
-	tee_local	$push42=, $2=, $pop43
-	i32.or  	$push41=, $pop12, $pop42
-	tee_local	$push40=, $4=, $pop41
-	i32.store	sA($pop53), $pop40
+	i32.const	$push61=, 16
+	i32.shr_u	$push2=, $1, $pop61
+	i32.store8	sA($pop62), $pop2
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push3=, $1, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$1=, $pop3, $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push4=, $1, $pop57
+	i32.store8	sA+1($pop58), $pop4
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push5=, $1, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$1=, $pop5, $pop55
+	i32.const	$push54=, 0
+	i32.const	$push53=, 16
+	i32.shr_u	$push6=, $1, $pop53
+	i32.store8	sA+2($pop54), $pop6
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push7=, $1, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$1=, $pop7, $pop51
+	i32.const	$push50=, 0
+	i32.const	$push49=, 16
+	i32.shr_u	$push8=, $1, $pop49
+	i32.store8	sA+3($pop50), $pop8
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push9=, $1, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$3=, $pop9, $pop47
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push10=, $3, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$1=, $pop10, $pop45
+	i32.const	$push44=, 0
+	i32.store	myrnd.s($pop44), $1
+	i32.const	$push43=, 0
+	i32.load	$0=, sA($pop43)
+	i32.const	$push42=, 131071
+	i32.and 	$2=, $0, $pop42
+	i32.const	$push41=, 16
+	i32.shr_u	$push11=, $3, $pop41
+	i32.const	$push40=, 2047
+	i32.and 	$3=, $pop11, $pop40
+	i32.const	$push39=, 17
+	i32.shl 	$push12=, $3, $pop39
+	i32.or  	$4=, $pop12, $2
+	i32.const	$push38=, 0
+	i32.store	sA($pop38), $4
+	i32.const	$push37=, 16
+	i32.shr_u	$push13=, $1, $pop37
+	i32.const	$push36=, 2047
+	i32.and 	$5=, $pop13, $pop36
 	block   	
-	i32.const	$push39=, 16
-	i32.shr_u	$push13=, $1, $pop39
-	i32.const	$push38=, 2047
-	i32.and 	$push37=, $pop13, $pop38
-	tee_local	$push36=, $5=, $pop37
-	i32.add 	$push14=, $pop36, $3
+	i32.add 	$push14=, $5, $3
 	i32.const	$push35=, 17
 	i32.shl 	$push15=, $5, $pop35
 	i32.add 	$push16=, $pop15, $4
@@ -209,49 +196,44 @@ testA:                                  # @testA
 	i32.shr_u	$push17=, $pop16, $pop34
 	i32.ne  	$push18=, $pop14, $pop17
 	br_if   	0, $pop18       # 0: down to label0
-# BB#1:                                 # %if.end87
-	i32.const	$push108=, 0
+# %bb.1:                                # %if.end87
 	i32.const	$push19=, -2139243339
 	i32.mul 	$push20=, $1, $pop19
 	i32.const	$push21=, -1492899873
-	i32.add 	$push107=, $pop20, $pop21
-	tee_local	$push106=, $1=, $pop107
-	i32.const	$push105=, 1103515245
-	i32.mul 	$push22=, $pop106, $pop105
-	i32.const	$push104=, 12345
-	i32.add 	$push103=, $pop22, $pop104
-	tee_local	$push102=, $3=, $pop103
-	i32.store	myrnd.s($pop108), $pop102
-	i32.const	$push101=, 0
-	i32.const	$push100=, 16
-	i32.shr_u	$push26=, $3, $pop100
-	i32.const	$push99=, 2047
-	i32.and 	$push98=, $pop26, $pop99
-	tee_local	$push97=, $3=, $pop98
-	i32.const	$push96=, 17
-	i32.shl 	$push27=, $pop97, $pop96
-	i32.const	$push95=, 16
-	i32.shr_u	$push23=, $1, $pop95
-	i32.const	$push94=, 2047
-	i32.and 	$push93=, $pop23, $pop94
-	tee_local	$push92=, $4=, $pop93
-	i32.const	$push91=, 17
-	i32.shl 	$push24=, $pop92, $pop91
+	i32.add 	$1=, $pop20, $pop21
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push22=, $1, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$3=, $pop22, $pop75
+	i32.const	$push74=, 0
+	i32.store	myrnd.s($pop74), $3
+	i32.const	$push73=, 16
+	i32.shr_u	$push23=, $1, $pop73
+	i32.const	$push72=, 2047
+	i32.and 	$4=, $pop23, $pop72
+	i32.const	$push71=, 16
+	i32.shr_u	$push26=, $3, $pop71
+	i32.const	$push70=, 2047
+	i32.and 	$3=, $pop26, $pop70
+	i32.const	$push69=, 17
+	i32.shl 	$push27=, $3, $pop69
+	i32.const	$push68=, 17
+	i32.shl 	$push24=, $4, $pop68
 	i32.or  	$push25=, $pop24, $2
-	i32.add 	$push90=, $pop27, $pop25
-	tee_local	$push89=, $1=, $pop90
-	i32.store	sA($pop101), $pop89
+	i32.add 	$1=, $pop27, $pop25
+	i32.const	$push67=, 0
+	i32.store	sA($pop67), $1
 	i32.xor 	$push28=, $1, $0
-	i32.const	$push88=, 131071
-	i32.and 	$push29=, $pop28, $pop88
+	i32.const	$push66=, 131071
+	i32.and 	$push29=, $pop28, $pop66
 	br_if   	0, $pop29       # 0: down to label0
-# BB#2:                                 # %lor.lhs.false125
+# %bb.2:                                # %lor.lhs.false125
 	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
+# %bb.3:                                # %if.end131
 	return
 .LBB6_4:                                # %if.then
 	end_block                       # label0:
@@ -267,7 +249,7 @@ testA:                                  # @testA
 	.type	retmeB,@function
 retmeB:                                 # @retmeB
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=2
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -282,7 +264,7 @@ retmeB:                                 # @retmeB
 fn1B:                                   # @fn1B
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
@@ -302,7 +284,7 @@ fn1B:                                   # @fn1B
 fn2B:                                   # @fn2B
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sB($pop0)
 	i32.const	$push2=, 17
@@ -323,7 +305,7 @@ fn2B:                                   # @fn2B
 	.type	retitB,@function
 retitB:                                 # @retitB
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sB($pop0)
 	i32.const	$push2=, 17
@@ -340,15 +322,14 @@ retitB:                                 # @retitB
 fn3B:                                   # @fn3B
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sB($pop8)
+	i32.load	$push3=, sB($pop2)
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sB($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sB($pop6), $0
 	i32.const	$push5=, 17
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -362,117 +343,102 @@ fn3B:                                   # @fn3B
 	.type	testB,@function
 testB:                                  # @testB
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push89=, 0
+	i32.load	$push0=, myrnd.s($pop89)
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$1=, $pop1, $pop87
+	i32.const	$push86=, 0
+	i32.const	$push85=, 16
+	i32.shr_u	$push2=, $1, $pop85
+	i32.store8	sB($pop86), $pop2
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push3=, $1, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$1=, $pop3, $pop83
 	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	$push81=, 16
+	i32.shr_u	$push4=, $1, $pop81
+	i32.store8	sB+1($pop82), $pop4
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push5=, $1, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$1=, $pop5, $pop79
+	i32.const	$push78=, 0
 	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.shr_u	$push6=, $1, $pop77
+	i32.store8	sB+2($pop78), $pop6
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push7=, $1, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$1=, $pop7, $pop75
+	i32.const	$push74=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push8=, $1, $pop73
+	i32.store8	sB+3($pop74), $pop8
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push9=, $1, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$1=, $pop9, $pop71
 	i32.const	$push70=, 0
-	i32.const	$push69=, 1103515245
-	i32.mul 	$push17=, $1, $pop69
-	i32.const	$push68=, 12345
-	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
+	i32.const	$push69=, 16
+	i32.shr_u	$push10=, $1, $pop69
+	i32.store8	sB+4($pop70), $pop10
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push11=, $1, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$1=, $pop11, $pop67
+	i32.const	$push66=, 0
+	i32.const	$push65=, 16
+	i32.shr_u	$push12=, $1, $pop65
+	i32.store8	sB+5($pop66), $pop12
+	i32.const	$push64=, 1103515245
+	i32.mul 	$push13=, $1, $pop64
+	i32.const	$push63=, 12345
+	i32.add 	$1=, $pop13, $pop63
+	i32.const	$push62=, 0
+	i32.const	$push61=, 16
+	i32.shr_u	$push14=, $1, $pop61
+	i32.store8	sB+6($pop62), $pop14
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push15=, $1, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$1=, $pop15, $pop59
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push16=, $1, $pop57
+	i32.store8	sB+7($pop58), $pop16
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push17=, $1, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$3=, $pop17, $pop55
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push18=, $3, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$1=, $pop18, $pop53
+	i32.const	$push52=, 0
+	i32.store	myrnd.s($pop52), $1
+	i32.const	$push51=, 0
+	i32.load	$0=, sB($pop51)
+	i32.const	$push50=, 131071
+	i32.and 	$2=, $0, $pop50
+	i32.const	$push49=, 16
+	i32.shr_u	$push19=, $3, $pop49
+	i32.const	$push48=, 2047
+	i32.and 	$3=, $pop19, $pop48
+	i32.const	$push47=, 17
+	i32.shl 	$push20=, $3, $pop47
+	i32.or  	$4=, $pop20, $2
+	i32.const	$push46=, 0
+	i32.store	sB($pop46), $4
+	i32.const	$push45=, 16
+	i32.shr_u	$push21=, $1, $pop45
+	i32.const	$push44=, 2047
+	i32.and 	$5=, $pop21, $pop44
 	block   	
-	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.add 	$push22=, $5, $3
 	i32.const	$push43=, 17
 	i32.shl 	$push23=, $5, $pop43
 	i32.add 	$push24=, $pop23, $4
@@ -480,49 +446,44 @@ testB:                                  # @testB
 	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	$push140=, 0
+# %bb.1:                                # %if.end76
 	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.add 	$1=, $pop28, $pop29
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push30=, $1, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$3=, $pop30, $pop99
+	i32.const	$push98=, 0
+	i32.store	myrnd.s($pop98), $3
+	i32.const	$push97=, 16
+	i32.shr_u	$push31=, $1, $pop97
+	i32.const	$push96=, 2047
+	i32.and 	$4=, $pop31, $pop96
+	i32.const	$push95=, 16
+	i32.shr_u	$push34=, $3, $pop95
+	i32.const	$push94=, 2047
+	i32.and 	$3=, $pop34, $pop94
+	i32.const	$push93=, 17
+	i32.shl 	$push35=, $3, $pop93
+	i32.const	$push92=, 17
+	i32.shl 	$push32=, $4, $pop92
 	i32.or  	$push33=, $pop32, $2
-	i32.add 	$push122=, $pop35, $pop33
-	tee_local	$push121=, $1=, $pop122
-	i32.store	sB($pop133), $pop121
+	i32.add 	$1=, $pop35, $pop33
+	i32.const	$push91=, 0
+	i32.store	sB($pop91), $1
 	i32.xor 	$push36=, $1, $0
-	i32.const	$push120=, 131071
-	i32.and 	$push37=, $pop36, $pop120
+	i32.const	$push90=, 131071
+	i32.and 	$push37=, $pop36, $pop90
 	br_if   	0, $pop37       # 0: down to label1
-# BB#2:                                 # %lor.lhs.false109
+# %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
+# %bb.3:                                # %if.end115
 	return
 .LBB12_4:                               # %if.then
 	end_block                       # label1:
@@ -538,7 +499,7 @@ testB:                                  # @testB
 	.type	retmeC,@function
 retmeC:                                 # @retmeC
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=2
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -553,7 +514,7 @@ retmeC:                                 # @retmeC
 fn1C:                                   # @fn1C
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
@@ -573,7 +534,7 @@ fn1C:                                   # @fn1C
 fn2C:                                   # @fn2C
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sC+4($pop0)
 	i32.const	$push2=, 17
@@ -594,7 +555,7 @@ fn2C:                                   # @fn2C
 	.type	retitC,@function
 retitC:                                 # @retitC
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sC+4($pop0)
 	i32.const	$push2=, 17
@@ -611,15 +572,14 @@ retitC:                                 # @retitC
 fn3C:                                   # @fn3C
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sC+4($pop8)
+	i32.load	$push3=, sC+4($pop2)
 	i32.const	$push0=, 17
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sC+4($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sC+4($pop6), $0
 	i32.const	$push5=, 17
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -633,117 +593,102 @@ fn3C:                                   # @fn3C
 	.type	testC,@function
 testC:                                  # @testC
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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=, $0=, $pop115
-	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 	$push4=, $pop106, $pop105
-	i32.const	$push104=, 12345
-	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
+# %bb.0:                                # %entry
+	i32.const	$push89=, 0
+	i32.load	$push0=, myrnd.s($pop89)
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$0=, $pop1, $pop87
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push2=, $0, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$1=, $pop2, $pop85
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push3=, $1, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$2=, $pop3, $pop83
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push4=, $2, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$3=, $pop4, $pop81
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push5=, $3, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$4=, $pop5, $pop79
 	i32.const	$push78=, 0
 	i32.const	$push77=, 16
-	i32.shr_u	$push13=, $0, $pop77
-	i32.store8	sC($pop78), $pop13
-	i32.const	$push76=, 0
-	i32.const	$push75=, 16
-	i32.shr_u	$push14=, $1, $pop75
-	i32.store8	sC+1($pop76), $pop14
+	i32.shr_u	$push6=, $4, $pop77
+	i32.store8	sC+4($pop78), $pop6
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push7=, $4, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$4=, $pop7, $pop75
 	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.shr_u	$push8=, $4, $pop73
+	i32.store8	sC+5($pop74), $pop8
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push9=, $4, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$4=, $pop9, $pop71
 	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
+	i32.const	$push69=, 16
+	i32.shr_u	$push10=, $4, $pop69
+	i32.store8	sC+6($pop70), $pop10
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push11=, $4, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$4=, $pop11, $pop67
+	i32.const	$push66=, 0
+	i32.const	$push65=, 16
+	i32.shr_u	$push12=, $4, $pop65
+	i32.store8	sC+7($pop66), $pop12
+	i32.const	$push64=, 0
+	i32.const	$push63=, 16
+	i32.shr_u	$push13=, $0, $pop63
+	i32.store8	sC($pop64), $pop13
+	i32.const	$push62=, 0
+	i32.const	$push61=, 16
+	i32.shr_u	$push14=, $1, $pop61
+	i32.store8	sC+1($pop62), $pop14
+	i32.const	$push60=, 0
+	i32.const	$push59=, 16
+	i32.shr_u	$push15=, $2, $pop59
+	i32.store8	sC+2($pop60), $pop15
+	i32.const	$push58=, 0
+	i32.const	$push57=, 16
+	i32.shr_u	$push16=, $3, $pop57
+	i32.store8	sC+3($pop58), $pop16
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push17=, $4, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$1=, $pop17, $pop55
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push18=, $1, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$0=, $pop18, $pop53
+	i32.const	$push52=, 0
+	i32.store	myrnd.s($pop52), $0
+	i32.const	$push51=, 0
+	i32.load	$2=, sC+4($pop51)
+	i32.const	$push50=, 131071
+	i32.and 	$3=, $2, $pop50
+	i32.const	$push49=, 16
+	i32.shr_u	$push19=, $1, $pop49
+	i32.const	$push48=, 2047
+	i32.and 	$1=, $pop19, $pop48
+	i32.const	$push47=, 17
+	i32.shl 	$push20=, $1, $pop47
+	i32.or  	$4=, $pop20, $3
+	i32.const	$push46=, 0
+	i32.store	sC+4($pop46), $4
+	i32.const	$push45=, 16
+	i32.shr_u	$push21=, $0, $pop45
+	i32.const	$push44=, 2047
+	i32.and 	$5=, $pop21, $pop44
 	block   	
-	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.add 	$push22=, $5, $1
 	i32.const	$push43=, 17
 	i32.shl 	$push23=, $5, $pop43
 	i32.add 	$push24=, $pop23, $4
@@ -751,49 +696,44 @@ testC:                                  # @testC
 	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	$push140=, 0
+# %bb.1:                                # %if.end80
 	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.add 	$0=, $pop28, $pop29
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push30=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$1=, $pop30, $pop99
+	i32.const	$push98=, 0
+	i32.store	myrnd.s($pop98), $1
+	i32.const	$push97=, 16
+	i32.shr_u	$push31=, $0, $pop97
+	i32.const	$push96=, 2047
+	i32.and 	$4=, $pop31, $pop96
+	i32.const	$push95=, 16
+	i32.shr_u	$push34=, $1, $pop95
+	i32.const	$push94=, 2047
+	i32.and 	$1=, $pop34, $pop94
+	i32.const	$push93=, 17
+	i32.shl 	$push35=, $1, $pop93
+	i32.const	$push92=, 17
+	i32.shl 	$push32=, $4, $pop92
 	i32.or  	$push33=, $pop32, $3
-	i32.add 	$push122=, $pop35, $pop33
-	tee_local	$push121=, $0=, $pop122
-	i32.store	sC+4($pop133), $pop121
+	i32.add 	$0=, $pop35, $pop33
+	i32.const	$push91=, 0
+	i32.store	sC+4($pop91), $0
 	i32.xor 	$push36=, $0, $2
-	i32.const	$push120=, 131071
-	i32.and 	$push37=, $pop36, $pop120
+	i32.const	$push90=, 131071
+	i32.and 	$push37=, $pop36, $pop90
 	br_if   	0, $pop37       # 0: down to label2
-# BB#2:                                 # %lor.lhs.false115
+# %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
+# %bb.3:                                # %if.end121
 	return
 .LBB18_4:                               # %if.then
 	end_block                       # label2:
@@ -809,7 +749,7 @@ testC:                                  # @testC
 	.type	retmeD,@function
 retmeD:                                 # @retmeD
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -824,7 +764,7 @@ retmeD:                                 # @retmeD
 fn1D:                                   # @fn1D
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sD($pop0)
 	i64.const	$push2=, 35
@@ -845,7 +785,7 @@ fn1D:                                   # @fn1D
 fn2D:                                   # @fn2D
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sD($pop0)
 	i64.const	$push2=, 35
@@ -867,7 +807,7 @@ fn2D:                                   # @fn2D
 	.type	retitD,@function
 retitD:                                 # @retitD
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sD($pop0)
 	i64.const	$push2=, 35
@@ -886,23 +826,21 @@ fn3D:                                   # @fn3D
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sD($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i64.load	$1=, sD($pop0)
 	i64.const	$push3=, 35
-	i64.shr_u	$push4=, $pop14, $pop3
+	i64.shr_u	$push4=, $1, $pop3
 	i32.wrap/i64	$push5=, $pop4
-	i32.add 	$push13=, $pop5, $0
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push6=, $pop12
+	i32.add 	$0=, $pop5, $0
+	i32.const	$push12=, 0
+	i64.extend_u/i32	$push6=, $0
 	i64.const	$push11=, 35
 	i64.shl 	$push7=, $pop6, $pop11
 	i64.const	$push1=, 34359738367
 	i64.and 	$push2=, $1, $pop1
 	i64.or  	$push8=, $pop7, $pop2
-	i64.store	sD($pop0), $pop8
+	i64.store	sD($pop12), $pop8
 	i32.const	$push9=, 536870911
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -916,93 +854,83 @@ fn3D:                                   # @fn3D
 	.type	testD,@function
 testD:                                  # @testD
 	.local  	i32, i32
-# BB#0:                                 # %if.end158
+# %bb.0:                                # %if.end158
 	i32.const	$push0=, 0
-	i32.const	$push94=, 0
-	i32.load	$push1=, myrnd.s($pop94)
+	i32.load	$push1=, myrnd.s($pop0)
 	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 	$0=, $pop3, $pop4
+	i32.const	$push74=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop92, $pop5
-	i32.store8	sD($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sD($pop74), $pop6
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push7=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop7, $pop72
+	i32.const	$push71=, 0
+	i32.const	$push70=, 16
+	i32.shr_u	$push8=, $0, $pop70
+	i32.store8	sD+1($pop71), $pop8
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push9=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop9, $pop68
 	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	$push66=, 16
+	i32.shr_u	$push10=, $0, $pop66
+	i32.store8	sD+2($pop67), $pop10
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push11=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop11, $pop64
+	i32.const	$push63=, 0
 	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.shr_u	$push12=, $0, $pop62
+	i32.store8	sD+3($pop63), $pop12
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push13=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop13, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push14=, $0, $pop58
+	i32.store8	sD+4($pop59), $pop14
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push15=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop15, $pop56
 	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	$push54=, 16
+	i32.shr_u	$push16=, $0, $pop54
+	i32.store8	sD+5($pop55), $pop16
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push17=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop17, $pop52
+	i32.const	$push51=, 0
 	i32.const	$push50=, 16
-	i32.shr_u	$push20=, $pop51, $pop50
-	i32.store8	sD+7($pop55), $pop20
-	i32.const	$push49=, 0
+	i32.shr_u	$push18=, $0, $pop50
+	i32.store8	sD+6($pop51), $pop18
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push19=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop19, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push20=, $0, $pop46
+	i32.store8	sD+7($pop47), $pop20
 	i32.const	$push21=, -341751747
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, 229283573
-	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.add 	$0=, $pop22, $pop23
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push24=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$1=, $pop24, $pop44
+	i32.const	$push43=, 0
+	i32.store	myrnd.s($pop43), $1
 	i32.const	$push42=, 0
 	i32.const	$push41=, 16
 	i32.shr_u	$push28=, $1, $pop41
@@ -1033,7 +961,7 @@ testD:                                  # @testD
 	.type	retmeE,@function
 retmeE:                                 # @retmeE
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -1054,7 +982,7 @@ retmeE:                                 # @retmeE
 fn1E:                                   # @fn1E
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sE+8($pop0)
 	i64.const	$push2=, 35
@@ -1075,7 +1003,7 @@ fn1E:                                   # @fn1E
 fn2E:                                   # @fn2E
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sE+8($pop0)
 	i64.const	$push2=, 35
@@ -1097,7 +1025,7 @@ fn2E:                                   # @fn2E
 	.type	retitE,@function
 retitE:                                 # @retitE
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sE+8($pop0)
 	i64.const	$push2=, 35
@@ -1116,23 +1044,21 @@ fn3E:                                   # @fn3E
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sE+8($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i64.load	$1=, sE+8($pop0)
 	i64.const	$push3=, 35
-	i64.shr_u	$push4=, $pop14, $pop3
+	i64.shr_u	$push4=, $1, $pop3
 	i32.wrap/i64	$push5=, $pop4
-	i32.add 	$push13=, $pop5, $0
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push6=, $pop12
+	i32.add 	$0=, $pop5, $0
+	i32.const	$push12=, 0
+	i64.extend_u/i32	$push6=, $0
 	i64.const	$push11=, 35
 	i64.shl 	$push7=, $pop6, $pop11
 	i64.const	$push1=, 34359738367
 	i64.and 	$push2=, $1, $pop1
 	i64.or  	$push8=, $pop7, $pop2
-	i64.store	sE+8($pop0), $pop8
+	i64.store	sE+8($pop12), $pop8
 	i32.const	$push9=, 536870911
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -1146,165 +1072,147 @@ fn3E:                                   # @fn3E
 	.type	testE,@function
 testE:                                  # @testE
 	.local  	i32, i32
-# BB#0:                                 # %if.end95
+# %bb.0:                                # %if.end95
 	i32.const	$push0=, 0
-	i32.const	$push158=, 0
-	i32.load	$push1=, myrnd.s($pop158)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push157=, $pop3, $pop4
-	tee_local	$push156=, $0=, $pop157
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push122=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop156, $pop5
-	i32.store8	sE($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sE($pop122), $pop6
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push7=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$0=, $pop7, $pop120
 	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	$push118=, 16
+	i32.shr_u	$push8=, $0, $pop118
+	i32.store8	sE+1($pop119), $pop8
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push9=, $0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$0=, $pop9, $pop116
+	i32.const	$push115=, 0
 	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.shr_u	$push10=, $0, $pop114
+	i32.store8	sE+2($pop115), $pop10
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push11=, $0, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$0=, $pop11, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push12=, $0, $pop110
+	i32.store8	sE+3($pop111), $pop12
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push13=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$0=, $pop13, $pop108
 	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	$push106=, 16
+	i32.shr_u	$push14=, $0, $pop106
+	i32.store8	sE+4($pop107), $pop14
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push15=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$0=, $pop15, $pop104
+	i32.const	$push103=, 0
 	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.shr_u	$push16=, $0, $pop102
+	i32.store8	sE+5($pop103), $pop16
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push17=, $0, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$0=, $pop17, $pop100
+	i32.const	$push99=, 0
+	i32.const	$push98=, 16
+	i32.shr_u	$push18=, $0, $pop98
+	i32.store8	sE+6($pop99), $pop18
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push19=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$0=, $pop19, $pop96
 	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	$push94=, 16
+	i32.shr_u	$push20=, $0, $pop94
+	i32.store8	sE+7($pop95), $pop20
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push21=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$0=, $pop21, $pop92
+	i32.const	$push91=, 0
 	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.shr_u	$push22=, $0, $pop90
+	i32.store8	sE+8($pop91), $pop22
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push23=, $0, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop23, $pop88
+	i32.const	$push87=, 0
+	i32.const	$push86=, 16
+	i32.shr_u	$push24=, $0, $pop86
+	i32.store8	sE+9($pop87), $pop24
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push25=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$0=, $pop25, $pop84
 	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	$push82=, 16
+	i32.shr_u	$push26=, $0, $pop82
+	i32.store8	sE+10($pop83), $pop26
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push27=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop27, $pop80
+	i32.const	$push79=, 0
 	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.shr_u	$push28=, $0, $pop78
+	i32.store8	sE+11($pop79), $pop28
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push29=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop29, $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push30=, $0, $pop74
+	i32.store8	sE+12($pop75), $pop30
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push31=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop31, $pop72
 	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	$push70=, 16
+	i32.shr_u	$push32=, $0, $pop70
+	i32.store8	sE+13($pop71), $pop32
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push33=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop33, $pop68
+	i32.const	$push67=, 0
 	i32.const	$push66=, 16
-	i32.shr_u	$push36=, $pop67, $pop66
-	i32.store8	sE+15($pop71), $pop36
-	i32.const	$push65=, 0
+	i32.shr_u	$push34=, $0, $pop66
+	i32.store8	sE+14($pop67), $pop34
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push35=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop35, $pop64
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push36=, $0, $pop62
+	i32.store8	sE+15($pop63), $pop36
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	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.add 	$0=, $pop38, $pop39
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push40=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$1=, $pop40, $pop60
+	i32.const	$push59=, 0
+	i32.store	myrnd.s($pop59), $1
 	i32.const	$push58=, 0
 	i32.const	$push57=, 16
 	i32.shr_u	$push44=, $1, $pop57
@@ -1335,7 +1243,7 @@ testE:                                  # @testE
 	.type	retmeF,@function
 retmeF:                                 # @retmeF
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -1356,7 +1264,7 @@ retmeF:                                 # @retmeF
 fn1F:                                   # @fn1F
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sF($pop0)
 	i64.const	$push2=, 35
@@ -1377,7 +1285,7 @@ fn1F:                                   # @fn1F
 fn2F:                                   # @fn2F
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sF($pop0)
 	i64.const	$push2=, 35
@@ -1399,7 +1307,7 @@ fn2F:                                   # @fn2F
 	.type	retitF,@function
 retitF:                                 # @retitF
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sF($pop0)
 	i64.const	$push2=, 35
@@ -1418,23 +1326,21 @@ fn3F:                                   # @fn3F
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sF($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i64.load	$1=, sF($pop0)
 	i64.const	$push3=, 35
-	i64.shr_u	$push4=, $pop14, $pop3
+	i64.shr_u	$push4=, $1, $pop3
 	i32.wrap/i64	$push5=, $pop4
-	i32.add 	$push13=, $pop5, $0
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push6=, $pop12
+	i32.add 	$0=, $pop5, $0
+	i32.const	$push12=, 0
+	i64.extend_u/i32	$push6=, $0
 	i64.const	$push11=, 35
 	i64.shl 	$push7=, $pop6, $pop11
 	i64.const	$push1=, 34359738367
 	i64.and 	$push2=, $1, $pop1
 	i64.or  	$push8=, $pop7, $pop2
-	i64.store	sF($pop0), $pop8
+	i64.store	sF($pop12), $pop8
 	i32.const	$push9=, 536870911
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -1448,165 +1354,147 @@ fn3F:                                   # @fn3F
 	.type	testF,@function
 testF:                                  # @testF
 	.local  	i32, i32
-# BB#0:                                 # %if.end91
+# %bb.0:                                # %if.end91
 	i32.const	$push0=, 0
-	i32.const	$push158=, 0
-	i32.load	$push1=, myrnd.s($pop158)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push157=, $pop3, $pop4
-	tee_local	$push156=, $0=, $pop157
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push122=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop156, $pop5
-	i32.store8	sF($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sF($pop122), $pop6
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push7=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$0=, $pop7, $pop120
 	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	$push118=, 16
+	i32.shr_u	$push8=, $0, $pop118
+	i32.store8	sF+1($pop119), $pop8
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push9=, $0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$0=, $pop9, $pop116
+	i32.const	$push115=, 0
 	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.shr_u	$push10=, $0, $pop114
+	i32.store8	sF+2($pop115), $pop10
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push11=, $0, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$0=, $pop11, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push12=, $0, $pop110
+	i32.store8	sF+3($pop111), $pop12
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push13=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$0=, $pop13, $pop108
 	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	$push106=, 16
+	i32.shr_u	$push14=, $0, $pop106
+	i32.store8	sF+4($pop107), $pop14
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push15=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$0=, $pop15, $pop104
+	i32.const	$push103=, 0
 	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.shr_u	$push16=, $0, $pop102
+	i32.store8	sF+5($pop103), $pop16
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push17=, $0, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$0=, $pop17, $pop100
+	i32.const	$push99=, 0
+	i32.const	$push98=, 16
+	i32.shr_u	$push18=, $0, $pop98
+	i32.store8	sF+6($pop99), $pop18
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push19=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$0=, $pop19, $pop96
 	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	$push94=, 16
+	i32.shr_u	$push20=, $0, $pop94
+	i32.store8	sF+7($pop95), $pop20
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push21=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$0=, $pop21, $pop92
+	i32.const	$push91=, 0
 	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.shr_u	$push22=, $0, $pop90
+	i32.store8	sF+8($pop91), $pop22
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push23=, $0, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop23, $pop88
+	i32.const	$push87=, 0
+	i32.const	$push86=, 16
+	i32.shr_u	$push24=, $0, $pop86
+	i32.store8	sF+9($pop87), $pop24
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push25=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$0=, $pop25, $pop84
 	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	$push82=, 16
+	i32.shr_u	$push26=, $0, $pop82
+	i32.store8	sF+10($pop83), $pop26
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push27=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop27, $pop80
+	i32.const	$push79=, 0
 	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.shr_u	$push28=, $0, $pop78
+	i32.store8	sF+11($pop79), $pop28
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push29=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop29, $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push30=, $0, $pop74
+	i32.store8	sF+12($pop75), $pop30
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push31=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop31, $pop72
 	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	$push70=, 16
+	i32.shr_u	$push32=, $0, $pop70
+	i32.store8	sF+13($pop71), $pop32
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push33=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop33, $pop68
+	i32.const	$push67=, 0
 	i32.const	$push66=, 16
-	i32.shr_u	$push36=, $pop67, $pop66
-	i32.store8	sF+15($pop71), $pop36
-	i32.const	$push65=, 0
+	i32.shr_u	$push34=, $0, $pop66
+	i32.store8	sF+14($pop67), $pop34
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push35=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop35, $pop64
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push36=, $0, $pop62
+	i32.store8	sF+15($pop63), $pop36
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	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.add 	$0=, $pop38, $pop39
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push40=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$1=, $pop40, $pop60
+	i32.const	$push59=, 0
+	i32.store	myrnd.s($pop59), $1
 	i32.const	$push58=, 0
 	i32.const	$push57=, 16
 	i32.shr_u	$push44=, $1, $pop57
@@ -1637,7 +1525,7 @@ testF:                                  # @testF
 	.type	retmeG,@function
 retmeG:                                 # @retmeG
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -1658,7 +1546,7 @@ retmeG:                                 # @retmeG
 fn1G:                                   # @fn1G
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push3=, sG($pop2)
 	i32.const	$push0=, 25
@@ -1678,7 +1566,7 @@ fn1G:                                   # @fn1G
 fn2G:                                   # @fn2G
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sG($pop0)
 	i32.const	$push2=, 25
@@ -1699,7 +1587,7 @@ fn2G:                                   # @fn2G
 	.type	retitG,@function
 retitG:                                 # @retitG
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sG($pop0)
 	i32.const	$push2=, 25
@@ -1716,15 +1604,14 @@ retitG:                                 # @retitG
 fn3G:                                   # @fn3G
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sG($pop8)
+	i32.load	$push3=, sG($pop2)
 	i32.const	$push0=, 25
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sG($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sG($pop6), $0
 	i32.const	$push5=, 25
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -1738,185 +1625,162 @@ fn3G:                                   # @fn3G
 	.type	testG,@function
 testG:                                  # @testG
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push135=, 0
+	i32.load	$push0=, myrnd.s($pop135)
+	i32.const	$push134=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop134
+	i32.const	$push133=, 12345
+	i32.add 	$1=, $pop1, $pop133
 	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	$push131=, 16
+	i32.shr_u	$push2=, $1, $pop131
+	i32.store8	sG($pop132), $pop2
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push3=, $1, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$1=, $pop3, $pop129
+	i32.const	$push128=, 0
 	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.shr_u	$push4=, $1, $pop127
+	i32.store8	sG+1($pop128), $pop4
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push5=, $1, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$1=, $pop5, $pop125
+	i32.const	$push124=, 0
+	i32.const	$push123=, 16
+	i32.shr_u	$push6=, $1, $pop123
+	i32.store8	sG+2($pop124), $pop6
+	i32.const	$push122=, 1103515245
+	i32.mul 	$push7=, $1, $pop122
+	i32.const	$push121=, 12345
+	i32.add 	$1=, $pop7, $pop121
 	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	$push119=, 16
+	i32.shr_u	$push8=, $1, $pop119
+	i32.store8	sG+3($pop120), $pop8
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push9=, $1, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$1=, $pop9, $pop117
+	i32.const	$push116=, 0
 	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.shr_u	$push10=, $1, $pop115
+	i32.store8	sG+4($pop116), $pop10
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push11=, $1, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$1=, $pop11, $pop113
+	i32.const	$push112=, 0
+	i32.const	$push111=, 16
+	i32.shr_u	$push12=, $1, $pop111
+	i32.store8	sG+5($pop112), $pop12
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push13=, $1, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$1=, $pop13, $pop109
 	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	$push107=, 16
+	i32.shr_u	$push14=, $1, $pop107
+	i32.store8	sG+6($pop108), $pop14
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push15=, $1, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$1=, $pop15, $pop105
+	i32.const	$push104=, 0
 	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.shr_u	$push16=, $1, $pop103
+	i32.store8	sG+7($pop104), $pop16
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push17=, $1, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$1=, $pop17, $pop101
+	i32.const	$push100=, 0
+	i32.const	$push99=, 16
+	i32.shr_u	$push18=, $1, $pop99
+	i32.store8	sG+8($pop100), $pop18
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push19=, $1, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$1=, $pop19, $pop97
 	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	$push95=, 16
+	i32.shr_u	$push20=, $1, $pop95
+	i32.store8	sG+9($pop96), $pop20
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push21=, $1, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$1=, $pop21, $pop93
+	i32.const	$push92=, 0
 	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.shr_u	$push22=, $1, $pop91
+	i32.store8	sG+10($pop92), $pop22
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push23=, $1, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$1=, $pop23, $pop89
+	i32.const	$push88=, 0
+	i32.const	$push87=, 16
+	i32.shr_u	$push24=, $1, $pop87
+	i32.store8	sG+11($pop88), $pop24
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push25=, $1, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$1=, $pop25, $pop85
 	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=, $pop68, $pop67
-	tee_local	$push65=, $2=, $pop66
-	i32.or  	$push64=, $pop35, $pop65
-	tee_local	$push63=, $4=, $pop64
-	i32.store	sG($pop75), $pop63
+	i32.const	$push83=, 16
+	i32.shr_u	$push26=, $1, $pop83
+	i32.store8	sG+12($pop84), $pop26
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push27=, $1, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$1=, $pop27, $pop81
+	i32.const	$push80=, 0
+	i32.const	$push79=, 16
+	i32.shr_u	$push28=, $1, $pop79
+	i32.store8	sG+13($pop80), $pop28
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push29=, $1, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$1=, $pop29, $pop77
+	i32.const	$push76=, 0
+	i32.const	$push75=, 16
+	i32.shr_u	$push30=, $1, $pop75
+	i32.store8	sG+14($pop76), $pop30
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push31=, $1, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$1=, $pop31, $pop73
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push32=, $1, $pop71
+	i32.store8	sG+15($pop72), $pop32
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push33=, $1, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$3=, $pop33, $pop69
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push34=, $3, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$1=, $pop34, $pop67
+	i32.const	$push66=, 0
+	i32.store	myrnd.s($pop66), $1
+	i32.const	$push65=, 0
+	i32.load	$0=, sG($pop65)
+	i32.const	$push64=, 33554431
+	i32.and 	$2=, $0, $pop64
+	i32.const	$push63=, 16
+	i32.shr_u	$3=, $3, $pop63
+	i32.const	$push62=, 25
+	i32.shl 	$push35=, $3, $pop62
+	i32.or  	$4=, $pop35, $2
+	i32.const	$push61=, 0
+	i32.store	sG($pop61), $4
+	i32.const	$push60=, 16
+	i32.shr_u	$5=, $1, $pop60
 	block   	
-	i32.const	$push62=, 16
-	i32.shr_u	$push61=, $1, $pop62
-	tee_local	$push60=, $5=, $pop61
-	i32.add 	$push36=, $pop60, $3
+	i32.add 	$push36=, $5, $3
 	i32.const	$push37=, 127
 	i32.and 	$push38=, $pop36, $pop37
 	i32.const	$push59=, 25
@@ -1926,39 +1790,34 @@ testG:                                  # @testG
 	i32.shr_u	$push41=, $pop40, $pop58
 	i32.ne  	$push42=, $pop38, $pop41
 	br_if   	0, $pop42       # 0: down to label3
-# BB#1:                                 # %if.end76
-	i32.const	$push200=, 0
+# %bb.1:                                # %if.end76
 	i32.const	$push43=, -2139243339
 	i32.mul 	$push44=, $1, $pop43
 	i32.const	$push45=, -1492899873
-	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.add 	$1=, $pop44, $pop45
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push46=, $1, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$3=, $pop46, $pop143
+	i32.const	$push142=, 0
+	i32.store	myrnd.s($pop142), $3
+	i32.const	$push141=, 16
+	i32.shr_u	$4=, $1, $pop141
+	i32.const	$push140=, 16
+	i32.shr_u	$3=, $3, $pop140
+	i32.const	$push139=, 25
+	i32.shl 	$push49=, $3, $pop139
+	i32.const	$push138=, 25
+	i32.shl 	$push47=, $4, $pop138
 	i32.or  	$push48=, $pop47, $2
-	i32.add 	$push184=, $pop49, $pop48
-	tee_local	$push183=, $1=, $pop184
-	i32.store	sG($pop193), $pop183
+	i32.add 	$1=, $pop49, $pop48
+	i32.const	$push137=, 0
+	i32.store	sG($pop137), $1
 	i32.xor 	$push50=, $1, $0
-	i32.const	$push182=, 33554431
-	i32.and 	$push51=, $pop50, $pop182
+	i32.const	$push136=, 33554431
+	i32.and 	$push51=, $pop50, $pop136
 	br_if   	0, $pop51       # 0: down to label3
-# BB#2:                                 # %lor.lhs.false109
+# %bb.2:                                # %lor.lhs.false109
 	i32.add 	$push54=, $3, $4
 	i32.const	$push55=, 127
 	i32.and 	$push56=, $pop54, $pop55
@@ -1966,7 +1825,7 @@ testG:                                  # @testG
 	i32.shr_u	$push53=, $1, $pop52
 	i32.ne  	$push57=, $pop56, $pop53
 	br_if   	0, $pop57       # 0: down to label3
-# BB#3:                                 # %if.end115
+# %bb.3:                                # %if.end115
 	return
 .LBB42_4:                               # %if.then
 	end_block                       # label3:
@@ -1982,7 +1841,7 @@ testG:                                  # @testG
 	.type	retmeH,@function
 retmeH:                                 # @retmeH
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -2003,7 +1862,7 @@ retmeH:                                 # @retmeH
 fn1H:                                   # @fn1H
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push3=, sH($pop2)
 	i32.const	$push0=, 23
@@ -2023,7 +1882,7 @@ fn1H:                                   # @fn1H
 fn2H:                                   # @fn2H
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sH($pop0)
 	i32.const	$push2=, 23
@@ -2044,7 +1903,7 @@ fn2H:                                   # @fn2H
 	.type	retitH,@function
 retitH:                                 # @retitH
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sH($pop0)
 	i32.const	$push2=, 23
@@ -2061,15 +1920,14 @@ retitH:                                 # @retitH
 fn3H:                                   # @fn3H
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sH($pop8)
+	i32.load	$push3=, sH($pop2)
 	i32.const	$push0=, 23
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sH($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sH($pop6), $0
 	i32.const	$push5=, 23
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -2083,185 +1941,162 @@ fn3H:                                   # @fn3H
 	.type	testH,@function
 testH:                                  # @testH
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push135=, 0
+	i32.load	$push0=, myrnd.s($pop135)
+	i32.const	$push134=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop134
+	i32.const	$push133=, 12345
+	i32.add 	$1=, $pop1, $pop133
 	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	$push131=, 16
+	i32.shr_u	$push2=, $1, $pop131
+	i32.store8	sH($pop132), $pop2
+	i32.const	$push130=, 1103515245
+	i32.mul 	$push3=, $1, $pop130
+	i32.const	$push129=, 12345
+	i32.add 	$1=, $pop3, $pop129
+	i32.const	$push128=, 0
 	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.shr_u	$push4=, $1, $pop127
+	i32.store8	sH+1($pop128), $pop4
+	i32.const	$push126=, 1103515245
+	i32.mul 	$push5=, $1, $pop126
+	i32.const	$push125=, 12345
+	i32.add 	$1=, $pop5, $pop125
+	i32.const	$push124=, 0
+	i32.const	$push123=, 16
+	i32.shr_u	$push6=, $1, $pop123
+	i32.store8	sH+2($pop124), $pop6
+	i32.const	$push122=, 1103515245
+	i32.mul 	$push7=, $1, $pop122
+	i32.const	$push121=, 12345
+	i32.add 	$1=, $pop7, $pop121
 	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	$push119=, 16
+	i32.shr_u	$push8=, $1, $pop119
+	i32.store8	sH+3($pop120), $pop8
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push9=, $1, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$1=, $pop9, $pop117
+	i32.const	$push116=, 0
 	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.shr_u	$push10=, $1, $pop115
+	i32.store8	sH+4($pop116), $pop10
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push11=, $1, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$1=, $pop11, $pop113
+	i32.const	$push112=, 0
+	i32.const	$push111=, 16
+	i32.shr_u	$push12=, $1, $pop111
+	i32.store8	sH+5($pop112), $pop12
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push13=, $1, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$1=, $pop13, $pop109
 	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	$push107=, 16
+	i32.shr_u	$push14=, $1, $pop107
+	i32.store8	sH+6($pop108), $pop14
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push15=, $1, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$1=, $pop15, $pop105
+	i32.const	$push104=, 0
 	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.shr_u	$push16=, $1, $pop103
+	i32.store8	sH+7($pop104), $pop16
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push17=, $1, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$1=, $pop17, $pop101
+	i32.const	$push100=, 0
+	i32.const	$push99=, 16
+	i32.shr_u	$push18=, $1, $pop99
+	i32.store8	sH+8($pop100), $pop18
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push19=, $1, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$1=, $pop19, $pop97
 	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	$push95=, 16
+	i32.shr_u	$push20=, $1, $pop95
+	i32.store8	sH+9($pop96), $pop20
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push21=, $1, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$1=, $pop21, $pop93
+	i32.const	$push92=, 0
 	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.shr_u	$push22=, $1, $pop91
+	i32.store8	sH+10($pop92), $pop22
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push23=, $1, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$1=, $pop23, $pop89
+	i32.const	$push88=, 0
+	i32.const	$push87=, 16
+	i32.shr_u	$push24=, $1, $pop87
+	i32.store8	sH+11($pop88), $pop24
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push25=, $1, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$1=, $pop25, $pop85
 	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=, $pop68, $pop67
-	tee_local	$push65=, $2=, $pop66
-	i32.or  	$push64=, $pop35, $pop65
-	tee_local	$push63=, $4=, $pop64
-	i32.store	sH($pop75), $pop63
+	i32.const	$push83=, 16
+	i32.shr_u	$push26=, $1, $pop83
+	i32.store8	sH+12($pop84), $pop26
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push27=, $1, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$1=, $pop27, $pop81
+	i32.const	$push80=, 0
+	i32.const	$push79=, 16
+	i32.shr_u	$push28=, $1, $pop79
+	i32.store8	sH+13($pop80), $pop28
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push29=, $1, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$1=, $pop29, $pop77
+	i32.const	$push76=, 0
+	i32.const	$push75=, 16
+	i32.shr_u	$push30=, $1, $pop75
+	i32.store8	sH+14($pop76), $pop30
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push31=, $1, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$1=, $pop31, $pop73
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push32=, $1, $pop71
+	i32.store8	sH+15($pop72), $pop32
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push33=, $1, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$3=, $pop33, $pop69
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push34=, $3, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$1=, $pop34, $pop67
+	i32.const	$push66=, 0
+	i32.store	myrnd.s($pop66), $1
+	i32.const	$push65=, 0
+	i32.load	$0=, sH($pop65)
+	i32.const	$push64=, 8388607
+	i32.and 	$2=, $0, $pop64
+	i32.const	$push63=, 16
+	i32.shr_u	$3=, $3, $pop63
+	i32.const	$push62=, 23
+	i32.shl 	$push35=, $3, $pop62
+	i32.or  	$4=, $pop35, $2
+	i32.const	$push61=, 0
+	i32.store	sH($pop61), $4
+	i32.const	$push60=, 16
+	i32.shr_u	$5=, $1, $pop60
 	block   	
-	i32.const	$push62=, 16
-	i32.shr_u	$push61=, $1, $pop62
-	tee_local	$push60=, $5=, $pop61
-	i32.add 	$push36=, $pop60, $3
+	i32.add 	$push36=, $5, $3
 	i32.const	$push37=, 511
 	i32.and 	$push38=, $pop36, $pop37
 	i32.const	$push59=, 23
@@ -2271,39 +2106,34 @@ testH:                                  # @testH
 	i32.shr_u	$push41=, $pop40, $pop58
 	i32.ne  	$push42=, $pop38, $pop41
 	br_if   	0, $pop42       # 0: down to label4
-# BB#1:                                 # %if.end76
-	i32.const	$push200=, 0
+# %bb.1:                                # %if.end76
 	i32.const	$push43=, -2139243339
 	i32.mul 	$push44=, $1, $pop43
 	i32.const	$push45=, -1492899873
-	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.add 	$1=, $pop44, $pop45
+	i32.const	$push144=, 1103515245
+	i32.mul 	$push46=, $1, $pop144
+	i32.const	$push143=, 12345
+	i32.add 	$3=, $pop46, $pop143
+	i32.const	$push142=, 0
+	i32.store	myrnd.s($pop142), $3
+	i32.const	$push141=, 16
+	i32.shr_u	$4=, $1, $pop141
+	i32.const	$push140=, 16
+	i32.shr_u	$3=, $3, $pop140
+	i32.const	$push139=, 23
+	i32.shl 	$push49=, $3, $pop139
+	i32.const	$push138=, 23
+	i32.shl 	$push47=, $4, $pop138
 	i32.or  	$push48=, $pop47, $2
-	i32.add 	$push184=, $pop49, $pop48
-	tee_local	$push183=, $1=, $pop184
-	i32.store	sH($pop193), $pop183
+	i32.add 	$1=, $pop49, $pop48
+	i32.const	$push137=, 0
+	i32.store	sH($pop137), $1
 	i32.xor 	$push50=, $1, $0
-	i32.const	$push182=, 8388607
-	i32.and 	$push51=, $pop50, $pop182
+	i32.const	$push136=, 8388607
+	i32.and 	$push51=, $pop50, $pop136
 	br_if   	0, $pop51       # 0: down to label4
-# BB#2:                                 # %lor.lhs.false109
+# %bb.2:                                # %lor.lhs.false109
 	i32.add 	$push54=, $3, $4
 	i32.const	$push55=, 511
 	i32.and 	$push56=, $pop54, $pop55
@@ -2311,7 +2141,7 @@ testH:                                  # @testH
 	i32.shr_u	$push53=, $1, $pop52
 	i32.ne  	$push57=, $pop56, $pop53
 	br_if   	0, $pop57       # 0: down to label4
-# BB#3:                                 # %if.end115
+# %bb.3:                                # %if.end115
 	return
 .LBB48_4:                               # %if.then
 	end_block                       # label4:
@@ -2327,7 +2157,7 @@ testH:                                  # @testH
 	.type	retmeI,@function
 retmeI:                                 # @retmeI
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -2348,7 +2178,7 @@ retmeI:                                 # @retmeI
 fn1I:                                   # @fn1I
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sI($pop0)
 	i32.const	$push2=, 7
@@ -2368,7 +2198,7 @@ fn1I:                                   # @fn1I
 fn2I:                                   # @fn2I
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sI($pop0)
 	i32.const	$push2=, 7
@@ -2389,7 +2219,7 @@ fn2I:                                   # @fn2I
 	.type	retitI,@function
 retitI:                                 # @retitI
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sI($pop0)
 	i32.const	$push2=, 7
@@ -2407,21 +2237,19 @@ fn3I:                                   # @fn3I
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, sI($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, sI($pop0)
 	i32.const	$push3=, 7
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 7
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 127
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store16	sI($pop0), $pop6
+	i32.store16	sI($pop10), $pop6
 	i32.const	$push7=, 511
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -2435,193 +2263,172 @@ fn3I:                                   # @fn3I
 	.type	testI,@function
 testI:                                  # @testI
 	.local  	i32, i32, i32
-# BB#0:                                 # %lor.lhs.false130
+# %bb.0:                                # %lor.lhs.false130
 	i32.const	$push0=, 0
-	i32.const	$push164=, 0
-	i32.load	$push1=, myrnd.s($pop164)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push163=, $pop3, $pop4
-	tee_local	$push162=, $0=, $pop163
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push122=, 0
 	i32.const	$push5=, 16
-	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 	$push11=, $0, $pop148
-	i32.const	$push147=, 12345
-	i32.add 	$push146=, $pop11, $pop147
-	tee_local	$push145=, $0=, $pop146
-	i32.const	$push144=, 16
-	i32.shr_u	$push12=, $pop145, $pop144
-	i32.store8	sI+3($pop149), $pop12
-	i32.const	$push143=, 0
-	i32.const	$push142=, 1103515245
-	i32.mul 	$push13=, $0, $pop142
-	i32.const	$push141=, 12345
-	i32.add 	$push140=, $pop13, $pop141
-	tee_local	$push139=, $0=, $pop140
-	i32.const	$push138=, 16
-	i32.shr_u	$push14=, $pop139, $pop138
-	i32.store8	sI+4($pop143), $pop14
-	i32.const	$push137=, 0
-	i32.const	$push136=, 1103515245
-	i32.mul 	$push15=, $0, $pop136
-	i32.const	$push135=, 12345
-	i32.add 	$push134=, $pop15, $pop135
-	tee_local	$push133=, $0=, $pop134
-	i32.const	$push132=, 16
-	i32.shr_u	$push16=, $pop133, $pop132
-	i32.store8	sI+5($pop137), $pop16
-	i32.const	$push131=, 0
-	i32.const	$push130=, 1103515245
-	i32.mul 	$push17=, $0, $pop130
-	i32.const	$push129=, 12345
-	i32.add 	$push128=, $pop17, $pop129
-	tee_local	$push127=, $0=, $pop128
-	i32.const	$push126=, 16
-	i32.shr_u	$push18=, $pop127, $pop126
-	i32.store8	sI+6($pop131), $pop18
-	i32.const	$push125=, 0
-	i32.const	$push124=, 1103515245
-	i32.mul 	$push19=, $0, $pop124
-	i32.const	$push123=, 12345
-	i32.add 	$push122=, $pop19, $pop123
-	tee_local	$push121=, $0=, $pop122
-	i32.const	$push120=, 16
-	i32.shr_u	$push20=, $pop121, $pop120
-	i32.store8	sI+7($pop125), $pop20
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sI($pop122), $pop6
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push7=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$0=, $pop7, $pop120
 	i32.const	$push119=, 0
-	i32.const	$push118=, 1103515245
-	i32.mul 	$push21=, $0, $pop118
-	i32.const	$push117=, 12345
-	i32.add 	$push116=, $pop21, $pop117
-	tee_local	$push115=, $0=, $pop116
+	i32.const	$push118=, 16
+	i32.shr_u	$push8=, $0, $pop118
+	i32.store8	sI+1($pop119), $pop8
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push9=, $0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$0=, $pop9, $pop116
+	i32.const	$push115=, 0
 	i32.const	$push114=, 16
-	i32.shr_u	$push22=, $pop115, $pop114
-	i32.store8	sI+8($pop119), $pop22
-	i32.const	$push113=, 0
-	i32.const	$push112=, 1103515245
-	i32.mul 	$push23=, $0, $pop112
-	i32.const	$push111=, 12345
-	i32.add 	$push110=, $pop23, $pop111
-	tee_local	$push109=, $0=, $pop110
-	i32.const	$push108=, 16
-	i32.shr_u	$push24=, $pop109, $pop108
-	i32.store8	sI+9($pop113), $pop24
+	i32.shr_u	$push10=, $0, $pop114
+	i32.store8	sI+2($pop115), $pop10
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push11=, $0, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$0=, $pop11, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push12=, $0, $pop110
+	i32.store8	sI+3($pop111), $pop12
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push13=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$0=, $pop13, $pop108
 	i32.const	$push107=, 0
-	i32.const	$push106=, 1103515245
-	i32.mul 	$push25=, $0, $pop106
-	i32.const	$push105=, 12345
-	i32.add 	$push104=, $pop25, $pop105
-	tee_local	$push103=, $0=, $pop104
+	i32.const	$push106=, 16
+	i32.shr_u	$push14=, $0, $pop106
+	i32.store8	sI+4($pop107), $pop14
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push15=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$0=, $pop15, $pop104
+	i32.const	$push103=, 0
 	i32.const	$push102=, 16
-	i32.shr_u	$push26=, $pop103, $pop102
-	i32.store8	sI+10($pop107), $pop26
-	i32.const	$push101=, 0
-	i32.const	$push100=, 1103515245
-	i32.mul 	$push27=, $0, $pop100
-	i32.const	$push99=, 12345
-	i32.add 	$push98=, $pop27, $pop99
-	tee_local	$push97=, $0=, $pop98
-	i32.const	$push96=, 16
-	i32.shr_u	$push28=, $pop97, $pop96
-	i32.store8	sI+11($pop101), $pop28
+	i32.shr_u	$push16=, $0, $pop102
+	i32.store8	sI+5($pop103), $pop16
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push17=, $0, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$0=, $pop17, $pop100
+	i32.const	$push99=, 0
+	i32.const	$push98=, 16
+	i32.shr_u	$push18=, $0, $pop98
+	i32.store8	sI+6($pop99), $pop18
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push19=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$0=, $pop19, $pop96
 	i32.const	$push95=, 0
-	i32.const	$push94=, 1103515245
-	i32.mul 	$push29=, $0, $pop94
-	i32.const	$push93=, 12345
-	i32.add 	$push92=, $pop29, $pop93
-	tee_local	$push91=, $0=, $pop92
+	i32.const	$push94=, 16
+	i32.shr_u	$push20=, $0, $pop94
+	i32.store8	sI+7($pop95), $pop20
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push21=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$0=, $pop21, $pop92
+	i32.const	$push91=, 0
 	i32.const	$push90=, 16
-	i32.shr_u	$push30=, $pop91, $pop90
-	i32.store8	sI+12($pop95), $pop30
-	i32.const	$push89=, 0
-	i32.const	$push88=, 1103515245
-	i32.mul 	$push31=, $0, $pop88
-	i32.const	$push87=, 12345
-	i32.add 	$push86=, $pop31, $pop87
-	tee_local	$push85=, $0=, $pop86
-	i32.const	$push84=, 16
-	i32.shr_u	$push32=, $pop85, $pop84
-	i32.store8	sI+13($pop89), $pop32
+	i32.shr_u	$push22=, $0, $pop90
+	i32.store8	sI+8($pop91), $pop22
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push23=, $0, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop23, $pop88
+	i32.const	$push87=, 0
+	i32.const	$push86=, 16
+	i32.shr_u	$push24=, $0, $pop86
+	i32.store8	sI+9($pop87), $pop24
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push25=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$0=, $pop25, $pop84
 	i32.const	$push83=, 0
-	i32.const	$push82=, 1103515245
-	i32.mul 	$push33=, $0, $pop82
-	i32.const	$push81=, 12345
-	i32.add 	$push80=, $pop33, $pop81
-	tee_local	$push79=, $0=, $pop80
+	i32.const	$push82=, 16
+	i32.shr_u	$push26=, $0, $pop82
+	i32.store8	sI+10($pop83), $pop26
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push27=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop27, $pop80
+	i32.const	$push79=, 0
 	i32.const	$push78=, 16
-	i32.shr_u	$push34=, $pop79, $pop78
-	i32.store8	sI+14($pop83), $pop34
-	i32.const	$push77=, 0
-	i32.const	$push76=, 1103515245
-	i32.mul 	$push35=, $0, $pop76
-	i32.const	$push75=, 12345
-	i32.add 	$push74=, $pop35, $pop75
-	tee_local	$push73=, $0=, $pop74
-	i32.const	$push72=, 16
-	i32.shr_u	$push36=, $pop73, $pop72
-	i32.store8	sI+15($pop77), $pop36
+	i32.shr_u	$push28=, $0, $pop78
+	i32.store8	sI+11($pop79), $pop28
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push29=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop29, $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push30=, $0, $pop74
+	i32.store8	sI+12($pop75), $pop30
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push31=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop31, $pop72
 	i32.const	$push71=, 0
+	i32.const	$push70=, 16
+	i32.shr_u	$push32=, $0, $pop70
+	i32.store8	sI+13($pop71), $pop32
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push33=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop33, $pop68
+	i32.const	$push67=, 0
+	i32.const	$push66=, 16
+	i32.shr_u	$push34=, $0, $pop66
+	i32.store8	sI+14($pop67), $pop34
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push35=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop35, $pop64
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push36=, $0, $pop62
+	i32.store8	sI+15($pop63), $pop36
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	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.add 	$0=, $pop38, $pop39
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push40=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$1=, $pop40, $pop60
+	i32.const	$push59=, 0
+	i32.store	myrnd.s($pop59), $1
+	i32.const	$push58=, 16
+	i32.shr_u	$0=, $0, $pop58
+	i32.const	$push57=, 16
+	i32.shr_u	$1=, $1, $pop57
 	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.and 	$push44=, $1, $pop43
 	i32.const	$push41=, 511
-	i32.and 	$push42=, $pop58, $pop41
-	i32.add 	$push57=, $pop44, $pop42
-	tee_local	$push56=, $2=, $pop57
+	i32.and 	$push42=, $0, $pop41
+	i32.add 	$2=, $pop44, $pop42
+	i32.const	$push56=, 0
 	i32.const	$push45=, 7
-	i32.shl 	$push46=, $pop56, $pop45
+	i32.shl 	$push46=, $2, $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
+	i32.store16	sI($pop56), $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
+# %bb.1:                                # %if.end136
 	return
 .LBB54_2:                               # %if.then135
 	end_block                       # label5:
@@ -2637,7 +2444,7 @@ testI:                                  # @testI
 	.type	retmeJ,@function
 retmeJ:                                 # @retmeJ
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=1
 	i32.store	0($0):p2align=1, $pop0
                                         # fallthrough-return
@@ -2652,7 +2459,7 @@ retmeJ:                                 # @retmeJ
 fn1J:                                   # @fn1J
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sJ($pop0)
 	i32.const	$push2=, 9
@@ -2672,7 +2479,7 @@ fn1J:                                   # @fn1J
 fn2J:                                   # @fn2J
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sJ($pop0)
 	i32.const	$push2=, 9
@@ -2693,7 +2500,7 @@ fn2J:                                   # @fn2J
 	.type	retitJ,@function
 retitJ:                                 # @retitJ
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sJ($pop0)
 	i32.const	$push2=, 9
@@ -2711,21 +2518,19 @@ fn3J:                                   # @fn3J
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, sJ($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, sJ($pop0)
 	i32.const	$push3=, 9
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 9
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 511
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store16	sJ($pop0), $pop6
+	i32.store16	sJ($pop10), $pop6
 	i32.const	$push7=, 127
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -2739,75 +2544,66 @@ fn3J:                                   # @fn3J
 	.type	testJ,@function
 testJ:                                  # @testJ
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push62=, 0
+	i32.load	$push0=, myrnd.s($pop62)
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop1, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push2=, $0, $pop58
+	i32.store8	sJ($pop59), $pop2
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push3=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop3, $pop56
 	i32.const	$push55=, 0
-	i32.const	$push54=, 0
-	i32.load16_u	$push9=, sJ($pop54)
+	i32.const	$push54=, 16
+	i32.shr_u	$push4=, $0, $pop54
+	i32.store8	sJ+1($pop55), $pop4
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push5=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop5, $pop52
+	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push6=, $0, $pop50
+	i32.store8	sJ+2($pop51), $pop6
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push7=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop7, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push8=, $0, $pop46
+	i32.store8	sJ+3($pop47), $pop8
+	i32.const	$push45=, 0
+	i32.load16_u	$push9=, sJ($pop45)
 	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
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push11=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop11, $pop43
+	i32.const	$push42=, 16
+	i32.shr_u	$2=, $0, $pop42
+	i32.const	$push41=, 0
+	i32.const	$push40=, 9
+	i32.shl 	$push12=, $2, $pop40
+	i32.or  	$push13=, $1, $pop12
+	i32.store16	sJ($pop41), $pop13
+	i32.const	$push39=, 1103515245
+	i32.mul 	$push14=, $0, $pop39
+	i32.const	$push38=, 12345
+	i32.add 	$0=, $pop14, $pop38
+	i32.const	$push37=, 0
+	i32.store	myrnd.s($pop37), $0
+	i32.const	$push36=, 16
+	i32.shr_u	$3=, $0, $pop36
 	block   	
-	i32.const	$push38=, 16
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.add 	$push15=, $pop36, $2
+	i32.add 	$push15=, $3, $2
 	i32.const	$push35=, 0
 	i32.load	$push16=, sJ($pop35)
 	i32.const	$push34=, 9
@@ -2817,42 +2613,37 @@ testJ:                                  # @testJ
 	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
+# %bb.1:                                # %lor.lhs.false136
 	i32.const	$push21=, -2139243339
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, -1492899873
-	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.add 	$0=, $pop22, $pop23
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push24=, $0, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$2=, $pop24, $pop70
+	i32.const	$push69=, 0
+	i32.store	myrnd.s($pop69), $2
+	i32.const	$push68=, 16
+	i32.shr_u	$0=, $0, $pop68
+	i32.const	$push67=, 16
+	i32.shr_u	$2=, $2, $pop67
 	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.and 	$push27=, $2, $pop26
+	i32.const	$push66=, 127
+	i32.and 	$push25=, $0, $pop66
+	i32.add 	$3=, $pop27, $pop25
+	i32.const	$push65=, 0
+	i32.const	$push64=, 9
+	i32.shl 	$push28=, $3, $pop64
 	i32.or  	$push29=, $pop28, $1
-	i32.store16	sJ($pop92), $pop29
+	i32.store16	sJ($pop65), $pop29
 	i32.add 	$push30=, $2, $0
 	i32.xor 	$push31=, $pop30, $3
-	i32.const	$push81=, 127
-	i32.and 	$push32=, $pop31, $pop81
+	i32.const	$push63=, 127
+	i32.and 	$push32=, $pop31, $pop63
 	br_if   	0, $pop32       # 0: down to label6
-# BB#2:                                 # %if.end142
+# %bb.2:                                # %if.end142
 	return
 .LBB60_3:                               # %if.then
 	end_block                       # label6:
@@ -2868,7 +2659,7 @@ testJ:                                  # @testJ
 	.type	retmeK,@function
 retmeK:                                 # @retmeK
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -2883,7 +2674,7 @@ retmeK:                                 # @retmeK
 fn1K:                                   # @fn1K
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sK($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2901,7 +2692,7 @@ fn1K:                                   # @fn1K
 fn2K:                                   # @fn2K
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sK($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2920,7 +2711,7 @@ fn2K:                                   # @fn2K
 	.type	retitK,@function
 retitK:                                 # @retitK
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sK($pop0)
 	i32.const	$push2=, 63
@@ -2938,21 +2729,19 @@ fn3K:                                   # @fn3K
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sK($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sK($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sK($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sK($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end65:
 	.size	fn3K, .Lfunc_end65-fn3K
@@ -2963,57 +2752,51 @@ fn3K:                                   # @fn3K
 	.type	testK,@function
 testK:                                  # @testK
 	.local  	i32, i32
-# BB#0:                                 # %if.end129
+# %bb.0:                                # %if.end129
 	i32.const	$push0=, 0
-	i32.const	$push57=, 0
-	i32.load	$push1=, myrnd.s($pop57)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push56=, $pop3, $pop4
-	tee_local	$push55=, $0=, $pop56
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push45=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop55, $pop5
-	i32.store8	sK($pop0), $pop6
-	i32.const	$push54=, 0
-	i32.const	$push53=, 1103515245
-	i32.mul 	$push7=, $0, $pop53
-	i32.const	$push52=, 12345
-	i32.add 	$push51=, $pop7, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.const	$push49=, 16
-	i32.shr_u	$push8=, $pop50, $pop49
-	i32.store8	sK+1($pop54), $pop8
-	i32.const	$push48=, 0
-	i32.const	$push47=, 1103515245
-	i32.mul 	$push9=, $0, $pop47
-	i32.const	$push46=, 12345
-	i32.add 	$push45=, $pop9, $pop46
-	tee_local	$push44=, $0=, $pop45
-	i32.const	$push43=, 16
-	i32.shr_u	$push10=, $pop44, $pop43
-	i32.store8	sK+2($pop48), $pop10
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sK($pop45), $pop6
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push7=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop7, $pop43
 	i32.const	$push42=, 0
-	i32.const	$push41=, 1103515245
-	i32.mul 	$push11=, $0, $pop41
-	i32.const	$push40=, 12345
-	i32.add 	$push39=, $pop11, $pop40
-	tee_local	$push38=, $0=, $pop39
+	i32.const	$push41=, 16
+	i32.shr_u	$push8=, $0, $pop41
+	i32.store8	sK+1($pop42), $pop8
+	i32.const	$push40=, 1103515245
+	i32.mul 	$push9=, $0, $pop40
+	i32.const	$push39=, 12345
+	i32.add 	$0=, $pop9, $pop39
+	i32.const	$push38=, 0
 	i32.const	$push37=, 16
-	i32.shr_u	$push12=, $pop38, $pop37
-	i32.store8	sK+3($pop42), $pop12
-	i32.const	$push36=, 0
+	i32.shr_u	$push10=, $0, $pop37
+	i32.store8	sK+2($pop38), $pop10
+	i32.const	$push36=, 1103515245
+	i32.mul 	$push11=, $0, $pop36
+	i32.const	$push35=, 12345
+	i32.add 	$0=, $pop11, $pop35
+	i32.const	$push34=, 0
+	i32.const	$push33=, 16
+	i32.shr_u	$push12=, $0, $pop33
+	i32.store8	sK+3($pop34), $pop12
 	i32.const	$push13=, -341751747
 	i32.mul 	$push14=, $0, $pop13
 	i32.const	$push15=, 229283573
-	i32.add 	$push35=, $pop14, $pop15
-	tee_local	$push34=, $0=, $pop35
-	i32.const	$push33=, 1103515245
-	i32.mul 	$push16=, $pop34, $pop33
-	i32.const	$push32=, 12345
-	i32.add 	$push31=, $pop16, $pop32
-	tee_local	$push30=, $1=, $pop31
-	i32.store	myrnd.s($pop36), $pop30
+	i32.add 	$0=, $pop14, $pop15
+	i32.const	$push32=, 1103515245
+	i32.mul 	$push16=, $0, $pop32
+	i32.const	$push31=, 12345
+	i32.add 	$1=, $pop16, $pop31
+	i32.const	$push30=, 0
+	i32.store	myrnd.s($pop30), $1
 	i32.const	$push29=, 0
 	i32.const	$push28=, 16
 	i32.shr_u	$push18=, $1, $pop28
@@ -3039,7 +2822,7 @@ testK:                                  # @testK
 	.type	retmeL,@function
 retmeL:                                 # @retmeL
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=2
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -3054,7 +2837,7 @@ retmeL:                                 # @retmeL
 fn1L:                                   # @fn1L
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sL($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3072,7 +2855,7 @@ fn1L:                                   # @fn1L
 fn2L:                                   # @fn2L
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sL($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3091,7 +2874,7 @@ fn2L:                                   # @fn2L
 	.type	retitL,@function
 retitL:                                 # @retitL
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sL($pop0)
 	i32.const	$push2=, 63
@@ -3109,21 +2892,19 @@ fn3L:                                   # @fn3L
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sL($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sL($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sL($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sL($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end71:
 	.size	fn3L, .Lfunc_end71-fn3L
@@ -3134,140 +2915,124 @@ fn3L:                                   # @fn3L
 	.type	testL,@function
 testL:                                  # @testL
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push106=, 0
-	i32.const	$push105=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push78=, 0
+	i32.load	$push0=, myrnd.s($pop78)
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop1, $pop76
 	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	$push74=, 16
+	i32.shr_u	$push2=, $0, $pop74
+	i32.store8	sL($pop75), $pop2
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push3=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop3, $pop72
+	i32.const	$push71=, 0
 	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.shr_u	$push4=, $0, $pop70
+	i32.store8	sL+1($pop71), $pop4
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push5=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop5, $pop68
+	i32.const	$push67=, 0
+	i32.const	$push66=, 16
+	i32.shr_u	$push6=, $0, $pop66
+	i32.store8	sL+2($pop67), $pop6
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push7=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop7, $pop64
 	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	$push62=, 16
+	i32.shr_u	$push8=, $0, $pop62
+	i32.store8	sL+3($pop63), $pop8
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push9=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop9, $pop60
+	i32.const	$push59=, 0
 	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.shr_u	$push10=, $0, $pop58
+	i32.store8	sL+4($pop59), $pop10
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push11=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop11, $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push12=, $0, $pop54
+	i32.store8	sL+5($pop55), $pop12
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push13=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop13, $pop52
+	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push14=, $0, $pop50
+	i32.store8	sL+6($pop51), $pop14
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push15=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop15, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push16=, $0, $pop46
+	i32.store8	sL+7($pop47), $pop16
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push17=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$2=, $pop17, $pop44
+	i32.const	$push43=, 1103515245
+	i32.mul 	$push18=, $2, $pop43
+	i32.const	$push42=, 12345
+	i32.add 	$0=, $pop18, $pop42
+	i32.const	$push41=, 0
+	i32.store	myrnd.s($pop41), $0
+	i32.const	$push40=, 0
+	i32.load	$push19=, sL($pop40)
 	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
+	i32.and 	$1=, $pop19, $pop20
+	i32.const	$push39=, 16
+	i32.shr_u	$2=, $2, $pop39
+	i32.const	$push38=, 63
+	i32.and 	$push21=, $2, $pop38
+	i32.or  	$3=, $pop21, $1
+	i32.const	$push37=, 0
+	i32.store	sL($pop37), $3
+	i32.const	$push36=, 16
+	i32.shr_u	$4=, $0, $pop36
 	block   	
-	i32.const	$push38=, 16
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $4=, $pop37
-	i32.add 	$push23=, $pop36, $2
+	i32.add 	$push23=, $4, $2
 	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 label7
-# BB#1:                                 # %if.end113
-	i32.const	$push117=, 0
+# %bb.1:                                # %if.end113
 	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=, $2=, $pop112
-	i32.store	myrnd.s($pop117), $pop111
-	i32.const	$push110=, 0
-	i32.const	$push109=, 16
-	i32.shr_u	$push31=, $2, $pop109
-	i32.const	$push108=, 16
-	i32.shr_u	$push30=, $0, $pop108
+	i32.add 	$0=, $pop27, $pop28
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push29=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$2=, $pop29, $pop84
+	i32.const	$push83=, 0
+	i32.store	myrnd.s($pop83), $2
+	i32.const	$push82=, 0
+	i32.const	$push81=, 16
+	i32.shr_u	$push31=, $2, $pop81
+	i32.const	$push80=, 16
+	i32.shr_u	$push30=, $0, $pop80
 	i32.add 	$push32=, $pop31, $pop30
-	i32.const	$push107=, 63
-	i32.and 	$push33=, $pop32, $pop107
+	i32.const	$push79=, 63
+	i32.and 	$push33=, $pop32, $pop79
 	i32.or  	$push34=, $pop33, $1
-	i32.store	sL($pop110), $pop34
+	i32.store	sL($pop82), $pop34
 	return
 .LBB72_2:                               # %if.then
 	end_block                       # label7:
@@ -3283,7 +3048,7 @@ testL:                                  # @testL
 	.type	retmeM,@function
 retmeM:                                 # @retmeM
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=2
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -3298,7 +3063,7 @@ retmeM:                                 # @retmeM
 fn1M:                                   # @fn1M
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sM+4($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3316,7 +3081,7 @@ fn1M:                                   # @fn1M
 fn2M:                                   # @fn2M
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sM+4($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3335,7 +3100,7 @@ fn2M:                                   # @fn2M
 	.type	retitM,@function
 retitM:                                 # @retitM
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sM+4($pop0)
 	i32.const	$push2=, 63
@@ -3353,21 +3118,19 @@ fn3M:                                   # @fn3M
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sM+4($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sM+4($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sM+4($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sM+4($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end77:
 	.size	fn3M, .Lfunc_end77-fn3M
@@ -3378,140 +3141,124 @@ fn3M:                                   # @fn3M
 	.type	testM,@function
 testM:                                  # @testM
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push106=, 0
-	i32.const	$push105=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push78=, 0
+	i32.load	$push0=, myrnd.s($pop78)
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop1, $pop76
+	i32.const	$push75=, 1103515245
+	i32.mul 	$push2=, $0, $pop75
+	i32.const	$push74=, 12345
+	i32.add 	$1=, $pop2, $pop74
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push3=, $1, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$2=, $pop3, $pop72
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push4=, $2, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$3=, $pop4, $pop70
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push5=, $3, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$4=, $pop5, $pop68
+	i32.const	$push67=, 0
 	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.shr_u	$push6=, $4, $pop66
+	i32.store8	sM+4($pop67), $pop6
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push7=, $4, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$4=, $pop7, $pop64
 	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.shr_u	$push8=, $4, $pop62
+	i32.store8	sM+5($pop63), $pop8
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push9=, $4, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$4=, $pop9, $pop60
 	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.shr_u	$push10=, $4, $pop58
+	i32.store8	sM+6($pop59), $pop10
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push11=, $4, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$4=, $pop11, $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push12=, $4, $pop54
+	i32.store8	sM+7($pop55), $pop12
+	i32.const	$push53=, 0
+	i32.const	$push52=, 16
+	i32.shr_u	$push13=, $0, $pop52
+	i32.store8	sM($pop53), $pop13
+	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push14=, $1, $pop50
+	i32.store8	sM+1($pop51), $pop14
+	i32.const	$push49=, 0
+	i32.const	$push48=, 16
+	i32.shr_u	$push15=, $2, $pop48
+	i32.store8	sM+2($pop49), $pop15
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push16=, $3, $pop46
+	i32.store8	sM+3($pop47), $pop16
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push17=, $4, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$1=, $pop17, $pop44
+	i32.const	$push43=, 1103515245
+	i32.mul 	$push18=, $1, $pop43
+	i32.const	$push42=, 12345
+	i32.add 	$0=, $pop18, $pop42
+	i32.const	$push41=, 0
+	i32.store	myrnd.s($pop41), $0
+	i32.const	$push40=, 0
+	i32.load	$push19=, sM+4($pop40)
 	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
+	i32.and 	$2=, $pop19, $pop20
+	i32.const	$push39=, 16
+	i32.shr_u	$1=, $1, $pop39
+	i32.const	$push38=, 63
+	i32.and 	$push21=, $1, $pop38
+	i32.or  	$3=, $pop21, $2
+	i32.const	$push37=, 0
+	i32.store	sM+4($pop37), $3
+	i32.const	$push36=, 16
+	i32.shr_u	$4=, $0, $pop36
 	block   	
-	i32.const	$push38=, 16
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $4=, $pop37
-	i32.add 	$push23=, $pop36, $1
+	i32.add 	$push23=, $4, $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
+# %bb.1:                                # %if.end119
 	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=, $0, $pop108
+	i32.add 	$0=, $pop27, $pop28
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push29=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$1=, $pop29, $pop84
+	i32.const	$push83=, 0
+	i32.store	myrnd.s($pop83), $1
+	i32.const	$push82=, 0
+	i32.const	$push81=, 16
+	i32.shr_u	$push31=, $1, $pop81
+	i32.const	$push80=, 16
+	i32.shr_u	$push30=, $0, $pop80
 	i32.add 	$push32=, $pop31, $pop30
-	i32.const	$push107=, 63
-	i32.and 	$push33=, $pop32, $pop107
+	i32.const	$push79=, 63
+	i32.and 	$push33=, $pop32, $pop79
 	i32.or  	$push34=, $pop33, $2
-	i32.store	sM+4($pop110), $pop34
+	i32.store	sM+4($pop82), $pop34
 	return
 .LBB78_2:                               # %if.then
 	end_block                       # label8:
@@ -3527,7 +3274,7 @@ testM:                                  # @testM
 	.type	retmeN,@function
 retmeN:                                 # @retmeN
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -3542,7 +3289,7 @@ retmeN:                                 # @retmeN
 fn1N:                                   # @fn1N
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sN($pop0)
 	i32.const	$push2=, 6
@@ -3562,7 +3309,7 @@ fn1N:                                   # @fn1N
 fn2N:                                   # @fn2N
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sN($pop0)
 	i32.const	$push2=, 6
@@ -3583,7 +3330,7 @@ fn2N:                                   # @fn2N
 	.type	retitN,@function
 retitN:                                 # @retitN
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sN($pop0)
 	i32.const	$push2=, 6
@@ -3603,25 +3350,23 @@ fn3N:                                   # @fn3N
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push18=, 0
-	i64.load	$push17=, sN($pop18)
-	tee_local	$push16=, $1=, $pop17
-	i64.const	$push1=, -4033
-	i64.and 	$push2=, $pop16, $pop1
+	i64.load	$1=, sN($pop0)
 	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.add 	$0=, $pop5, $0
+	i32.const	$push14=, 0
+	i64.const	$push1=, -4033
+	i64.and 	$push2=, $1, $pop1
 	i32.const	$push6=, 6
-	i32.shl 	$push7=, $pop14, $pop6
+	i32.shl 	$push7=, $0, $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
+	i64.store	sN($pop14), $pop11
 	i32.const	$push12=, 63
 	i32.and 	$push13=, $0, $pop12
                                         # fallthrough-return: $pop13
@@ -3634,233 +3379,205 @@ fn3N:                                   # @fn3N
 	.globl	testN
 	.type	testN,@function
 testN:                                  # @testN
-	.local  	i64, i32, i32, i32, i64, i64, i32, i32, i32, i64
-# BB#0:                                 # %lor.lhs.false
+	.local  	i64, i32, i32, i64, i64, i32, i32, i32, i32, i64
+# %bb.0:                                # %lor.lhs.false
 	i32.const	$push3=, 0
-	i32.const	$push173=, 0
-	i32.load	$push4=, myrnd.s($pop173)
+	i32.load	$push4=, myrnd.s($pop3)
 	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.add 	$8=, $pop6, $pop7
+	i32.const	$push143=, 0
+	i32.const	$push142=, 16
+	i32.shr_u	$push8=, $8, $pop142
+	i32.store8	sN($pop143), $pop8
+	i32.const	$push141=, 1103515245
+	i32.mul 	$push9=, $8, $pop141
+	i32.const	$push140=, 12345
+	i32.add 	$8=, $pop9, $pop140
 	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	$push138=, 16
+	i32.shr_u	$push10=, $8, $pop138
+	i32.store8	sN+1($pop139), $pop10
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push11=, $8, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$8=, $pop11, $pop136
+	i32.const	$push135=, 0
 	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.shr_u	$push12=, $8, $pop134
+	i32.store8	sN+2($pop135), $pop12
+	i32.const	$push133=, 1103515245
+	i32.mul 	$push13=, $8, $pop133
+	i32.const	$push132=, 12345
+	i32.add 	$8=, $pop13, $pop132
+	i32.const	$push131=, 0
+	i32.const	$push130=, 16
+	i32.shr_u	$push14=, $8, $pop130
+	i32.store8	sN+3($pop131), $pop14
+	i32.const	$push129=, 1103515245
+	i32.mul 	$push15=, $8, $pop129
+	i32.const	$push128=, 12345
+	i32.add 	$8=, $pop15, $pop128
 	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=, 0
-	i64.load	$push116=, sN($pop117)
-	tee_local	$push115=, $0=, $pop116
+	i32.const	$push126=, 16
+	i32.shr_u	$push16=, $8, $pop126
+	i32.store8	sN+4($pop127), $pop16
+	i32.const	$push125=, 1103515245
+	i32.mul 	$push17=, $8, $pop125
+	i32.const	$push124=, 12345
+	i32.add 	$8=, $pop17, $pop124
+	i32.const	$push123=, 0
+	i32.const	$push122=, 16
+	i32.shr_u	$push18=, $8, $pop122
+	i32.store8	sN+5($pop123), $pop18
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push19=, $8, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$8=, $pop19, $pop120
+	i32.const	$push119=, 0
+	i32.const	$push118=, 16
+	i32.shr_u	$push20=, $8, $pop118
+	i32.store8	sN+6($pop119), $pop20
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push21=, $8, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$8=, $pop21, $pop116
+	i32.const	$push115=, 0
+	i32.const	$push114=, 16
+	i32.shr_u	$push22=, $8, $pop114
+	i32.store8	sN+7($pop115), $pop22
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push23=, $8, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$8=, $pop23, $pop112
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push24=, $8, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$1=, $pop24, $pop110
+	i32.const	$push109=, 0
+	i32.store	myrnd.s($pop109), $1
+	i32.const	$push108=, 0
+	i64.load	$0=, sN($pop108)
 	i64.const	$push25=, -4033
-	i64.and 	$push114=, $pop115, $pop25
-	tee_local	$push113=, $4=, $pop114
+	i64.and 	$3=, $0, $pop25
 	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   	
+	i32.and 	$2=, $pop27, $pop28
+	i64.extend_u/i32	$push29=, $2
+	i64.or  	$4=, $3, $pop29
+	i32.const	$push107=, 0
+	i64.store	sN($pop107), $4
 	i64.const	$push32=, 4032
 	i64.or  	$push33=, $0, $pop32
-	i64.xor 	$push108=, $5, $pop33
-	tee_local	$push107=, $9=, $pop108
+	i64.xor 	$9=, $4, $pop33
+	block   	
 	i64.const	$push34=, 34359734272
-	i64.and 	$push35=, $pop107, $pop34
+	i64.and 	$push35=, $9, $pop34
 	i64.const	$push106=, 0
 	i64.ne  	$push36=, $pop35, $pop106
 	br_if   	0, $pop36       # 0: down to label9
-# BB#1:                                 # %lor.lhs.false29
+# %bb.1:                                # %lor.lhs.false29
 	i64.const	$push41=, 63
 	i64.and 	$push42=, $9, $pop41
-	i64.const	$push174=, 0
-	i64.ne  	$push43=, $pop42, $pop174
+	i64.const	$push144=, 0
+	i64.ne  	$push43=, $pop42, $pop144
 	br_if   	0, $pop43       # 0: down to label9
-# BB#2:                                 # %lor.lhs.false29
-	i32.const	$push40=, 6
-	i32.shr_u	$push37=, $3, $pop40
+# %bb.2:                                # %lor.lhs.false29
 	i64.const	$push30=, 6
-	i64.shr_u	$push31=, $5, $pop30
-	i32.wrap/i64	$push176=, $pop31
-	tee_local	$push175=, $3=, $pop176
+	i64.shr_u	$push31=, $4, $pop30
+	i32.wrap/i64	$5=, $pop31
+	i32.const	$push40=, 6
+	i32.shr_u	$push37=, $2, $pop40
 	i32.const	$push39=, 63
-	i32.and 	$push38=, $pop175, $pop39
+	i32.and 	$push38=, $5, $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
+# %bb.3:                                # %lor.lhs.false49
+	i32.const	$push147=, 16
+	i32.shr_u	$2=, $1, $pop147
+	i32.add 	$push1=, $2, $5
+	i32.const	$push146=, 16
+	i32.shr_u	$push0=, $8, $pop146
 	i32.add 	$push45=, $2, $pop0
 	i32.xor 	$push46=, $pop1, $pop45
-	i32.const	$push177=, 63
-	i32.and 	$push47=, $pop46, $pop177
+	i32.const	$push145=, 63
+	i32.and 	$push47=, $pop46, $pop145
 	br_if   	0, $pop47       # 0: down to label9
-# BB#4:                                 # %lor.lhs.false69
-	i32.const	$push52=, 0
+# %bb.4:                                # %lor.lhs.false69
 	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.add 	$8=, $pop49, $pop50
+	i32.const	$push153=, 1103515245
+	i32.mul 	$push51=, $8, $pop153
+	i32.const	$push152=, 12345
+	i32.add 	$1=, $pop51, $pop152
+	i32.const	$push52=, 0
+	i32.store	myrnd.s($pop52), $1
 	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
+	i32.and 	$2=, $pop54, $pop55
+	i64.extend_u/i32	$push56=, $2
+	i64.or  	$9=, $3, $pop56
+	i32.const	$push151=, 0
+	i64.store	sN($pop151), $9
+	i32.const	$push150=, 16
+	i32.shr_u	$5=, $1, $pop150
 	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.wrap/i64	$6=, $pop58
+	i32.add 	$push59=, $5, $6
+	i32.const	$push149=, 63
+	i32.and 	$push60=, $pop59, $pop149
 	i32.const	$push61=, 15
 	i32.rem_u	$7=, $pop60, $pop61
-	i64.xor 	$push184=, $9, $5
-	tee_local	$push183=, $5=, $pop184
+	i64.xor 	$4=, $9, $4
 	i64.const	$push62=, 34359734272
-	i64.and 	$push63=, $pop183, $pop62
-	i64.const	$push182=, 0
-	i64.ne  	$push64=, $pop63, $pop182
+	i64.and 	$push63=, $4, $pop62
+	i64.const	$push148=, 0
+	i64.ne  	$push64=, $pop63, $pop148
 	br_if   	0, $pop64       # 0: down to label9
-# BB#5:                                 # %lor.lhs.false80
+# %bb.5:                                # %lor.lhs.false80
 	i64.const	$push69=, 63
-	i64.and 	$push70=, $5, $pop69
-	i64.const	$push202=, 0
-	i64.ne  	$push71=, $pop70, $pop202
+	i64.and 	$push70=, $4, $pop69
+	i64.const	$push154=, 0
+	i64.ne  	$push71=, $pop70, $pop154
 	br_if   	0, $pop71       # 0: down to label9
-# BB#6:                                 # %lor.lhs.false80
+# %bb.6:                                # %lor.lhs.false80
 	i32.const	$push68=, 6
-	i32.shr_u	$push65=, $3, $pop68
+	i32.shr_u	$push65=, $2, $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
+# %bb.7:                                # %lor.lhs.false100
+	i32.const	$push156=, 16
+	i32.shr_u	$push2=, $8, $pop156
+	i32.add 	$push73=, $5, $pop2
+	i32.const	$push155=, 63
+	i32.and 	$push74=, $pop73, $pop155
 	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
+# %bb.8:                                # %lor.lhs.false125
 	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.add 	$8=, $pop79, $pop80
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push81=, $8, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$1=, $pop81, $pop161
+	i32.const	$push82=, 0
+	i32.store	myrnd.s($pop82), $1
 	i32.const	$push94=, 16
-	i32.shr_u	$push211=, $1, $pop94
-	tee_local	$push210=, $1=, $pop211
+	i32.shr_u	$1=, $1, $pop94
 	i32.const	$push95=, 2047
-	i32.and 	$push96=, $pop210, $pop95
+	i32.and 	$push96=, $1, $pop95
 	i64.const	$push83=, 274877902848
 	i64.and 	$push84=, $0, $pop83
 	i32.const	$push85=, 10
@@ -3872,23 +3589,23 @@ testN:                                  # @testN
 	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.add 	$2=, $pop96, $pop93
+	i32.const	$push160=, 0
 	i32.const	$push97=, 6
-	i32.shl 	$push98=, $pop208, $pop97
-	i32.const	$push207=, 4032
-	i32.and 	$push99=, $pop98, $pop207
+	i32.shl 	$push98=, $2, $pop97
+	i32.const	$push159=, 4032
+	i32.and 	$push99=, $pop98, $pop159
 	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
+	i64.or  	$push101=, $3, $pop100
+	i64.store	sN($pop160), $pop101
+	i32.const	$push158=, 16
+	i32.shr_u	$push102=, $8, $pop158
 	i32.add 	$push103=, $1, $pop102
-	i32.xor 	$push104=, $pop103, $3
-	i32.const	$push205=, 63
-	i32.and 	$push105=, $pop104, $pop205
+	i32.xor 	$push104=, $pop103, $2
+	i32.const	$push157=, 63
+	i32.and 	$push105=, $pop104, $pop157
 	br_if   	0, $pop105      # 0: down to label9
-# BB#9:                                 # %if.end158
+# %bb.9:                                # %if.end158
 	return
 .LBB84_10:                              # %if.then
 	end_block                       # label9:
@@ -3904,7 +3621,7 @@ testN:                                  # @testN
 	.type	retmeO,@function
 retmeO:                                 # @retmeO
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -3925,7 +3642,7 @@ retmeO:                                 # @retmeO
 fn1O:                                   # @fn1O
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sO+8($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3943,7 +3660,7 @@ fn1O:                                   # @fn1O
 fn2O:                                   # @fn2O
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sO+8($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3962,7 +3679,7 @@ fn2O:                                   # @fn2O
 	.type	retitO,@function
 retitO:                                 # @retitO
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sO+8($pop0)
 	i32.const	$push2=, 4095
@@ -3980,23 +3697,21 @@ fn3O:                                   # @fn3O
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i64.load	$push11=, sO+8($pop12)
-	tee_local	$push10=, $1=, $pop11
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $pop10, $pop1
+	i64.load	$1=, sO+8($pop0)
 	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
+	i32.and 	$0=, $pop4, $pop5
+	i32.const	$push8=, 0
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $1, $pop1
+	i64.extend_u/i32	$push6=, $0
 	i64.or  	$push7=, $pop2, $pop6
-	i64.store	sO+8($pop0), $pop7
-	copy_local	$push13=, $0
-                                        # fallthrough-return: $pop13
+	i64.store	sO+8($pop8), $pop7
+	copy_local	$push9=, $0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end89:
 	.size	fn3O, .Lfunc_end89-fn3O
@@ -4007,270 +3722,239 @@ fn3O:                                   # @fn3O
 	.type	testO,@function
 testO:                                  # @testO
 	.local  	i32, i64, i32, i64, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push197=, 0
-	i32.load	$push3=, myrnd.s($pop197)
+	i32.load	$push3=, myrnd.s($pop2)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	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	$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.add 	$0=, $pop5, $pop6
+	i32.const	$push153=, 0
 	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.shr_u	$push7=, $0, $pop152
+	i32.store8	sO($pop153), $pop7
+	i32.const	$push151=, 1103515245
+	i32.mul 	$push8=, $0, $pop151
+	i32.const	$push150=, 12345
+	i32.add 	$0=, $pop8, $pop150
+	i32.const	$push149=, 0
+	i32.const	$push148=, 16
+	i32.shr_u	$push9=, $0, $pop148
+	i32.store8	sO+1($pop149), $pop9
+	i32.const	$push147=, 1103515245
+	i32.mul 	$push10=, $0, $pop147
+	i32.const	$push146=, 12345
+	i32.add 	$0=, $pop10, $pop146
 	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	$push144=, 16
+	i32.shr_u	$push11=, $0, $pop144
+	i32.store8	sO+2($pop145), $pop11
+	i32.const	$push143=, 1103515245
+	i32.mul 	$push12=, $0, $pop143
+	i32.const	$push142=, 12345
+	i32.add 	$0=, $pop12, $pop142
+	i32.const	$push141=, 0
 	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.shr_u	$push13=, $0, $pop140
+	i32.store8	sO+3($pop141), $pop13
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push14=, $0, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$0=, $pop14, $pop138
+	i32.const	$push137=, 0
+	i32.const	$push136=, 16
+	i32.shr_u	$push15=, $0, $pop136
+	i32.store8	sO+4($pop137), $pop15
+	i32.const	$push135=, 1103515245
+	i32.mul 	$push16=, $0, $pop135
+	i32.const	$push134=, 12345
+	i32.add 	$0=, $pop16, $pop134
 	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	$push132=, 16
+	i32.shr_u	$push17=, $0, $pop132
+	i32.store8	sO+5($pop133), $pop17
+	i32.const	$push131=, 1103515245
+	i32.mul 	$push18=, $0, $pop131
+	i32.const	$push130=, 12345
+	i32.add 	$0=, $pop18, $pop130
+	i32.const	$push129=, 0
 	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.shr_u	$push19=, $0, $pop128
+	i32.store8	sO+6($pop129), $pop19
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push20=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$0=, $pop20, $pop126
+	i32.const	$push125=, 0
+	i32.const	$push124=, 16
+	i32.shr_u	$push21=, $0, $pop124
+	i32.store8	sO+7($pop125), $pop21
+	i32.const	$push123=, 1103515245
+	i32.mul 	$push22=, $0, $pop123
+	i32.const	$push122=, 12345
+	i32.add 	$0=, $pop22, $pop122
 	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	$push120=, 16
+	i32.shr_u	$push23=, $0, $pop120
+	i32.store8	sO+8($pop121), $pop23
+	i32.const	$push119=, 1103515245
+	i32.mul 	$push24=, $0, $pop119
+	i32.const	$push118=, 12345
+	i32.add 	$0=, $pop24, $pop118
+	i32.const	$push117=, 0
 	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.shr_u	$push25=, $0, $pop116
+	i32.store8	sO+9($pop117), $pop25
+	i32.const	$push115=, 1103515245
+	i32.mul 	$push26=, $0, $pop115
+	i32.const	$push114=, 12345
+	i32.add 	$0=, $pop26, $pop114
+	i32.const	$push113=, 0
+	i32.const	$push112=, 16
+	i32.shr_u	$push27=, $0, $pop112
+	i32.store8	sO+10($pop113), $pop27
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push28=, $0, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$0=, $pop28, $pop110
 	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	$push108=, 16
+	i32.shr_u	$push29=, $0, $pop108
+	i32.store8	sO+11($pop109), $pop29
+	i32.const	$push107=, 1103515245
+	i32.mul 	$push30=, $0, $pop107
+	i32.const	$push106=, 12345
+	i32.add 	$0=, $pop30, $pop106
+	i32.const	$push105=, 0
 	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.shr_u	$push31=, $0, $pop104
+	i32.store8	sO+12($pop105), $pop31
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push32=, $0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$0=, $pop32, $pop102
+	i32.const	$push101=, 0
+	i32.const	$push100=, 16
+	i32.shr_u	$push33=, $0, $pop100
+	i32.store8	sO+13($pop101), $pop33
+	i32.const	$push99=, 1103515245
+	i32.mul 	$push34=, $0, $pop99
+	i32.const	$push98=, 12345
+	i32.add 	$0=, $pop34, $pop98
+	i32.const	$push97=, 0
+	i32.const	$push96=, 16
+	i32.shr_u	$push35=, $0, $pop96
+	i32.store8	sO+14($pop97), $pop35
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push36=, $0, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$0=, $pop36, $pop94
 	i32.const	$push93=, 0
-	i64.load	$push40=, sO+8($pop93)
+	i32.const	$push92=, 16
+	i32.shr_u	$push37=, $0, $pop92
+	i32.store8	sO+15($pop93), $pop37
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push38=, $0, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$2=, $pop38, $pop90
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push39=, $2, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop39, $pop88
+	i32.const	$push87=, 0
+	i32.store	myrnd.s($pop87), $0
+	i32.const	$push86=, 0
+	i64.load	$push40=, sO+8($pop86)
 	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
+	i64.and 	$1=, $pop40, $pop41
+	i32.const	$push85=, 16
+	i32.shr_u	$push42=, $2, $pop85
+	i32.const	$push84=, 2047
+	i32.and 	$2=, $pop42, $pop84
+	i64.extend_u/i32	$push43=, $2
+	i64.or  	$3=, $1, $pop43
+	i32.const	$push83=, 0
+	i64.store	sO+8($pop83), $3
+	i32.wrap/i64	$5=, $3
 	block   	
-	i32.wrap/i64	$push84=, $3
-	tee_local	$push83=, $5=, $pop84
 	i32.const	$push82=, 2047
-	i32.and 	$push47=, $pop83, $pop82
+	i32.and 	$push47=, $5, $pop82
 	i32.ne  	$push48=, $2, $pop47
 	br_if   	0, $pop48       # 0: down to label10
-# BB#1:                                 # %entry
-	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
+# %bb.1:                                # %entry
+	i32.const	$push155=, 16
+	i32.shr_u	$push44=, $0, $pop155
+	i32.const	$push154=, 2047
+	i32.and 	$4=, $pop44, $pop154
+	i32.add 	$push0=, $4, $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
-# BB#2:                                 # %if.end
-	i32.const	$push54=, 0
+# %bb.2:                                # %if.end
 	i32.const	$push50=, 1103515245
 	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	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.add 	$2=, $pop51, $pop52
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push53=, $2, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$0=, $pop53, $pop160
+	i32.const	$push54=, 0
+	i32.store	myrnd.s($pop54), $0
+	i32.const	$push159=, 16
+	i32.shr_u	$push55=, $2, $pop159
+	i32.const	$push158=, 2047
+	i32.and 	$2=, $pop55, $pop158
+	i64.extend_u/i32	$push56=, $2
+	i64.or  	$3=, $1, $pop56
+	i32.const	$push157=, 0
+	i64.store	sO+8($pop157), $3
+	i32.wrap/i64	$5=, $3
+	i32.const	$push156=, 2047
+	i32.and 	$push57=, $5, $pop156
 	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
+# %bb.3:                                # %lor.lhs.false87
+	i32.const	$push164=, 16
+	i32.shr_u	$push59=, $0, $pop164
+	i32.const	$push163=, 2047
+	i32.and 	$4=, $pop59, $pop163
+	i32.add 	$push60=, $4, $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.const	$push162=, 15
+	i32.rem_u	$push66=, $pop65, $pop162
 	i32.ne  	$push67=, $pop62, $pop66
 	br_if   	0, $pop67       # 0: down to label10
-# BB#4:                                 # %if.end140
-	i32.const	$push72=, 0
+# %bb.4:                                # %if.end140
 	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.add 	$0=, $pop69, $pop70
+	i32.const	$push169=, 1103515245
+	i32.mul 	$push71=, $0, $pop169
+	i32.const	$push168=, 12345
+	i32.add 	$2=, $pop71, $pop168
+	i32.const	$push72=, 0
+	i32.store	myrnd.s($pop72), $2
+	i32.const	$push167=, 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	$push74=, $0, $pop224
-	i32.const	$push223=, 2047
-	i32.and 	$push76=, $pop74, $pop223
+	i32.const	$push166=, 16
+	i32.shr_u	$push74=, $0, $pop166
+	i32.const	$push165=, 2047
+	i32.and 	$push76=, $pop74, $pop165
 	i32.add 	$push79=, $pop78, $pop76
 	i64.extend_u/i32	$push80=, $pop79
 	i64.or  	$push81=, $1, $pop80
-	i64.store	sO+8($pop225), $pop81
+	i64.store	sO+8($pop167), $pop81
 	return
 .LBB90_5:                               # %if.then
 	end_block                       # label10:
@@ -4286,7 +3970,7 @@ testO:                                  # @testO
 	.type	retmeP,@function
 retmeP:                                 # @retmeP
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -4307,7 +3991,7 @@ retmeP:                                 # @retmeP
 fn1P:                                   # @fn1P
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sP($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4325,7 +4009,7 @@ fn1P:                                   # @fn1P
 fn2P:                                   # @fn2P
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sP($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4344,7 +4028,7 @@ fn2P:                                   # @fn2P
 	.type	retitP,@function
 retitP:                                 # @retitP
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sP($pop0)
 	i32.const	$push2=, 4095
@@ -4362,23 +4046,21 @@ fn3P:                                   # @fn3P
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i64.load	$push11=, sP($pop12)
-	tee_local	$push10=, $1=, $pop11
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $pop10, $pop1
+	i64.load	$1=, sP($pop0)
 	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
+	i32.and 	$0=, $pop4, $pop5
+	i32.const	$push8=, 0
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $1, $pop1
+	i64.extend_u/i32	$push6=, $0
 	i64.or  	$push7=, $pop2, $pop6
-	i64.store	sP($pop0), $pop7
-	copy_local	$push13=, $0
-                                        # fallthrough-return: $pop13
+	i64.store	sP($pop8), $pop7
+	copy_local	$push9=, $0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end95:
 	.size	fn3P, .Lfunc_end95-fn3P
@@ -4389,270 +4071,239 @@ fn3P:                                   # @fn3P
 	.type	testP,@function
 testP:                                  # @testP
 	.local  	i32, i64, i32, i64, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push197=, 0
-	i32.load	$push3=, myrnd.s($pop197)
+	i32.load	$push3=, myrnd.s($pop2)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	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	$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.add 	$0=, $pop5, $pop6
+	i32.const	$push153=, 0
 	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.shr_u	$push7=, $0, $pop152
+	i32.store8	sP($pop153), $pop7
+	i32.const	$push151=, 1103515245
+	i32.mul 	$push8=, $0, $pop151
+	i32.const	$push150=, 12345
+	i32.add 	$0=, $pop8, $pop150
+	i32.const	$push149=, 0
+	i32.const	$push148=, 16
+	i32.shr_u	$push9=, $0, $pop148
+	i32.store8	sP+1($pop149), $pop9
+	i32.const	$push147=, 1103515245
+	i32.mul 	$push10=, $0, $pop147
+	i32.const	$push146=, 12345
+	i32.add 	$0=, $pop10, $pop146
 	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	$push144=, 16
+	i32.shr_u	$push11=, $0, $pop144
+	i32.store8	sP+2($pop145), $pop11
+	i32.const	$push143=, 1103515245
+	i32.mul 	$push12=, $0, $pop143
+	i32.const	$push142=, 12345
+	i32.add 	$0=, $pop12, $pop142
+	i32.const	$push141=, 0
 	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.shr_u	$push13=, $0, $pop140
+	i32.store8	sP+3($pop141), $pop13
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push14=, $0, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$0=, $pop14, $pop138
+	i32.const	$push137=, 0
+	i32.const	$push136=, 16
+	i32.shr_u	$push15=, $0, $pop136
+	i32.store8	sP+4($pop137), $pop15
+	i32.const	$push135=, 1103515245
+	i32.mul 	$push16=, $0, $pop135
+	i32.const	$push134=, 12345
+	i32.add 	$0=, $pop16, $pop134
 	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	$push132=, 16
+	i32.shr_u	$push17=, $0, $pop132
+	i32.store8	sP+5($pop133), $pop17
+	i32.const	$push131=, 1103515245
+	i32.mul 	$push18=, $0, $pop131
+	i32.const	$push130=, 12345
+	i32.add 	$0=, $pop18, $pop130
+	i32.const	$push129=, 0
 	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.shr_u	$push19=, $0, $pop128
+	i32.store8	sP+6($pop129), $pop19
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push20=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$0=, $pop20, $pop126
+	i32.const	$push125=, 0
+	i32.const	$push124=, 16
+	i32.shr_u	$push21=, $0, $pop124
+	i32.store8	sP+7($pop125), $pop21
+	i32.const	$push123=, 1103515245
+	i32.mul 	$push22=, $0, $pop123
+	i32.const	$push122=, 12345
+	i32.add 	$0=, $pop22, $pop122
 	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	$push120=, 16
+	i32.shr_u	$push23=, $0, $pop120
+	i32.store8	sP+8($pop121), $pop23
+	i32.const	$push119=, 1103515245
+	i32.mul 	$push24=, $0, $pop119
+	i32.const	$push118=, 12345
+	i32.add 	$0=, $pop24, $pop118
+	i32.const	$push117=, 0
 	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.shr_u	$push25=, $0, $pop116
+	i32.store8	sP+9($pop117), $pop25
+	i32.const	$push115=, 1103515245
+	i32.mul 	$push26=, $0, $pop115
+	i32.const	$push114=, 12345
+	i32.add 	$0=, $pop26, $pop114
+	i32.const	$push113=, 0
+	i32.const	$push112=, 16
+	i32.shr_u	$push27=, $0, $pop112
+	i32.store8	sP+10($pop113), $pop27
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push28=, $0, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$0=, $pop28, $pop110
 	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	$push108=, 16
+	i32.shr_u	$push29=, $0, $pop108
+	i32.store8	sP+11($pop109), $pop29
+	i32.const	$push107=, 1103515245
+	i32.mul 	$push30=, $0, $pop107
+	i32.const	$push106=, 12345
+	i32.add 	$0=, $pop30, $pop106
+	i32.const	$push105=, 0
 	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.shr_u	$push31=, $0, $pop104
+	i32.store8	sP+12($pop105), $pop31
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push32=, $0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$0=, $pop32, $pop102
+	i32.const	$push101=, 0
+	i32.const	$push100=, 16
+	i32.shr_u	$push33=, $0, $pop100
+	i32.store8	sP+13($pop101), $pop33
+	i32.const	$push99=, 1103515245
+	i32.mul 	$push34=, $0, $pop99
+	i32.const	$push98=, 12345
+	i32.add 	$0=, $pop34, $pop98
+	i32.const	$push97=, 0
+	i32.const	$push96=, 16
+	i32.shr_u	$push35=, $0, $pop96
+	i32.store8	sP+14($pop97), $pop35
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push36=, $0, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$0=, $pop36, $pop94
 	i32.const	$push93=, 0
-	i64.load	$push40=, sP($pop93)
+	i32.const	$push92=, 16
+	i32.shr_u	$push37=, $0, $pop92
+	i32.store8	sP+15($pop93), $pop37
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push38=, $0, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$2=, $pop38, $pop90
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push39=, $2, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop39, $pop88
+	i32.const	$push87=, 0
+	i32.store	myrnd.s($pop87), $0
+	i32.const	$push86=, 0
+	i64.load	$push40=, sP($pop86)
 	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
+	i64.and 	$1=, $pop40, $pop41
+	i32.const	$push85=, 16
+	i32.shr_u	$push42=, $2, $pop85
+	i32.const	$push84=, 2047
+	i32.and 	$2=, $pop42, $pop84
+	i64.extend_u/i32	$push43=, $2
+	i64.or  	$3=, $1, $pop43
+	i32.const	$push83=, 0
+	i64.store	sP($pop83), $3
+	i32.wrap/i64	$5=, $3
 	block   	
-	i32.wrap/i64	$push84=, $3
-	tee_local	$push83=, $5=, $pop84
 	i32.const	$push82=, 2047
-	i32.and 	$push47=, $pop83, $pop82
+	i32.and 	$push47=, $5, $pop82
 	i32.ne  	$push48=, $2, $pop47
 	br_if   	0, $pop48       # 0: down to label11
-# BB#1:                                 # %entry
-	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
+# %bb.1:                                # %entry
+	i32.const	$push155=, 16
+	i32.shr_u	$push44=, $0, $pop155
+	i32.const	$push154=, 2047
+	i32.and 	$4=, $pop44, $pop154
+	i32.add 	$push0=, $4, $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 label11
-# BB#2:                                 # %if.end
-	i32.const	$push54=, 0
+# %bb.2:                                # %if.end
 	i32.const	$push50=, 1103515245
 	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	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.add 	$2=, $pop51, $pop52
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push53=, $2, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$0=, $pop53, $pop160
+	i32.const	$push54=, 0
+	i32.store	myrnd.s($pop54), $0
+	i32.const	$push159=, 16
+	i32.shr_u	$push55=, $2, $pop159
+	i32.const	$push158=, 2047
+	i32.and 	$2=, $pop55, $pop158
+	i64.extend_u/i32	$push56=, $2
+	i64.or  	$3=, $1, $pop56
+	i32.const	$push157=, 0
+	i64.store	sP($pop157), $3
+	i32.wrap/i64	$5=, $3
+	i32.const	$push156=, 2047
+	i32.and 	$push57=, $5, $pop156
 	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
+# %bb.3:                                # %lor.lhs.false83
+	i32.const	$push164=, 16
+	i32.shr_u	$push59=, $0, $pop164
+	i32.const	$push163=, 2047
+	i32.and 	$4=, $pop59, $pop163
+	i32.add 	$push60=, $4, $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.const	$push162=, 15
+	i32.rem_u	$push66=, $pop65, $pop162
 	i32.ne  	$push67=, $pop62, $pop66
 	br_if   	0, $pop67       # 0: down to label11
-# BB#4:                                 # %if.end134
-	i32.const	$push72=, 0
+# %bb.4:                                # %if.end134
 	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.add 	$0=, $pop69, $pop70
+	i32.const	$push169=, 1103515245
+	i32.mul 	$push71=, $0, $pop169
+	i32.const	$push168=, 12345
+	i32.add 	$2=, $pop71, $pop168
+	i32.const	$push72=, 0
+	i32.store	myrnd.s($pop72), $2
+	i32.const	$push167=, 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	$push74=, $0, $pop224
-	i32.const	$push223=, 2047
-	i32.and 	$push76=, $pop74, $pop223
+	i32.const	$push166=, 16
+	i32.shr_u	$push74=, $0, $pop166
+	i32.const	$push165=, 2047
+	i32.and 	$push76=, $pop74, $pop165
 	i32.add 	$push79=, $pop78, $pop76
 	i64.extend_u/i32	$push80=, $pop79
 	i64.or  	$push81=, $1, $pop80
-	i64.store	sP($pop225), $pop81
+	i64.store	sP($pop167), $pop81
 	return
 .LBB96_5:                               # %if.then
 	end_block                       # label11:
@@ -4668,7 +4319,7 @@ testP:                                  # @testP
 	.type	retmeQ,@function
 retmeQ:                                 # @retmeQ
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -4689,7 +4340,7 @@ retmeQ:                                 # @retmeQ
 fn1Q:                                   # @fn1Q
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sQ($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4707,7 +4358,7 @@ fn1Q:                                   # @fn1Q
 fn2Q:                                   # @fn2Q
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sQ($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4726,7 +4377,7 @@ fn2Q:                                   # @fn2Q
 	.type	retitQ,@function
 retitQ:                                 # @retitQ
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sQ($pop0)
 	i32.const	$push2=, 4095
@@ -4744,21 +4395,19 @@ fn3Q:                                   # @fn3Q
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sQ($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sQ($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sQ($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sQ($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end101:
 	.size	fn3Q, .Lfunc_end101-fn3Q
@@ -4769,165 +4418,147 @@ fn3Q:                                   # @fn3Q
 	.type	testQ,@function
 testQ:                                  # @testQ
 	.local  	i32, i32
-# BB#0:                                 # %if.end75
+# %bb.0:                                # %if.end75
 	i32.const	$push0=, 0
-	i32.const	$push155=, 0
-	i32.load	$push1=, myrnd.s($pop155)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push154=, $pop3, $pop4
-	tee_local	$push153=, $0=, $pop154
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push119=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop153, $pop5
-	i32.store8	sQ($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	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sQ($pop119), $pop6
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push7=, $0, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$0=, $pop7, $pop117
 	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	$push115=, 16
+	i32.shr_u	$push8=, $0, $pop115
+	i32.store8	sQ+1($pop116), $pop8
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push9=, $0, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$0=, $pop9, $pop113
+	i32.const	$push112=, 0
 	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.shr_u	$push10=, $0, $pop111
+	i32.store8	sQ+2($pop112), $pop10
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push11=, $0, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$0=, $pop11, $pop109
+	i32.const	$push108=, 0
+	i32.const	$push107=, 16
+	i32.shr_u	$push12=, $0, $pop107
+	i32.store8	sQ+3($pop108), $pop12
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push13=, $0, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$0=, $pop13, $pop105
 	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	$push103=, 16
+	i32.shr_u	$push14=, $0, $pop103
+	i32.store8	sQ+4($pop104), $pop14
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push15=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$0=, $pop15, $pop101
+	i32.const	$push100=, 0
 	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.shr_u	$push16=, $0, $pop99
+	i32.store8	sQ+5($pop100), $pop16
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push17=, $0, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$0=, $pop17, $pop97
+	i32.const	$push96=, 0
+	i32.const	$push95=, 16
+	i32.shr_u	$push18=, $0, $pop95
+	i32.store8	sQ+6($pop96), $pop18
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push19=, $0, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$0=, $pop19, $pop93
 	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	$push91=, 16
+	i32.shr_u	$push20=, $0, $pop91
+	i32.store8	sQ+7($pop92), $pop20
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push21=, $0, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$0=, $pop21, $pop89
+	i32.const	$push88=, 0
 	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.shr_u	$push22=, $0, $pop87
+	i32.store8	sQ+8($pop88), $pop22
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push23=, $0, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$0=, $pop23, $pop85
+	i32.const	$push84=, 0
+	i32.const	$push83=, 16
+	i32.shr_u	$push24=, $0, $pop83
+	i32.store8	sQ+9($pop84), $pop24
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push25=, $0, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$0=, $pop25, $pop81
 	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	$push79=, 16
+	i32.shr_u	$push26=, $0, $pop79
+	i32.store8	sQ+10($pop80), $pop26
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push27=, $0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$0=, $pop27, $pop77
+	i32.const	$push76=, 0
 	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.shr_u	$push28=, $0, $pop75
+	i32.store8	sQ+11($pop76), $pop28
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push29=, $0, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$0=, $pop29, $pop73
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push30=, $0, $pop71
+	i32.store8	sQ+12($pop72), $pop30
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push31=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$0=, $pop31, $pop69
 	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	$push67=, 16
+	i32.shr_u	$push32=, $0, $pop67
+	i32.store8	sQ+13($pop68), $pop32
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push33=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$0=, $pop33, $pop65
+	i32.const	$push64=, 0
 	i32.const	$push63=, 16
-	i32.shr_u	$push36=, $pop64, $pop63
-	i32.store8	sQ+15($pop68), $pop36
-	i32.const	$push62=, 0
+	i32.shr_u	$push34=, $0, $pop63
+	i32.store8	sQ+14($pop64), $pop34
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push35=, $0, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$0=, $pop35, $pop61
+	i32.const	$push60=, 0
+	i32.const	$push59=, 16
+	i32.shr_u	$push36=, $0, $pop59
+	i32.store8	sQ+15($pop60), $pop36
 	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.add 	$0=, $pop38, $pop39
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push40=, $0, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$1=, $pop40, $pop57
+	i32.const	$push56=, 0
+	i32.store	myrnd.s($pop56), $1
 	i32.const	$push55=, 0
 	i32.const	$push54=, 16
 	i32.shr_u	$push44=, $1, $pop54
@@ -4955,7 +4586,7 @@ testQ:                                  # @testQ
 	.type	retmeR,@function
 retmeR:                                 # @retmeR
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -4976,7 +4607,7 @@ retmeR:                                 # @retmeR
 fn1R:                                   # @fn1R
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sR($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4994,7 +4625,7 @@ fn1R:                                   # @fn1R
 fn2R:                                   # @fn2R
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sR($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5013,7 +4644,7 @@ fn2R:                                   # @fn2R
 	.type	retitR,@function
 retitR:                                 # @retitR
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sR($pop0)
 	i32.const	$push2=, 4095
@@ -5031,21 +4662,19 @@ fn3R:                                   # @fn3R
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sR($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sR($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sR($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sR($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end107:
 	.size	fn3R, .Lfunc_end107-fn3R
@@ -5056,165 +4685,147 @@ fn3R:                                   # @fn3R
 	.type	testR,@function
 testR:                                  # @testR
 	.local  	i32, i32
-# BB#0:                                 # %if.end75
+# %bb.0:                                # %if.end75
 	i32.const	$push0=, 0
-	i32.const	$push155=, 0
-	i32.load	$push1=, myrnd.s($pop155)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push154=, $pop3, $pop4
-	tee_local	$push153=, $0=, $pop154
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push119=, 0
 	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sR($pop119), $pop6
+	i32.const	$push118=, 1103515245
+	i32.mul 	$push7=, $0, $pop118
+	i32.const	$push117=, 12345
+	i32.add 	$0=, $pop7, $pop117
 	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	$push115=, 16
+	i32.shr_u	$push8=, $0, $pop115
+	i32.store8	sR+1($pop116), $pop8
+	i32.const	$push114=, 1103515245
+	i32.mul 	$push9=, $0, $pop114
+	i32.const	$push113=, 12345
+	i32.add 	$0=, $pop9, $pop113
+	i32.const	$push112=, 0
 	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.shr_u	$push10=, $0, $pop111
+	i32.store8	sR+2($pop112), $pop10
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push11=, $0, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$0=, $pop11, $pop109
+	i32.const	$push108=, 0
+	i32.const	$push107=, 16
+	i32.shr_u	$push12=, $0, $pop107
+	i32.store8	sR+3($pop108), $pop12
+	i32.const	$push106=, 1103515245
+	i32.mul 	$push13=, $0, $pop106
+	i32.const	$push105=, 12345
+	i32.add 	$0=, $pop13, $pop105
 	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	$push103=, 16
+	i32.shr_u	$push14=, $0, $pop103
+	i32.store8	sR+4($pop104), $pop14
+	i32.const	$push102=, 1103515245
+	i32.mul 	$push15=, $0, $pop102
+	i32.const	$push101=, 12345
+	i32.add 	$0=, $pop15, $pop101
+	i32.const	$push100=, 0
 	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.shr_u	$push16=, $0, $pop99
+	i32.store8	sR+5($pop100), $pop16
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push17=, $0, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$0=, $pop17, $pop97
+	i32.const	$push96=, 0
+	i32.const	$push95=, 16
+	i32.shr_u	$push18=, $0, $pop95
+	i32.store8	sR+6($pop96), $pop18
+	i32.const	$push94=, 1103515245
+	i32.mul 	$push19=, $0, $pop94
+	i32.const	$push93=, 12345
+	i32.add 	$0=, $pop19, $pop93
 	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	$push91=, 16
+	i32.shr_u	$push20=, $0, $pop91
+	i32.store8	sR+7($pop92), $pop20
+	i32.const	$push90=, 1103515245
+	i32.mul 	$push21=, $0, $pop90
+	i32.const	$push89=, 12345
+	i32.add 	$0=, $pop21, $pop89
+	i32.const	$push88=, 0
 	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.shr_u	$push22=, $0, $pop87
+	i32.store8	sR+8($pop88), $pop22
+	i32.const	$push86=, 1103515245
+	i32.mul 	$push23=, $0, $pop86
+	i32.const	$push85=, 12345
+	i32.add 	$0=, $pop23, $pop85
+	i32.const	$push84=, 0
+	i32.const	$push83=, 16
+	i32.shr_u	$push24=, $0, $pop83
+	i32.store8	sR+9($pop84), $pop24
+	i32.const	$push82=, 1103515245
+	i32.mul 	$push25=, $0, $pop82
+	i32.const	$push81=, 12345
+	i32.add 	$0=, $pop25, $pop81
 	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	$push79=, 16
+	i32.shr_u	$push26=, $0, $pop79
+	i32.store8	sR+10($pop80), $pop26
+	i32.const	$push78=, 1103515245
+	i32.mul 	$push27=, $0, $pop78
+	i32.const	$push77=, 12345
+	i32.add 	$0=, $pop27, $pop77
+	i32.const	$push76=, 0
 	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.shr_u	$push28=, $0, $pop75
+	i32.store8	sR+11($pop76), $pop28
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push29=, $0, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$0=, $pop29, $pop73
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push30=, $0, $pop71
+	i32.store8	sR+12($pop72), $pop30
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push31=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$0=, $pop31, $pop69
 	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	$push67=, 16
+	i32.shr_u	$push32=, $0, $pop67
+	i32.store8	sR+13($pop68), $pop32
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push33=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$0=, $pop33, $pop65
+	i32.const	$push64=, 0
 	i32.const	$push63=, 16
-	i32.shr_u	$push36=, $pop64, $pop63
-	i32.store8	sR+15($pop68), $pop36
-	i32.const	$push62=, 0
+	i32.shr_u	$push34=, $0, $pop63
+	i32.store8	sR+14($pop64), $pop34
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push35=, $0, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$0=, $pop35, $pop61
+	i32.const	$push60=, 0
+	i32.const	$push59=, 16
+	i32.shr_u	$push36=, $0, $pop59
+	i32.store8	sR+15($pop60), $pop36
 	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.add 	$0=, $pop38, $pop39
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push40=, $0, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$1=, $pop40, $pop57
+	i32.const	$push56=, 0
+	i32.store	myrnd.s($pop56), $1
 	i32.const	$push55=, 0
 	i32.const	$push54=, 16
 	i32.shr_u	$push44=, $1, $pop54
@@ -5242,7 +4853,7 @@ testR:                                  # @testR
 	.type	retmeS,@function
 retmeS:                                 # @retmeS
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -5263,7 +4874,7 @@ retmeS:                                 # @retmeS
 fn1S:                                   # @fn1S
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sS($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5281,7 +4892,7 @@ fn1S:                                   # @fn1S
 fn2S:                                   # @fn2S
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sS($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5298,7 +4909,7 @@ fn2S:                                   # @fn2S
 	.type	retitS,@function
 retitS:                                 # @retitS
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sS($pop0)
 	i32.const	$push2=, 1
@@ -5316,21 +4927,19 @@ fn3S:                                   # @fn3S
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %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.load16_u	$1=, sS($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 1
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	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
+	i32.or  	$push5=, $0, $pop2
+	i32.store16	sS($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end113:
 	.size	fn3S, .Lfunc_end113-fn3S
@@ -5341,165 +4950,147 @@ fn3S:                                   # @fn3S
 	.type	testS,@function
 testS:                                  # @testS
 	.local  	i32, i32
-# BB#0:                                 # %if.end90
+# %bb.0:                                # %if.end90
 	i32.const	$push0=, 0
-	i32.const	$push154=, 0
-	i32.load	$push1=, myrnd.s($pop154)
+	i32.load	$push1=, myrnd.s($pop0)
 	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 	$0=, $pop3, $pop4
+	i32.const	$push118=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop152, $pop5
-	i32.store8	sS($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	sS+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	sS+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	sS+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	sS+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	sS+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	sS+6($pop121), $pop18
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sS($pop118), $pop6
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push7=, $0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$0=, $pop7, $pop116
 	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	$push114=, 16
+	i32.shr_u	$push8=, $0, $pop114
+	i32.store8	sS+1($pop115), $pop8
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push9=, $0, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$0=, $pop9, $pop112
+	i32.const	$push111=, 0
 	i32.const	$push110=, 16
-	i32.shr_u	$push20=, $pop111, $pop110
-	i32.store8	sS+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	sS+8($pop109), $pop22
+	i32.shr_u	$push10=, $0, $pop110
+	i32.store8	sS+2($pop111), $pop10
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push11=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$0=, $pop11, $pop108
+	i32.const	$push107=, 0
+	i32.const	$push106=, 16
+	i32.shr_u	$push12=, $0, $pop106
+	i32.store8	sS+3($pop107), $pop12
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push13=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$0=, $pop13, $pop104
 	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	$push102=, 16
+	i32.shr_u	$push14=, $0, $pop102
+	i32.store8	sS+4($pop103), $pop14
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push15=, $0, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$0=, $pop15, $pop100
+	i32.const	$push99=, 0
 	i32.const	$push98=, 16
-	i32.shr_u	$push24=, $pop99, $pop98
-	i32.store8	sS+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	sS+10($pop97), $pop26
+	i32.shr_u	$push16=, $0, $pop98
+	i32.store8	sS+5($pop99), $pop16
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push17=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$0=, $pop17, $pop96
+	i32.const	$push95=, 0
+	i32.const	$push94=, 16
+	i32.shr_u	$push18=, $0, $pop94
+	i32.store8	sS+6($pop95), $pop18
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push19=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$0=, $pop19, $pop92
 	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	$push90=, 16
+	i32.shr_u	$push20=, $0, $pop90
+	i32.store8	sS+7($pop91), $pop20
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push21=, $0, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop21, $pop88
+	i32.const	$push87=, 0
 	i32.const	$push86=, 16
-	i32.shr_u	$push28=, $pop87, $pop86
-	i32.store8	sS+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	sS+12($pop85), $pop30
+	i32.shr_u	$push22=, $0, $pop86
+	i32.store8	sS+8($pop87), $pop22
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push23=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$0=, $pop23, $pop84
+	i32.const	$push83=, 0
+	i32.const	$push82=, 16
+	i32.shr_u	$push24=, $0, $pop82
+	i32.store8	sS+9($pop83), $pop24
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push25=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop25, $pop80
 	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	$push78=, 16
+	i32.shr_u	$push26=, $0, $pop78
+	i32.store8	sS+10($pop79), $pop26
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push27=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop27, $pop76
+	i32.const	$push75=, 0
 	i32.const	$push74=, 16
-	i32.shr_u	$push32=, $pop75, $pop74
-	i32.store8	sS+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	sS+14($pop73), $pop34
+	i32.shr_u	$push28=, $0, $pop74
+	i32.store8	sS+11($pop75), $pop28
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push29=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop29, $pop72
+	i32.const	$push71=, 0
+	i32.const	$push70=, 16
+	i32.shr_u	$push30=, $0, $pop70
+	i32.store8	sS+12($pop71), $pop30
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push31=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop31, $pop68
 	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	$push66=, 16
+	i32.shr_u	$push32=, $0, $pop66
+	i32.store8	sS+13($pop67), $pop32
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push33=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop33, $pop64
+	i32.const	$push63=, 0
 	i32.const	$push62=, 16
-	i32.shr_u	$push36=, $pop63, $pop62
-	i32.store8	sS+15($pop67), $pop36
-	i32.const	$push61=, 0
+	i32.shr_u	$push34=, $0, $pop62
+	i32.store8	sS+14($pop63), $pop34
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push35=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop35, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push36=, $0, $pop58
+	i32.store8	sS+15($pop59), $pop36
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	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.add 	$0=, $pop38, $pop39
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push40=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$1=, $pop40, $pop56
+	i32.const	$push55=, 0
+	i32.store	myrnd.s($pop55), $1
 	i32.const	$push54=, 0
 	i32.const	$push53=, 16
 	i32.shr_u	$push42=, $1, $pop53
@@ -5516,9 +5107,9 @@ testS:                                  # @testS
 	i32.store16	sS($pop54), $pop49
 	block   	
 	i32.const	$push50=, 1
-	i32.eqz 	$push155=, $pop50
-	br_if   	0, $pop155      # 0: down to label12
-# BB#1:                                 # %if.end134
+	i32.eqz 	$push119=, $pop50
+	br_if   	0, $pop119      # 0: down to label12
+# %bb.1:                                # %if.end134
 	return
 .LBB114_2:                              # %if.then133
 	end_block                       # label12:
@@ -5534,7 +5125,7 @@ testS:                                  # @testS
 	.type	retmeT,@function
 retmeT:                                 # @retmeT
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=1
 	i32.store	0($0):p2align=1, $pop0
                                         # fallthrough-return
@@ -5549,7 +5140,7 @@ retmeT:                                 # @retmeT
 fn1T:                                   # @fn1T
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sT($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5567,7 +5158,7 @@ fn1T:                                   # @fn1T
 fn2T:                                   # @fn2T
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sT($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5584,7 +5175,7 @@ fn2T:                                   # @fn2T
 	.type	retitT,@function
 retitT:                                 # @retitT
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sT($pop0)
 	i32.const	$push2=, 1
@@ -5602,21 +5193,19 @@ fn3T:                                   # @fn3T
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load16_u	$push9=, sT($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load16_u	$1=, sT($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 1
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, 65534
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store16	sT($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store16	sT($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end119:
 	.size	fn3T, .Lfunc_end119-fn3T
@@ -5627,75 +5216,66 @@ fn3T:                                   # @fn3T
 	.type	testT,@function
 testT:                                  # @testT
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push75=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push57=, 0
+	i32.load	$push0=, myrnd.s($pop57)
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$0=, $pop1, $pop55
+	i32.const	$push54=, 0
+	i32.const	$push53=, 16
+	i32.shr_u	$push2=, $0, $pop53
+	i32.store8	sT($pop54), $pop2
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push3=, $0, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$0=, $pop3, $pop51
 	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	$push49=, 16
+	i32.shr_u	$push4=, $0, $pop49
+	i32.store8	sT+1($pop50), $pop4
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push5=, $0, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$0=, $pop5, $pop47
+	i32.const	$push46=, 0
 	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.shr_u	$push6=, $0, $pop45
+	i32.store8	sT+2($pop46), $pop6
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push7=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop7, $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push8=, $0, $pop41
+	i32.store8	sT+3($pop42), $pop8
+	i32.const	$push40=, 0
+	i32.load16_u	$push9=, sT($pop40)
 	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
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push39=, 1103515245
+	i32.mul 	$push11=, $0, $pop39
+	i32.const	$push38=, 12345
+	i32.add 	$0=, $pop11, $pop38
+	i32.const	$push37=, 16
+	i32.shr_u	$2=, $0, $pop37
+	i32.const	$push36=, 0
+	i32.const	$push35=, 1
+	i32.and 	$push12=, $2, $pop35
+	i32.or  	$push13=, $pop12, $1
+	i32.store16	sT($pop36), $pop13
+	i32.const	$push34=, 1103515245
+	i32.mul 	$push14=, $0, $pop34
+	i32.const	$push33=, 12345
+	i32.add 	$0=, $pop14, $pop33
+	i32.const	$push32=, 0
+	i32.store	myrnd.s($pop32), $0
+	i32.const	$push31=, 16
+	i32.shr_u	$3=, $0, $pop31
 	block   	
-	i32.const	$push33=, 16
-	i32.shr_u	$push32=, $0, $pop33
-	tee_local	$push31=, $3=, $pop32
-	i32.add 	$push15=, $pop31, $2
+	i32.add 	$push15=, $3, $2
 	i32.const	$push30=, 0
 	i32.load	$push16=, sT($pop30)
 	i32.add 	$push17=, $3, $pop16
@@ -5703,33 +5283,31 @@ testT:                                  # @testT
 	i32.const	$push29=, 1
 	i32.and 	$push19=, $pop18, $pop29
 	br_if   	0, $pop19       # 0: down to label13
-# BB#1:                                 # %if.end94
-	i32.const	$push87=, 0
+# %bb.1:                                # %if.end94
 	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 	$0=, $pop21, $pop22
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push23=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$2=, $pop23, $pop64
+	i32.const	$push63=, 0
+	i32.store	myrnd.s($pop63), $2
+	i32.const	$push62=, 0
+	i32.const	$push61=, 16
+	i32.shr_u	$push25=, $2, $pop61
+	i32.const	$push60=, 16
+	i32.shr_u	$push24=, $0, $pop60
 	i32.add 	$push26=, $pop25, $pop24
-	i32.const	$push77=, 1
-	i32.and 	$push27=, $pop26, $pop77
+	i32.const	$push59=, 1
+	i32.and 	$push27=, $pop26, $pop59
 	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
+	i32.store16	sT($pop62), $pop28
+	i32.const	$push58=, 1
+	i32.eqz 	$push66=, $pop58
+	br_if   	0, $pop66       # 0: down to label13
+# %bb.2:                                # %if.end140
 	return
 .LBB120_3:                              # %if.then
 	end_block                       # label13:
@@ -5745,7 +5323,7 @@ testT:                                  # @testT
 	.type	retmeU,@function
 retmeU:                                 # @retmeU
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -5766,7 +5344,7 @@ retmeU:                                 # @retmeU
 fn1U:                                   # @fn1U
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sU($pop0)
 	i32.const	$push2=, 6
@@ -5786,7 +5364,7 @@ fn1U:                                   # @fn1U
 fn2U:                                   # @fn2U
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sU($pop0)
 	i32.const	$push2=, 6
@@ -5805,7 +5383,7 @@ fn2U:                                   # @fn2U
 	.type	retitU,@function
 retitU:                                 # @retitU
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sU($pop0)
 	i32.const	$push2=, 6
@@ -5825,23 +5403,21 @@ fn3U:                                   # @fn3U
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i32.load16_u	$push15=, sU($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i32.load16_u	$1=, sU($pop0)
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop14, $pop3
-	i32.add 	$push13=, $pop4, $0
-	tee_local	$push12=, $0=, $pop13
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push12=, 0
 	i32.const	$push11=, 6
-	i32.shl 	$push5=, $pop12, $pop11
+	i32.shl 	$push5=, $0, $pop11
 	i32.const	$push6=, 64
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 65471
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store16	sU($pop0), $pop8
+	i32.store16	sU($pop12), $pop8
 	i32.const	$push9=, 1
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -5855,294 +5431,259 @@ fn3U:                                   # @fn3U
 	.type	testU,@function
 testU:                                  # @testU
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push213=, 0
-	i32.load	$push1=, myrnd.s($pop213)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	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	$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.add 	$1=, $pop3, $pop4
 	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	$push166=, 16
+	i32.shr_u	$push5=, $1, $pop166
+	i32.store8	sU($pop167), $pop5
+	i32.const	$push165=, 1103515245
+	i32.mul 	$push6=, $1, $pop165
+	i32.const	$push164=, 12345
+	i32.add 	$1=, $pop6, $pop164
+	i32.const	$push163=, 0
 	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.shr_u	$push7=, $1, $pop162
+	i32.store8	sU+1($pop163), $pop7
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push8=, $1, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$1=, $pop8, $pop160
+	i32.const	$push159=, 0
+	i32.const	$push158=, 16
+	i32.shr_u	$push9=, $1, $pop158
+	i32.store8	sU+2($pop159), $pop9
+	i32.const	$push157=, 1103515245
+	i32.mul 	$push10=, $1, $pop157
+	i32.const	$push156=, 12345
+	i32.add 	$1=, $pop10, $pop156
 	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	$push154=, 16
+	i32.shr_u	$push11=, $1, $pop154
+	i32.store8	sU+3($pop155), $pop11
+	i32.const	$push153=, 1103515245
+	i32.mul 	$push12=, $1, $pop153
+	i32.const	$push152=, 12345
+	i32.add 	$1=, $pop12, $pop152
+	i32.const	$push151=, 0
 	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.shr_u	$push13=, $1, $pop150
+	i32.store8	sU+4($pop151), $pop13
+	i32.const	$push149=, 1103515245
+	i32.mul 	$push14=, $1, $pop149
+	i32.const	$push148=, 12345
+	i32.add 	$1=, $pop14, $pop148
+	i32.const	$push147=, 0
+	i32.const	$push146=, 16
+	i32.shr_u	$push15=, $1, $pop146
+	i32.store8	sU+5($pop147), $pop15
+	i32.const	$push145=, 1103515245
+	i32.mul 	$push16=, $1, $pop145
+	i32.const	$push144=, 12345
+	i32.add 	$1=, $pop16, $pop144
 	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	$push142=, 16
+	i32.shr_u	$push17=, $1, $pop142
+	i32.store8	sU+6($pop143), $pop17
+	i32.const	$push141=, 1103515245
+	i32.mul 	$push18=, $1, $pop141
+	i32.const	$push140=, 12345
+	i32.add 	$1=, $pop18, $pop140
+	i32.const	$push139=, 0
 	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.shr_u	$push19=, $1, $pop138
+	i32.store8	sU+7($pop139), $pop19
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push20=, $1, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$1=, $pop20, $pop136
+	i32.const	$push135=, 0
+	i32.const	$push134=, 16
+	i32.shr_u	$push21=, $1, $pop134
+	i32.store8	sU+8($pop135), $pop21
+	i32.const	$push133=, 1103515245
+	i32.mul 	$push22=, $1, $pop133
+	i32.const	$push132=, 12345
+	i32.add 	$1=, $pop22, $pop132
 	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	$push130=, 16
+	i32.shr_u	$push23=, $1, $pop130
+	i32.store8	sU+9($pop131), $pop23
+	i32.const	$push129=, 1103515245
+	i32.mul 	$push24=, $1, $pop129
+	i32.const	$push128=, 12345
+	i32.add 	$1=, $pop24, $pop128
+	i32.const	$push127=, 0
 	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.shr_u	$push25=, $1, $pop126
+	i32.store8	sU+10($pop127), $pop25
+	i32.const	$push125=, 1103515245
+	i32.mul 	$push26=, $1, $pop125
+	i32.const	$push124=, 12345
+	i32.add 	$1=, $pop26, $pop124
+	i32.const	$push123=, 0
+	i32.const	$push122=, 16
+	i32.shr_u	$push27=, $1, $pop122
+	i32.store8	sU+11($pop123), $pop27
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push28=, $1, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$1=, $pop28, $pop120
 	i32.const	$push119=, 0
-	i32.const	$push118=, 1103515245
-	i32.mul 	$push36=, $2, $pop118
-	i32.const	$push117=, 12345
-	i32.add 	$push116=, $pop36, $pop117
-	tee_local	$push115=, $2=, $pop116
-	i32.const	$push114=, 1103515245
-	i32.mul 	$push37=, $pop115, $pop114
-	i32.const	$push113=, 12345
-	i32.add 	$push112=, $pop37, $pop113
-	tee_local	$push111=, $1=, $pop112
-	i32.store	myrnd.s($pop119), $pop111
-	i32.const	$push110=, 0
-	i32.const	$push109=, 16
-	i32.shr_u	$push108=, $2, $pop109
-	tee_local	$push107=, $0=, $pop108
+	i32.const	$push118=, 16
+	i32.shr_u	$push29=, $1, $pop118
+	i32.store8	sU+12($pop119), $pop29
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push30=, $1, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$1=, $pop30, $pop116
+	i32.const	$push115=, 0
+	i32.const	$push114=, 16
+	i32.shr_u	$push31=, $1, $pop114
+	i32.store8	sU+13($pop115), $pop31
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push32=, $1, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$1=, $pop32, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push33=, $1, $pop110
+	i32.store8	sU+14($pop111), $pop33
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push34=, $1, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$1=, $pop34, $pop108
+	i32.const	$push107=, 0
+	i32.const	$push106=, 16
+	i32.shr_u	$push35=, $1, $pop106
+	i32.store8	sU+15($pop107), $pop35
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push36=, $1, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$2=, $pop36, $pop104
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push37=, $2, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$0=, $pop37, $pop102
+	i32.const	$push101=, 0
+	i32.store	myrnd.s($pop101), $0
+	i32.const	$push100=, 0
+	i32.load16_u	$push38=, sU($pop100)
+	i32.const	$push39=, -65
+	i32.and 	$1=, $pop38, $pop39
+	i32.const	$push99=, 16
+	i32.shr_u	$2=, $2, $pop99
 	i32.const	$push40=, 2047
-	i32.and 	$push106=, $pop107, $pop40
-	tee_local	$push105=, $3=, $pop106
+	i32.and 	$3=, $2, $pop40
 	i32.const	$push41=, 6
-	i32.shl 	$push42=, $pop105, $pop41
+	i32.shl 	$push42=, $3, $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.or  	$4=, $pop44, $1
+	i32.const	$push98=, 0
+	i32.store16	sU($pop98), $4
 	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	$push97=, 6
+	i32.shr_u	$4=, $pop46, $pop97
+	block   	
+	i32.xor 	$push47=, $4, $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	$push217=, 16
-	i32.shr_u	$push216=, $1, $pop217
-	tee_local	$push215=, $3=, $pop216
-	i32.add 	$push50=, $pop215, $4
-	i32.add 	$push49=, $3, $0
+# %bb.1:                                # %lor.lhs.false41
+	i32.const	$push169=, 16
+	i32.shr_u	$3=, $0, $pop169
+	i32.add 	$push50=, $3, $4
+	i32.add 	$push49=, $3, $2
 	i32.xor 	$push51=, $pop50, $pop49
-	i32.const	$push214=, 1
-	i32.and 	$push52=, $pop51, $pop214
+	i32.const	$push168=, 1
+	i32.and 	$push52=, $pop51, $pop168
 	br_if   	0, $pop52       # 0: down to label14
-# BB#2:                                 # %if.end
-	i32.const	$push57=, 0
+# %bb.2:                                # %if.end
 	i32.const	$push53=, 1103515245
-	i32.mul 	$push54=, $1, $pop53
+	i32.mul 	$push54=, $0, $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.add 	$2=, $pop54, $pop55
+	i32.const	$push175=, 1103515245
+	i32.mul 	$push56=, $2, $pop175
+	i32.const	$push174=, 12345
+	i32.add 	$0=, $pop56, $pop174
+	i32.const	$push57=, 0
+	i32.store	myrnd.s($pop57), $0
+	i32.const	$push173=, 16
+	i32.shr_u	$2=, $2, $pop173
 	i32.const	$push58=, 2047
-	i32.and 	$push225=, $pop226, $pop58
-	tee_local	$push224=, $3=, $pop225
+	i32.and 	$3=, $2, $pop58
 	i32.const	$push59=, 6
-	i32.shl 	$push60=, $pop224, $pop59
+	i32.shl 	$push60=, $3, $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.or  	$4=, $pop62, $1
+	i32.const	$push172=, 0
+	i32.store16	sU($pop172), $4
 	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
+	i32.const	$push171=, 6
+	i32.shr_u	$4=, $pop64, $pop171
+	i32.xor 	$push65=, $4, $3
+	i32.const	$push170=, 1
+	i32.and 	$push66=, $pop65, $pop170
 	br_if   	0, $pop66       # 0: down to label14
-# BB#3:                                 # %lor.lhs.false85
-	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
+# %bb.3:                                # %lor.lhs.false85
+	i32.const	$push177=, 16
+	i32.shr_u	$3=, $0, $pop177
+	i32.add 	$push68=, $3, $4
+	i32.add 	$push67=, $3, $2
 	i32.xor 	$push69=, $pop68, $pop67
-	i32.const	$push236=, 1
-	i32.and 	$push70=, $pop69, $pop236
+	i32.const	$push176=, 1
+	i32.and 	$push70=, $pop69, $pop176
 	br_if   	0, $pop70       # 0: down to label14
-# BB#4:                                 # %lor.lhs.false130
-	i32.const	$push75=, 0
+# %bb.4:                                # %lor.lhs.false130
 	i32.const	$push71=, 1103515245
-	i32.mul 	$push72=, $1, $pop71
+	i32.mul 	$push72=, $0, $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.add 	$0=, $pop72, $pop73
+	i32.const	$push183=, 1103515245
+	i32.mul 	$push74=, $0, $pop183
+	i32.const	$push182=, 12345
+	i32.add 	$2=, $pop74, $pop182
+	i32.const	$push75=, 0
+	i32.store	myrnd.s($pop75), $2
 	i32.const	$push76=, 16
-	i32.shr_u	$push246=, $0, $pop76
-	tee_local	$push245=, $0=, $pop246
+	i32.shr_u	$2=, $2, $pop76
 	i32.const	$push77=, 2047
-	i32.and 	$push78=, $pop245, $pop77
+	i32.and 	$push78=, $2, $pop77
 	i32.const	$push79=, 10
-	i32.shr_u	$push80=, $1, $pop79
+	i32.shr_u	$push80=, $0, $pop79
 	i32.const	$push81=, 64
 	i32.and 	$push82=, $pop80, $pop81
-	i32.or  	$push83=, $pop82, $2
+	i32.or  	$push83=, $pop82, $1
 	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.add 	$3=, $pop78, $pop87
+	i32.const	$push181=, 0
+	i32.const	$push180=, 6
+	i32.shl 	$push88=, $3, $pop180
+	i32.const	$push179=, 64
+	i32.and 	$push89=, $pop88, $pop179
+	i32.or  	$push90=, $pop89, $1
+	i32.store16	sU($pop181), $pop90
+	i32.const	$push178=, 16
+	i32.shr_u	$push91=, $0, $pop178
+	i32.add 	$push92=, $2, $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
+# %bb.5:                                # %if.end136
 	return
 .LBB126_6:                              # %if.then
 	end_block                       # label14:
@@ -6158,7 +5699,7 @@ testU:                                  # @testU
 	.type	retmeV,@function
 retmeV:                                 # @retmeV
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=1
 	i32.store	0($0):p2align=1, $pop0
                                         # fallthrough-return
@@ -6173,7 +5714,7 @@ retmeV:                                 # @retmeV
 fn1V:                                   # @fn1V
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sV($pop0)
 	i32.const	$push2=, 8
@@ -6193,7 +5734,7 @@ fn1V:                                   # @fn1V
 fn2V:                                   # @fn2V
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sV+1($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6210,7 +5751,7 @@ fn2V:                                   # @fn2V
 	.type	retitV,@function
 retitV:                                 # @retitV
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sV+1($pop0)
 	i32.const	$push2=, 1
@@ -6228,23 +5769,21 @@ fn3V:                                   # @fn3V
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i32.load16_u	$push15=, sV($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i32.load16_u	$1=, sV($pop0)
 	i32.const	$push3=, 8
-	i32.shr_u	$push4=, $pop14, $pop3
-	i32.add 	$push13=, $pop4, $0
-	tee_local	$push12=, $0=, $pop13
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push12=, 0
 	i32.const	$push11=, 8
-	i32.shl 	$push5=, $pop12, $pop11
+	i32.shl 	$push5=, $0, $pop11
 	i32.const	$push6=, 256
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 65279
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store16	sV($pop0), $pop8
+	i32.store16	sV($pop12), $pop8
 	i32.const	$push9=, 1
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -6258,76 +5797,68 @@ fn3V:                                   # @fn3V
 	.type	testV,@function
 testV:                                  # @testV
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push89=, 0
+	i32.load	$push0=, myrnd.s($pop89)
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$1=, $pop1, $pop87
 	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	$push85=, 16
+	i32.shr_u	$push2=, $1, $pop85
+	i32.store8	sV($pop86), $pop2
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push3=, $1, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$1=, $pop3, $pop83
+	i32.const	$push82=, 0
 	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.load16_u	$push9=, sV($pop73)
+	i32.shr_u	$push4=, $1, $pop81
+	i32.store8	sV+1($pop82), $pop4
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push5=, $1, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$1=, $pop5, $pop79
+	i32.const	$push78=, 0
+	i32.const	$push77=, 16
+	i32.shr_u	$push6=, $1, $pop77
+	i32.store8	sV+2($pop78), $pop6
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push7=, $1, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$2=, $pop7, $pop75
+	i32.const	$push74=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push8=, $2, $pop73
+	i32.store8	sV+3($pop74), $pop8
+	i32.const	$push72=, 0
+	i32.load16_u	$push9=, sV($pop72)
 	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
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push11=, $2, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$2=, $pop11, $pop70
+	i32.const	$push69=, 0
+	i32.const	$push68=, 8
+	i32.shr_u	$push12=, $2, $pop68
+	i32.const	$push67=, 256
+	i32.and 	$push13=, $pop12, $pop67
+	i32.or  	$push14=, $pop13, $1
+	i32.store16	sV($pop69), $pop14
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push15=, $2, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$0=, $pop15, $pop65
+	i32.const	$push64=, 0
+	i32.store	myrnd.s($pop64), $0
+	i32.const	$push63=, 16
+	i32.shr_u	$3=, $0, $pop63
 	block   	
-	i32.const	$push65=, 16
-	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.add 	$push17=, $3, $pop16
 	i32.const	$push61=, 0
 	i32.load	$push18=, sV($pop61)
 	i32.const	$push60=, 8
@@ -6337,71 +5868,60 @@ testV:                                  # @testV
 	i32.const	$push59=, 1
 	i32.and 	$push22=, $pop21, $pop59
 	br_if   	0, $pop22       # 0: down to label15
-# BB#1:                                 # %if.end
-	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
+# %bb.1:                                # %if.end
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push23=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$0=, $pop23, $pop99
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push24=, $0, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$2=, $pop24, $pop97
+	i32.const	$push96=, 0
+	i32.store	myrnd.s($pop96), $2
+	i32.const	$push95=, 16
+	i32.shr_u	$0=, $0, $pop95
 	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.and 	$3=, $0, $pop25
+	i32.const	$push94=, 8
+	i32.shl 	$push26=, $3, $pop94
+	i32.const	$push93=, 256
+	i32.and 	$push27=, $pop26, $pop93
+	i32.or  	$4=, $pop27, $1
+	i32.const	$push92=, 0
+	i32.store16	sV($pop92), $4
 	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
+	i32.const	$push91=, 8
+	i32.shr_u	$4=, $pop29, $pop91
+	i32.xor 	$push30=, $4, $3
+	i32.const	$push90=, 1
+	i32.and 	$push31=, $pop30, $pop90
 	br_if   	0, $pop31       # 0: down to label15
-# BB#2:                                 # %lor.lhs.false89
-	i32.const	$push132=, 16
-	i32.shr_u	$push131=, $2, $pop132
-	tee_local	$push130=, $3=, $pop131
-	i32.add 	$push33=, $pop130, $4
+# %bb.2:                                # %lor.lhs.false89
+	i32.const	$push102=, 16
+	i32.shr_u	$3=, $2, $pop102
+	i32.add 	$push33=, $3, $4
 	i32.add 	$push32=, $3, $0
 	i32.xor 	$push34=, $pop33, $pop32
-	i32.const	$push129=, 1
-	i32.and 	$push35=, $pop34, $pop129
+	i32.const	$push101=, 1
+	i32.and 	$push35=, $pop34, $pop101
 	br_if   	0, $pop35       # 0: down to label15
-# BB#3:                                 # %lor.lhs.false136
-	i32.const	$push40=, 0
+# %bb.3:                                # %lor.lhs.false136
 	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.add 	$2=, $pop37, $pop38
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push39=, $2, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$0=, $pop39, $pop109
+	i32.const	$push40=, 0
+	i32.store	myrnd.s($pop40), $0
 	i32.const	$push41=, 16
-	i32.shr_u	$push141=, $0, $pop41
-	tee_local	$push140=, $0=, $pop141
+	i32.shr_u	$0=, $0, $pop41
 	i32.const	$push42=, 2047
-	i32.and 	$push43=, $pop140, $pop42
+	i32.and 	$push43=, $0, $pop42
 	i32.const	$push44=, 8
 	i32.shr_u	$push45=, $2, $pop44
 	i32.const	$push46=, 256
@@ -6409,24 +5929,24 @@ testV:                                  # @testV
 	i32.or  	$push48=, $pop47, $1
 	i32.const	$push49=, 65280
 	i32.and 	$push50=, $pop48, $pop49
-	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.const	$push108=, 8
+	i32.shr_u	$push51=, $pop50, $pop108
+	i32.add 	$3=, $pop43, $pop51
+	i32.const	$push107=, 0
+	i32.const	$push106=, 8
+	i32.shl 	$push52=, $3, $pop106
+	i32.const	$push105=, 256
+	i32.and 	$push53=, $pop52, $pop105
 	i32.or  	$push54=, $pop53, $1
-	i32.store16	sV($pop142), $pop54
-	i32.const	$push134=, 16
-	i32.shr_u	$push55=, $2, $pop134
+	i32.store16	sV($pop107), $pop54
+	i32.const	$push104=, 16
+	i32.shr_u	$push55=, $2, $pop104
 	i32.add 	$push56=, $0, $pop55
 	i32.xor 	$push57=, $pop56, $3
-	i32.const	$push133=, 1
-	i32.and 	$push58=, $pop57, $pop133
+	i32.const	$push103=, 1
+	i32.and 	$push58=, $pop57, $pop103
 	br_if   	0, $pop58       # 0: down to label15
-# BB#4:                                 # %if.end142
+# %bb.4:                                # %if.end142
 	return
 .LBB132_5:                              # %if.then
 	end_block                       # label15:
@@ -6442,7 +5962,7 @@ testV:                                  # @testV
 	.type	retmeW,@function
 retmeW:                                 # @retmeW
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 24
@@ -6475,7 +5995,7 @@ retmeW:                                 # @retmeW
 fn1W:                                   # @fn1W
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sW+16($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6493,7 +6013,7 @@ fn1W:                                   # @fn1W
 fn2W:                                   # @fn2W
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sW+16($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6512,7 +6032,7 @@ fn2W:                                   # @fn2W
 	.type	retitW,@function
 retitW:                                 # @retitW
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sW+16($pop0)
 	i32.const	$push2=, 4095
@@ -6530,21 +6050,19 @@ fn3W:                                   # @fn3W
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sW+16($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sW+16($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sW+16($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sW+16($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end137:
 	.size	fn3W, .Lfunc_end137-fn3W
@@ -6555,63 +6073,59 @@ fn3W:                                   # @fn3W
 	.type	testW,@function
 testW:                                  # @testW
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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    	                # 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.const	$push28=, 1103515245
+	i32.mul 	$push2=, $1, $pop28
+	i32.const	$push27=, 12345
+	i32.add 	$1=, $pop2, $pop27
+	i32.const	$push26=, sW+32
+	i32.add 	$push1=, $0, $pop26
+	i32.const	$push25=, 16
+	i32.shr_u	$push3=, $1, $pop25
 	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
+	i32.const	$push24=, 1
+	i32.add 	$0=, $0, $pop24
+	br_if   	0, $0           # 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
+	i32.const	$push34=, 0
 	i64.const	$push6=, 0
-	i64.store	sW($pop42), $pop6
-	i32.const	$push41=, 0
+	i64.store	sW($pop34), $pop6
 	i32.const	$push7=, -341751747
 	i32.mul 	$push8=, $1, $pop7
 	i32.const	$push9=, 229283573
-	i32.add 	$push40=, $pop8, $pop9
-	tee_local	$push39=, $0=, $pop40
+	i32.add 	$0=, $pop8, $pop9
 	i32.const	$push10=, 1103515245
-	i32.mul 	$push11=, $pop39, $pop10
+	i32.mul 	$push11=, $0, $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.add 	$1=, $pop11, $pop12
+	i32.const	$push33=, 0
+	i32.store	myrnd.s($pop33), $1
+	i32.const	$push32=, 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	$push14=, $0, $pop35
-	i32.const	$push34=, 2047
-	i32.and 	$push16=, $pop14, $pop34
+	i32.const	$push31=, 16
+	i32.shr_u	$push14=, $0, $pop31
+	i32.const	$push30=, 2047
+	i32.and 	$push16=, $pop14, $pop30
 	i32.add 	$push19=, $pop18, $pop16
-	i32.const	$push33=, 0
-	i32.load	$push20=, sW+16($pop33)
+	i32.const	$push29=, 0
+	i32.load	$push20=, sW+16($pop29)
 	i32.const	$push21=, -4096
 	i32.and 	$push22=, $pop20, $pop21
 	i32.or  	$push23=, $pop19, $pop22
-	i32.store	sW+16($pop36), $pop23
+	i32.store	sW+16($pop32), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end138:
@@ -6623,7 +6137,7 @@ testW:                                  # @testW
 	.type	retmeX,@function
 retmeX:                                 # @retmeX
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 24
@@ -6656,7 +6170,7 @@ retmeX:                                 # @retmeX
 fn1X:                                   # @fn1X
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sX($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6674,7 +6188,7 @@ fn1X:                                   # @fn1X
 fn2X:                                   # @fn2X
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sX($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6693,7 +6207,7 @@ fn2X:                                   # @fn2X
 	.type	retitX,@function
 retitX:                                 # @retitX
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sX($pop0)
 	i32.const	$push2=, 4095
@@ -6711,21 +6225,19 @@ fn3X:                                   # @fn3X
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sX($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sX($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sX($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sX($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end143:
 	.size	fn3X, .Lfunc_end143-fn3X
@@ -6736,63 +6248,59 @@ fn3X:                                   # @fn3X
 	.type	testX,@function
 testX:                                  # @testX
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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    	                # 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.const	$push28=, 1103515245
+	i32.mul 	$push2=, $1, $pop28
+	i32.const	$push27=, 12345
+	i32.add 	$1=, $pop2, $pop27
+	i32.const	$push26=, sX+32
+	i32.add 	$push1=, $0, $pop26
+	i32.const	$push25=, 16
+	i32.shr_u	$push3=, $1, $pop25
 	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
+	i32.const	$push24=, 1
+	i32.add 	$0=, $0, $pop24
+	br_if   	0, $0           # 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
+	i32.const	$push34=, 0
 	i64.const	$push6=, 0
-	i64.store	sX+16($pop42), $pop6
-	i32.const	$push41=, 0
+	i64.store	sX+16($pop34), $pop6
 	i32.const	$push7=, -341751747
 	i32.mul 	$push8=, $1, $pop7
 	i32.const	$push9=, 229283573
-	i32.add 	$push40=, $pop8, $pop9
-	tee_local	$push39=, $0=, $pop40
+	i32.add 	$0=, $pop8, $pop9
 	i32.const	$push10=, 1103515245
-	i32.mul 	$push11=, $pop39, $pop10
+	i32.mul 	$push11=, $0, $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.add 	$1=, $pop11, $pop12
+	i32.const	$push33=, 0
+	i32.store	myrnd.s($pop33), $1
+	i32.const	$push32=, 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	$push14=, $0, $pop35
-	i32.const	$push34=, 2047
-	i32.and 	$push16=, $pop14, $pop34
+	i32.const	$push31=, 16
+	i32.shr_u	$push14=, $0, $pop31
+	i32.const	$push30=, 2047
+	i32.and 	$push16=, $pop14, $pop30
 	i32.add 	$push19=, $pop18, $pop16
-	i32.const	$push33=, 0
-	i32.load	$push20=, sX($pop33)
+	i32.const	$push29=, 0
+	i32.load	$push20=, sX($pop29)
 	i32.const	$push21=, -4096
 	i32.and 	$push22=, $pop20, $pop21
 	i32.or  	$push23=, $pop19, $pop22
-	i32.store	sX($pop36), $pop23
+	i32.store	sX($pop32), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end144:
@@ -6804,7 +6312,7 @@ testX:                                  # @testX
 	.type	retmeY,@function
 retmeY:                                 # @retmeY
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 24
@@ -6837,7 +6345,7 @@ retmeY:                                 # @retmeY
 fn1Y:                                   # @fn1Y
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sY($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6855,7 +6363,7 @@ fn1Y:                                   # @fn1Y
 fn2Y:                                   # @fn2Y
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sY($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6874,7 +6382,7 @@ fn2Y:                                   # @fn2Y
 	.type	retitY,@function
 retitY:                                 # @retitY
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sY($pop0)
 	i32.const	$push2=, 4095
@@ -6892,21 +6400,19 @@ fn3Y:                                   # @fn3Y
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sY($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sY($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sY($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sY($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end149:
 	.size	fn3Y, .Lfunc_end149-fn3Y
@@ -6917,63 +6423,59 @@ fn3Y:                                   # @fn3Y
 	.type	testY,@function
 testY:                                  # @testY
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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    	                # 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.const	$push28=, 1103515245
+	i32.mul 	$push2=, $1, $pop28
+	i32.const	$push27=, 12345
+	i32.add 	$1=, $pop2, $pop27
+	i32.const	$push26=, sY+32
+	i32.add 	$push1=, $0, $pop26
+	i32.const	$push25=, 16
+	i32.shr_u	$push3=, $1, $pop25
 	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
+	i32.const	$push24=, 1
+	i32.add 	$0=, $0, $pop24
+	br_if   	0, $0           # 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
+	i32.const	$push34=, 0
 	i64.const	$push6=, 0
-	i64.store	sY+16($pop42), $pop6
-	i32.const	$push41=, 0
+	i64.store	sY+16($pop34), $pop6
 	i32.const	$push7=, -341751747
 	i32.mul 	$push8=, $1, $pop7
 	i32.const	$push9=, 229283573
-	i32.add 	$push40=, $pop8, $pop9
-	tee_local	$push39=, $0=, $pop40
+	i32.add 	$0=, $pop8, $pop9
 	i32.const	$push10=, 1103515245
-	i32.mul 	$push11=, $pop39, $pop10
+	i32.mul 	$push11=, $0, $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.add 	$1=, $pop11, $pop12
+	i32.const	$push33=, 0
+	i32.store	myrnd.s($pop33), $1
+	i32.const	$push32=, 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	$push14=, $0, $pop35
-	i32.const	$push34=, 2047
-	i32.and 	$push16=, $pop14, $pop34
+	i32.const	$push31=, 16
+	i32.shr_u	$push14=, $0, $pop31
+	i32.const	$push30=, 2047
+	i32.and 	$push16=, $pop14, $pop30
 	i32.add 	$push19=, $pop18, $pop16
-	i32.const	$push33=, 0
-	i32.load	$push20=, sY($pop33)
+	i32.const	$push29=, 0
+	i32.load	$push20=, sY($pop29)
 	i32.const	$push21=, -4096
 	i32.and 	$push22=, $pop20, $pop21
 	i32.or  	$push23=, $pop19, $pop22
-	i32.store	sY($pop36), $pop23
+	i32.store	sY($pop32), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end150:
@@ -6985,7 +6487,7 @@ testY:                                  # @testY
 	.type	retmeZ,@function
 retmeZ:                                 # @retmeZ
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 24
@@ -7018,7 +6520,7 @@ retmeZ:                                 # @retmeZ
 fn1Z:                                   # @fn1Z
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push3=, sZ+16($pop2)
 	i32.const	$push0=, 20
@@ -7038,7 +6540,7 @@ fn1Z:                                   # @fn1Z
 fn2Z:                                   # @fn2Z
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sZ+16($pop0)
 	i32.const	$push2=, 20
@@ -7059,7 +6561,7 @@ fn2Z:                                   # @fn2Z
 	.type	retitZ,@function
 retitZ:                                 # @retitZ
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sZ+16($pop0)
 	i32.const	$push2=, 20
@@ -7076,15 +6578,14 @@ retitZ:                                 # @retitZ
 fn3Z:                                   # @fn3Z
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sZ+16($pop8)
+	i32.load	$push3=, sZ+16($pop2)
 	i32.const	$push0=, 20
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sZ+16($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sZ+16($pop6), $0
 	i32.const	$push5=, 20
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -7098,121 +6599,107 @@ fn3Z:                                   # @fn3Z
 	.type	testZ,@function
 testZ:                                  # @testZ
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %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    	                # 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.const	$push34=, 1103515245
+	i32.mul 	$push2=, $5, $pop34
+	i32.const	$push33=, 12345
+	i32.add 	$5=, $pop2, $pop33
+	i32.const	$push32=, sZ+32
+	i32.add 	$push1=, $4, $pop32
+	i32.const	$push31=, 16
+	i32.shr_u	$push3=, $5, $pop31
 	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
+	i32.const	$push30=, 1
+	i32.add 	$4=, $4, $pop30
+	br_if   	0, $4           # 0: up to label19
+# %bb.2:                                # %for.end
 	end_loop
-	i32.const	$push69=, 0
+	i32.const	$push51=, 0
 	i64.const	$push4=, 4612055454334320640
-	i64.store	sZ+8($pop69), $pop4
-	i32.const	$push68=, 0
+	i64.store	sZ+8($pop51), $pop4
+	i32.const	$push50=, 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.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
+	i64.store	sZ($pop50), $pop5
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push6=, $5, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$5=, $pop6, $pop48
+	i32.const	$push47=, 1103515245
+	i32.mul 	$push7=, $5, $pop47
+	i32.const	$push46=, 12345
+	i32.add 	$4=, $pop7, $pop46
+	i32.const	$push45=, 0
+	i32.store	myrnd.s($pop45), $4
+	i32.const	$push44=, 0
+	i32.load	$0=, sZ+16($pop44)
+	i32.const	$push43=, 1048575
+	i32.and 	$1=, $0, $pop43
+	i32.const	$push42=, 16
+	i32.shr_u	$push8=, $5, $pop42
+	i32.const	$push41=, 2047
+	i32.and 	$5=, $pop8, $pop41
 	i32.const	$push40=, 20
-	i32.shl 	$push12=, $3, $pop40
+	i32.shl 	$push9=, $5, $pop40
+	i32.or  	$2=, $pop9, $1
+	i32.const	$push39=, 0
+	i32.store	sZ+16($pop39), $2
+	i32.const	$push38=, 16
+	i32.shr_u	$push10=, $4, $pop38
+	i32.const	$push37=, 2047
+	i32.and 	$3=, $pop10, $pop37
+	block   	
+	i32.add 	$push11=, $3, $5
+	i32.const	$push36=, 20
+	i32.shl 	$push12=, $3, $pop36
 	i32.add 	$push13=, $pop12, $2
-	i32.const	$push39=, 20
-	i32.shr_u	$push14=, $pop13, $pop39
+	i32.const	$push35=, 20
+	i32.shr_u	$push14=, $pop13, $pop35
 	i32.ne  	$push15=, $pop11, $pop14
 	br_if   	0, $pop15       # 0: down to label20
-# BB#3:                                 # %if.end80
-	i32.const	$push90=, 0
+# %bb.3:                                # %if.end80
 	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.add 	$4=, $pop18, $pop19
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push20=, $4, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$5=, $pop20, $pop61
+	i32.const	$push60=, 0
+	i32.store	myrnd.s($pop60), $5
+	i32.const	$push59=, 16
+	i32.shr_u	$push21=, $4, $pop59
+	i32.const	$push58=, 2047
+	i32.and 	$2=, $pop21, $pop58
+	i32.const	$push57=, 16
+	i32.shr_u	$push24=, $5, $pop57
+	i32.const	$push56=, 2047
+	i32.and 	$5=, $pop24, $pop56
+	i32.const	$push55=, 20
+	i32.shl 	$push25=, $5, $pop55
+	i32.const	$push54=, 20
+	i32.shl 	$push22=, $2, $pop54
 	i32.or  	$push23=, $pop22, $1
-	i32.add 	$push72=, $pop25, $pop23
-	tee_local	$push71=, $4=, $pop72
-	i32.store	sZ+16($pop83), $pop71
+	i32.add 	$4=, $pop25, $pop23
+	i32.const	$push53=, 0
+	i32.store	sZ+16($pop53), $4
 	i32.add 	$push26=, $5, $2
-	i32.const	$push70=, 20
-	i32.shr_u	$push27=, $4, $pop70
+	i32.const	$push52=, 20
+	i32.shr_u	$push27=, $4, $pop52
 	i32.ne  	$push28=, $pop26, $pop27
 	br_if   	0, $pop28       # 0: down to label20
-# BB#4:                                 # %if.end80
+# %bb.4:                                # %if.end80
 	i32.xor 	$push29=, $4, $0
-	i32.const	$push91=, 1048575
-	i32.and 	$push16=, $pop29, $pop91
+	i32.const	$push63=, 1048575
+	i32.and 	$push16=, $pop29, $pop63
 	br_if   	0, $pop16       # 0: down to label20
-# BB#5:                                 # %if.end121
+# %bb.5:                                # %if.end121
 	return
 .LBB156_6:                              # %if.then
 	end_block                       # label20:
@@ -7228,7 +6715,7 @@ testZ:                                  # @testZ
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	testA@FUNCTION
 	call    	testB@FUNCTION
 	call    	testC@FUNCTION
@@ -7504,6 +6991,6 @@ sZ:
 	.size	sZ, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 26d60e208..bfccb966f 100644
--- a/test/torture-s/20040709-2.c.s
+++ b/test/torture-s/20040709-2.c.s
@@ -7,16 +7,15 @@
 myrnd:                                  # @myrnd
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push1=, myrnd.s($pop11)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push10=, $pop3, $pop4
-	tee_local	$push9=, $0=, $pop10
-	i32.store	myrnd.s($pop0), $pop9
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push9=, 0
+	i32.store	myrnd.s($pop9), $0
 	i32.const	$push5=, 16
 	i32.shr_u	$push6=, $0, $pop5
 	i32.const	$push7=, 2047
@@ -32,7 +31,7 @@ myrnd:                                  # @myrnd
 	.type	retmeA,@function
 retmeA:                                 # @retmeA
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$push0=, 0($1):p2align=0
 	i32.store16	0($0), $pop0
                                         # fallthrough-return
@@ -47,7 +46,7 @@ retmeA:                                 # @retmeA
 fn1A:                                   # @fn1A
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sA($pop0)
 	i32.const	$push2=, 5
@@ -67,7 +66,7 @@ fn1A:                                   # @fn1A
 fn2A:                                   # @fn2A
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sA($pop0)
 	i32.const	$push2=, 5
@@ -88,7 +87,7 @@ fn2A:                                   # @fn2A
 	.type	retitA,@function
 retitA:                                 # @retitA
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sA($pop0)
 	i32.const	$push2=, 5
@@ -106,21 +105,19 @@ fn3A:                                   # @fn3A
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, sA($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, sA($pop0)
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 5
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 31
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store16	sA($pop0), $pop6
+	i32.store16	sA($pop10), $pop6
 	i32.const	$push7=, 2047
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -134,67 +131,60 @@ fn3A:                                   # @fn3A
 	.type	testA,@function
 testA:                                  # @testA
 	.local  	i32, i32, i32
-# BB#0:                                 # %if.end106
+# %bb.0:                                # %if.end106
 	i32.const	$push0=, 0
-	i32.const	$push52=, 0
-	i32.load	$push1=, myrnd.s($pop52)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push51=, $pop3, $pop4
-	tee_local	$push50=, $0=, $pop51
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push38=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop50, $pop5
-	i32.store8	sA($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sA($pop38), $pop6
+	i32.const	$push37=, 1103515245
+	i32.mul 	$push7=, $0, $pop37
+	i32.const	$push36=, 12345
+	i32.add 	$0=, $pop7, $pop36
+	i32.const	$push35=, 0
+	i32.const	$push34=, 16
+	i32.shr_u	$push8=, $0, $pop34
+	i32.store8	sA+1($pop35), $pop8
 	i32.const	$push9=, -341751747
 	i32.mul 	$push10=, $0, $pop9
 	i32.const	$push11=, 229283573
-	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.add 	$0=, $pop10, $pop11
+	i32.const	$push33=, 1103515245
+	i32.mul 	$push12=, $0, $pop33
+	i32.const	$push32=, 12345
+	i32.add 	$1=, $pop12, $pop32
+	i32.const	$push31=, 0
+	i32.store	myrnd.s($pop31), $1
+	i32.const	$push30=, 16
+	i32.shr_u	$0=, $0, $pop30
+	i32.const	$push29=, 16
+	i32.shr_u	$1=, $1, $pop29
 	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=, 2047
-	i32.and 	$push14=, $pop30, $pop29
-	i32.add 	$push28=, $pop15, $pop14
-	tee_local	$push27=, $2=, $pop28
+	i32.and 	$push15=, $1, $pop13
+	i32.const	$push28=, 2047
+	i32.and 	$push14=, $0, $pop28
+	i32.add 	$2=, $pop15, $pop14
+	i32.const	$push27=, 0
 	i32.const	$push16=, 5
-	i32.shl 	$push17=, $pop27, $pop16
+	i32.shl 	$push17=, $2, $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($pop36), $pop21
+	i32.store16	sA($pop27), $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
+# %bb.1:                                # %if.end158
 	return
 .LBB6_2:                                # %if.then157
 	end_block                       # label0:
@@ -210,7 +200,7 @@ testA:                                  # @testA
 	.type	retmeB,@function
 retmeB:                                 # @retmeB
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=0
 	i32.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 4
@@ -231,7 +221,7 @@ retmeB:                                 # @retmeB
 fn1B:                                   # @fn1B
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sB($pop0)
 	i32.const	$push2=, 5
@@ -251,7 +241,7 @@ fn1B:                                   # @fn1B
 fn2B:                                   # @fn2B
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sB($pop0)
 	i32.const	$push2=, 5
@@ -272,7 +262,7 @@ fn2B:                                   # @fn2B
 	.type	retitB,@function
 retitB:                                 # @retitB
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sB($pop0)
 	i32.const	$push2=, 5
@@ -290,21 +280,19 @@ fn3B:                                   # @fn3B
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, sB($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, sB($pop0)
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 5
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 31
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store16	sB($pop0), $pop6
+	i32.store16	sB($pop10), $pop6
 	i32.const	$push7=, 2047
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -318,103 +306,92 @@ fn3B:                                   # @fn3B
 	.type	testB,@function
 testB:                                  # @testB
 	.local  	i32, i32, i32
-# BB#0:                                 # %lor.lhs.false130
+# %bb.0:                                # %lor.lhs.false130
 	i32.const	$push0=, 0
-	i32.const	$push84=, 0
-	i32.load	$push1=, myrnd.s($pop84)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push83=, $pop3, $pop4
-	tee_local	$push82=, $0=, $pop83
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push62=, 0
 	i32.const	$push5=, 16
-	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 	$push11=, $0, $pop68
-	i32.const	$push67=, 12345
-	i32.add 	$push66=, $pop11, $pop67
-	tee_local	$push65=, $0=, $pop66
-	i32.const	$push64=, 16
-	i32.shr_u	$push12=, $pop65, $pop64
-	i32.store8	sB+3($pop69), $pop12
-	i32.const	$push63=, 0
-	i32.const	$push62=, 1103515245
-	i32.mul 	$push13=, $0, $pop62
-	i32.const	$push61=, 12345
-	i32.add 	$push60=, $pop13, $pop61
-	tee_local	$push59=, $0=, $pop60
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sB($pop62), $pop6
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push7=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop7, $pop60
+	i32.const	$push59=, 0
 	i32.const	$push58=, 16
-	i32.shr_u	$push14=, $pop59, $pop58
-	i32.store8	sB+4($pop63), $pop14
-	i32.const	$push57=, 0
-	i32.const	$push56=, 1103515245
-	i32.mul 	$push15=, $0, $pop56
-	i32.const	$push55=, 12345
-	i32.add 	$push54=, $pop15, $pop55
-	tee_local	$push53=, $0=, $pop54
-	i32.const	$push52=, 16
-	i32.shr_u	$push16=, $pop53, $pop52
-	i32.store8	sB+5($pop57), $pop16
+	i32.shr_u	$push8=, $0, $pop58
+	i32.store8	sB+1($pop59), $pop8
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push9=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop9, $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push10=, $0, $pop54
+	i32.store8	sB+2($pop55), $pop10
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push11=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop11, $pop52
 	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push12=, $0, $pop50
+	i32.store8	sB+3($pop51), $pop12
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push13=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop13, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push14=, $0, $pop46
+	i32.store8	sB+4($pop47), $pop14
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push15=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$0=, $pop15, $pop44
+	i32.const	$push43=, 0
+	i32.const	$push42=, 16
+	i32.shr_u	$push16=, $0, $pop42
+	i32.store8	sB+5($pop43), $pop16
 	i32.const	$push17=, -341751747
 	i32.mul 	$push18=, $0, $pop17
 	i32.const	$push19=, 229283573
-	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.add 	$0=, $pop18, $pop19
+	i32.const	$push41=, 1103515245
+	i32.mul 	$push20=, $0, $pop41
+	i32.const	$push40=, 12345
+	i32.add 	$1=, $pop20, $pop40
+	i32.const	$push39=, 0
+	i32.store	myrnd.s($pop39), $1
+	i32.const	$push38=, 16
+	i32.shr_u	$0=, $0, $pop38
+	i32.const	$push37=, 16
+	i32.shr_u	$1=, $1, $pop37
 	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.and 	$push23=, $1, $pop21
+	i32.const	$push36=, 2047
+	i32.and 	$push22=, $0, $pop36
+	i32.add 	$2=, $pop23, $pop22
+	i32.const	$push35=, 0
 	i32.const	$push24=, 5
-	i32.shl 	$push25=, $pop35, $pop24
+	i32.shl 	$push25=, $2, $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
+	i32.store16	sB($pop35), $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
+# %bb.1:                                # %if.end136
 	return
 .LBB12_2:                               # %if.then135
 	end_block                       # label1:
@@ -430,7 +407,7 @@ testB:                                  # @testB
 	.type	retmeC,@function
 retmeC:                                 # @retmeC
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=0
 	i32.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 4
@@ -451,7 +428,7 @@ retmeC:                                 # @retmeC
 fn1C:                                   # @fn1C
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sC+4($pop0)
 	i32.const	$push2=, 5
@@ -471,7 +448,7 @@ fn1C:                                   # @fn1C
 fn2C:                                   # @fn2C
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sC+4($pop0)
 	i32.const	$push2=, 5
@@ -492,7 +469,7 @@ fn2C:                                   # @fn2C
 	.type	retitC,@function
 retitC:                                 # @retitC
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sC+4($pop0)
 	i32.const	$push2=, 5
@@ -510,21 +487,19 @@ fn3C:                                   # @fn3C
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, sC+4($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, sC+4($pop0)
 	i32.const	$push3=, 5
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 5
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 31
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store16	sC+4($pop0), $pop6
+	i32.store16	sC+4($pop10), $pop6
 	i32.const	$push7=, 2047
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -538,103 +513,92 @@ fn3C:                                   # @fn3C
 	.type	testC,@function
 testC:                                  # @testC
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %lor.lhs.false136
+# %bb.0:                                # %lor.lhs.false136
 	i32.const	$push0=, 0
-	i32.const	$push84=, 0
-	i32.load	$push1=, myrnd.s($pop84)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	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 	$push8=, $pop70, $pop69
-	i32.const	$push68=, 12345
-	i32.add 	$push67=, $pop8, $pop68
-	tee_local	$push66=, $4=, $pop67
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push5=, $0, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$1=, $pop5, $pop61
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push6=, $1, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$2=, $pop6, $pop59
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push7=, $2, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$3=, $pop7, $pop57
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push8=, $3, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$4=, $pop8, $pop55
+	i32.const	$push54=, 0
 	i32.const	$push9=, 16
-	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=, 16
-	i32.shr_u	$push16=, $3, $pop52
-	i32.store8	sC+3($pop53), $pop16
+	i32.shr_u	$push10=, $4, $pop9
+	i32.store8	sC+4($pop54), $pop10
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push11=, $4, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$4=, $pop11, $pop52
 	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push12=, $4, $pop50
+	i32.store8	sC+5($pop51), $pop12
+	i32.const	$push49=, 0
+	i32.const	$push48=, 16
+	i32.shr_u	$push13=, $0, $pop48
+	i32.store8	sC($pop49), $pop13
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push14=, $1, $pop46
+	i32.store8	sC+1($pop47), $pop14
+	i32.const	$push45=, 0
+	i32.const	$push44=, 16
+	i32.shr_u	$push15=, $2, $pop44
+	i32.store8	sC+2($pop45), $pop15
+	i32.const	$push43=, 0
+	i32.const	$push42=, 16
+	i32.shr_u	$push16=, $3, $pop42
+	i32.store8	sC+3($pop43), $pop16
 	i32.const	$push17=, -341751747
 	i32.mul 	$push18=, $4, $pop17
 	i32.const	$push19=, 229283573
-	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.add 	$0=, $pop18, $pop19
+	i32.const	$push41=, 1103515245
+	i32.mul 	$push20=, $0, $pop41
+	i32.const	$push40=, 12345
+	i32.add 	$1=, $pop20, $pop40
+	i32.const	$push39=, 0
+	i32.store	myrnd.s($pop39), $1
+	i32.const	$push38=, 16
+	i32.shr_u	$0=, $0, $pop38
+	i32.const	$push37=, 16
+	i32.shr_u	$1=, $1, $pop37
 	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.and 	$push23=, $1, $pop21
+	i32.const	$push36=, 2047
+	i32.and 	$push22=, $0, $pop36
+	i32.add 	$2=, $pop23, $pop22
+	i32.const	$push35=, 0
 	i32.const	$push24=, 5
-	i32.shl 	$push25=, $pop35, $pop24
+	i32.shl 	$push25=, $2, $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
+	i32.store16	sC+4($pop35), $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
+# %bb.1:                                # %if.end142
 	return
 .LBB18_2:                               # %if.then141
 	end_block                       # label2:
@@ -650,7 +614,7 @@ testC:                                  # @testC
 	.type	retmeD,@function
 retmeD:                                 # @retmeD
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -665,7 +629,7 @@ retmeD:                                 # @retmeD
 fn1D:                                   # @fn1D
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sD($pop0)
 	i64.const	$push2=, 35
@@ -686,7 +650,7 @@ fn1D:                                   # @fn1D
 fn2D:                                   # @fn2D
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sD($pop0)
 	i64.const	$push2=, 35
@@ -708,7 +672,7 @@ fn2D:                                   # @fn2D
 	.type	retitD,@function
 retitD:                                 # @retitD
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sD($pop0)
 	i64.const	$push2=, 35
@@ -727,23 +691,21 @@ fn3D:                                   # @fn3D
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sD($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i64.load	$1=, sD($pop0)
 	i64.const	$push3=, 35
-	i64.shr_u	$push4=, $pop14, $pop3
+	i64.shr_u	$push4=, $1, $pop3
 	i32.wrap/i64	$push5=, $pop4
-	i32.add 	$push13=, $pop5, $0
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push6=, $pop12
+	i32.add 	$0=, $pop5, $0
+	i32.const	$push12=, 0
+	i64.extend_u/i32	$push6=, $0
 	i64.const	$push11=, 35
 	i64.shl 	$push7=, $pop6, $pop11
 	i64.const	$push1=, 34359738367
 	i64.and 	$push2=, $1, $pop1
 	i64.or  	$push8=, $pop7, $pop2
-	i64.store	sD($pop0), $pop8
+	i64.store	sD($pop12), $pop8
 	i32.const	$push9=, 536870911
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -757,93 +719,83 @@ fn3D:                                   # @fn3D
 	.type	testD,@function
 testD:                                  # @testD
 	.local  	i32, i32
-# BB#0:                                 # %if.end158
+# %bb.0:                                # %if.end158
 	i32.const	$push0=, 0
-	i32.const	$push94=, 0
-	i32.load	$push1=, myrnd.s($pop94)
+	i32.load	$push1=, myrnd.s($pop0)
 	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 	$0=, $pop3, $pop4
+	i32.const	$push74=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop92, $pop5
-	i32.store8	sD($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sD($pop74), $pop6
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push7=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop7, $pop72
+	i32.const	$push71=, 0
+	i32.const	$push70=, 16
+	i32.shr_u	$push8=, $0, $pop70
+	i32.store8	sD+1($pop71), $pop8
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push9=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop9, $pop68
 	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	$push66=, 16
+	i32.shr_u	$push10=, $0, $pop66
+	i32.store8	sD+2($pop67), $pop10
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push11=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop11, $pop64
+	i32.const	$push63=, 0
 	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.shr_u	$push12=, $0, $pop62
+	i32.store8	sD+3($pop63), $pop12
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push13=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop13, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push14=, $0, $pop58
+	i32.store8	sD+4($pop59), $pop14
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push15=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop15, $pop56
 	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	$push54=, 16
+	i32.shr_u	$push16=, $0, $pop54
+	i32.store8	sD+5($pop55), $pop16
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push17=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop17, $pop52
+	i32.const	$push51=, 0
 	i32.const	$push50=, 16
-	i32.shr_u	$push20=, $pop51, $pop50
-	i32.store8	sD+7($pop55), $pop20
-	i32.const	$push49=, 0
+	i32.shr_u	$push18=, $0, $pop50
+	i32.store8	sD+6($pop51), $pop18
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push19=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop19, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push20=, $0, $pop46
+	i32.store8	sD+7($pop47), $pop20
 	i32.const	$push21=, -341751747
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, 229283573
-	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.add 	$0=, $pop22, $pop23
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push24=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$1=, $pop24, $pop44
+	i32.const	$push43=, 0
+	i32.store	myrnd.s($pop43), $1
 	i32.const	$push42=, 0
 	i32.const	$push41=, 16
 	i32.shr_u	$push28=, $1, $pop41
@@ -874,7 +826,7 @@ testD:                                  # @testD
 	.type	retmeE,@function
 retmeE:                                 # @retmeE
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -895,7 +847,7 @@ retmeE:                                 # @retmeE
 fn1E:                                   # @fn1E
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sE+8($pop0)
 	i64.const	$push2=, 35
@@ -916,7 +868,7 @@ fn1E:                                   # @fn1E
 fn2E:                                   # @fn2E
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sE+8($pop0)
 	i64.const	$push2=, 35
@@ -938,7 +890,7 @@ fn2E:                                   # @fn2E
 	.type	retitE,@function
 retitE:                                 # @retitE
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sE+8($pop0)
 	i64.const	$push2=, 35
@@ -957,23 +909,21 @@ fn3E:                                   # @fn3E
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sE+8($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i64.load	$1=, sE+8($pop0)
 	i64.const	$push3=, 35
-	i64.shr_u	$push4=, $pop14, $pop3
+	i64.shr_u	$push4=, $1, $pop3
 	i32.wrap/i64	$push5=, $pop4
-	i32.add 	$push13=, $pop5, $0
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push6=, $pop12
+	i32.add 	$0=, $pop5, $0
+	i32.const	$push12=, 0
+	i64.extend_u/i32	$push6=, $0
 	i64.const	$push11=, 35
 	i64.shl 	$push7=, $pop6, $pop11
 	i64.const	$push1=, 34359738367
 	i64.and 	$push2=, $1, $pop1
 	i64.or  	$push8=, $pop7, $pop2
-	i64.store	sE+8($pop0), $pop8
+	i64.store	sE+8($pop12), $pop8
 	i32.const	$push9=, 536870911
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -987,165 +937,147 @@ fn3E:                                   # @fn3E
 	.type	testE,@function
 testE:                                  # @testE
 	.local  	i32, i32
-# BB#0:                                 # %if.end95
+# %bb.0:                                # %if.end95
 	i32.const	$push0=, 0
-	i32.const	$push158=, 0
-	i32.load	$push1=, myrnd.s($pop158)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push157=, $pop3, $pop4
-	tee_local	$push156=, $0=, $pop157
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push122=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop156, $pop5
-	i32.store8	sE($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sE($pop122), $pop6
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push7=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$0=, $pop7, $pop120
 	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	$push118=, 16
+	i32.shr_u	$push8=, $0, $pop118
+	i32.store8	sE+1($pop119), $pop8
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push9=, $0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$0=, $pop9, $pop116
+	i32.const	$push115=, 0
 	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.shr_u	$push10=, $0, $pop114
+	i32.store8	sE+2($pop115), $pop10
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push11=, $0, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$0=, $pop11, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push12=, $0, $pop110
+	i32.store8	sE+3($pop111), $pop12
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push13=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$0=, $pop13, $pop108
 	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	$push106=, 16
+	i32.shr_u	$push14=, $0, $pop106
+	i32.store8	sE+4($pop107), $pop14
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push15=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$0=, $pop15, $pop104
+	i32.const	$push103=, 0
 	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.shr_u	$push16=, $0, $pop102
+	i32.store8	sE+5($pop103), $pop16
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push17=, $0, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$0=, $pop17, $pop100
+	i32.const	$push99=, 0
+	i32.const	$push98=, 16
+	i32.shr_u	$push18=, $0, $pop98
+	i32.store8	sE+6($pop99), $pop18
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push19=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$0=, $pop19, $pop96
 	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	$push94=, 16
+	i32.shr_u	$push20=, $0, $pop94
+	i32.store8	sE+7($pop95), $pop20
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push21=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$0=, $pop21, $pop92
+	i32.const	$push91=, 0
 	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.shr_u	$push22=, $0, $pop90
+	i32.store8	sE+8($pop91), $pop22
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push23=, $0, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop23, $pop88
+	i32.const	$push87=, 0
+	i32.const	$push86=, 16
+	i32.shr_u	$push24=, $0, $pop86
+	i32.store8	sE+9($pop87), $pop24
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push25=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$0=, $pop25, $pop84
 	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	$push82=, 16
+	i32.shr_u	$push26=, $0, $pop82
+	i32.store8	sE+10($pop83), $pop26
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push27=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop27, $pop80
+	i32.const	$push79=, 0
 	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.shr_u	$push28=, $0, $pop78
+	i32.store8	sE+11($pop79), $pop28
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push29=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop29, $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push30=, $0, $pop74
+	i32.store8	sE+12($pop75), $pop30
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push31=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop31, $pop72
 	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	$push70=, 16
+	i32.shr_u	$push32=, $0, $pop70
+	i32.store8	sE+13($pop71), $pop32
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push33=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop33, $pop68
+	i32.const	$push67=, 0
 	i32.const	$push66=, 16
-	i32.shr_u	$push36=, $pop67, $pop66
-	i32.store8	sE+15($pop71), $pop36
-	i32.const	$push65=, 0
+	i32.shr_u	$push34=, $0, $pop66
+	i32.store8	sE+14($pop67), $pop34
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push35=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop35, $pop64
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push36=, $0, $pop62
+	i32.store8	sE+15($pop63), $pop36
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	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.add 	$0=, $pop38, $pop39
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push40=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$1=, $pop40, $pop60
+	i32.const	$push59=, 0
+	i32.store	myrnd.s($pop59), $1
 	i32.const	$push58=, 0
 	i32.const	$push57=, 16
 	i32.shr_u	$push44=, $1, $pop57
@@ -1176,7 +1108,7 @@ testE:                                  # @testE
 	.type	retmeF,@function
 retmeF:                                 # @retmeF
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -1197,7 +1129,7 @@ retmeF:                                 # @retmeF
 fn1F:                                   # @fn1F
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sF($pop0)
 	i64.const	$push2=, 35
@@ -1218,7 +1150,7 @@ fn1F:                                   # @fn1F
 fn2F:                                   # @fn2F
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sF($pop0)
 	i64.const	$push2=, 35
@@ -1240,7 +1172,7 @@ fn2F:                                   # @fn2F
 	.type	retitF,@function
 retitF:                                 # @retitF
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, sF($pop0)
 	i64.const	$push2=, 35
@@ -1259,23 +1191,21 @@ fn3F:                                   # @fn3F
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i64.load	$push15=, sF($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i64.load	$1=, sF($pop0)
 	i64.const	$push3=, 35
-	i64.shr_u	$push4=, $pop14, $pop3
+	i64.shr_u	$push4=, $1, $pop3
 	i32.wrap/i64	$push5=, $pop4
-	i32.add 	$push13=, $pop5, $0
-	tee_local	$push12=, $0=, $pop13
-	i64.extend_u/i32	$push6=, $pop12
+	i32.add 	$0=, $pop5, $0
+	i32.const	$push12=, 0
+	i64.extend_u/i32	$push6=, $0
 	i64.const	$push11=, 35
 	i64.shl 	$push7=, $pop6, $pop11
 	i64.const	$push1=, 34359738367
 	i64.and 	$push2=, $1, $pop1
 	i64.or  	$push8=, $pop7, $pop2
-	i64.store	sF($pop0), $pop8
+	i64.store	sF($pop12), $pop8
 	i32.const	$push9=, 536870911
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -1289,165 +1219,147 @@ fn3F:                                   # @fn3F
 	.type	testF,@function
 testF:                                  # @testF
 	.local  	i32, i32
-# BB#0:                                 # %if.end91
+# %bb.0:                                # %if.end91
 	i32.const	$push0=, 0
-	i32.const	$push158=, 0
-	i32.load	$push1=, myrnd.s($pop158)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push157=, $pop3, $pop4
-	tee_local	$push156=, $0=, $pop157
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push122=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop156, $pop5
-	i32.store8	sF($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sF($pop122), $pop6
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push7=, $0, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$0=, $pop7, $pop120
 	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	$push118=, 16
+	i32.shr_u	$push8=, $0, $pop118
+	i32.store8	sF+1($pop119), $pop8
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push9=, $0, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$0=, $pop9, $pop116
+	i32.const	$push115=, 0
 	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.shr_u	$push10=, $0, $pop114
+	i32.store8	sF+2($pop115), $pop10
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push11=, $0, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$0=, $pop11, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push12=, $0, $pop110
+	i32.store8	sF+3($pop111), $pop12
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push13=, $0, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$0=, $pop13, $pop108
 	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	$push106=, 16
+	i32.shr_u	$push14=, $0, $pop106
+	i32.store8	sF+4($pop107), $pop14
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push15=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$0=, $pop15, $pop104
+	i32.const	$push103=, 0
 	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.shr_u	$push16=, $0, $pop102
+	i32.store8	sF+5($pop103), $pop16
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push17=, $0, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$0=, $pop17, $pop100
+	i32.const	$push99=, 0
+	i32.const	$push98=, 16
+	i32.shr_u	$push18=, $0, $pop98
+	i32.store8	sF+6($pop99), $pop18
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push19=, $0, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$0=, $pop19, $pop96
 	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	$push94=, 16
+	i32.shr_u	$push20=, $0, $pop94
+	i32.store8	sF+7($pop95), $pop20
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push21=, $0, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$0=, $pop21, $pop92
+	i32.const	$push91=, 0
 	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.shr_u	$push22=, $0, $pop90
+	i32.store8	sF+8($pop91), $pop22
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push23=, $0, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop23, $pop88
+	i32.const	$push87=, 0
+	i32.const	$push86=, 16
+	i32.shr_u	$push24=, $0, $pop86
+	i32.store8	sF+9($pop87), $pop24
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push25=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$0=, $pop25, $pop84
 	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	$push82=, 16
+	i32.shr_u	$push26=, $0, $pop82
+	i32.store8	sF+10($pop83), $pop26
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push27=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop27, $pop80
+	i32.const	$push79=, 0
 	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.shr_u	$push28=, $0, $pop78
+	i32.store8	sF+11($pop79), $pop28
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push29=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop29, $pop76
+	i32.const	$push75=, 0
+	i32.const	$push74=, 16
+	i32.shr_u	$push30=, $0, $pop74
+	i32.store8	sF+12($pop75), $pop30
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push31=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop31, $pop72
 	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	$push70=, 16
+	i32.shr_u	$push32=, $0, $pop70
+	i32.store8	sF+13($pop71), $pop32
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push33=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop33, $pop68
+	i32.const	$push67=, 0
 	i32.const	$push66=, 16
-	i32.shr_u	$push36=, $pop67, $pop66
-	i32.store8	sF+15($pop71), $pop36
-	i32.const	$push65=, 0
+	i32.shr_u	$push34=, $0, $pop66
+	i32.store8	sF+14($pop67), $pop34
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push35=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop35, $pop64
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push36=, $0, $pop62
+	i32.store8	sF+15($pop63), $pop36
 	i32.const	$push37=, -341751747
 	i32.mul 	$push38=, $0, $pop37
 	i32.const	$push39=, 229283573
-	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.add 	$0=, $pop38, $pop39
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push40=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$1=, $pop40, $pop60
+	i32.const	$push59=, 0
+	i32.store	myrnd.s($pop59), $1
 	i32.const	$push58=, 0
 	i32.const	$push57=, 16
 	i32.shr_u	$push44=, $1, $pop57
@@ -1478,7 +1390,7 @@ testF:                                  # @testF
 	.type	retmeG,@function
 retmeG:                                 # @retmeG
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -1499,7 +1411,7 @@ retmeG:                                 # @retmeG
 fn1G:                                   # @fn1G
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sG($pop0)
 	i32.const	$push2=, 2
@@ -1519,7 +1431,7 @@ fn1G:                                   # @fn1G
 fn2G:                                   # @fn2G
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sG($pop0)
 	i32.const	$push2=, 2
@@ -1540,7 +1452,7 @@ fn2G:                                   # @fn2G
 	.type	retitG,@function
 retitG:                                 # @retitG
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sG($pop0)
 	i32.const	$push2=, 2
@@ -1558,21 +1470,19 @@ fn3G:                                   # @fn3G
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load8_u	$push13=, sG($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load8_u	$1=, sG($pop0)
 	i32.const	$push3=, 2
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 2
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 3
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store8	sG($pop0), $pop6
+	i32.store8	sG($pop10), $pop6
 	i32.const	$push7=, 63
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -1586,126 +1496,112 @@ fn3G:                                   # @fn3G
 	.type	testG,@function
 testG:                                  # @testG
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %lor.lhs.false149
+# %bb.0:                                # %lor.lhs.false149
 	i32.const	$push0=, 0
-	i32.const	$push105=, 0
-	i32.load	$push1=, myrnd.s($pop105)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	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.add 	$0=, $pop3, $pop4
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push5=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$1=, $pop5, $pop76
+	i32.const	$push75=, 0
 	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 	$push10=, $1, $pop91
-	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop10, $pop90
-	tee_local	$push88=, $1=, $pop89
-	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.shr_u	$push7=, $1, $pop6
+	i32.store8	sG+1($pop75), $pop7
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push8=, $1, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$1=, $pop8, $pop73
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push9=, $1, $pop71
+	i32.store8	sG+2($pop72), $pop9
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push10=, $1, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$1=, $pop10, $pop69
 	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	$push67=, 16
+	i32.shr_u	$push11=, $1, $pop67
+	i32.store8	sG+3($pop68), $pop11
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push12=, $1, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$1=, $pop12, $pop65
+	i32.const	$push64=, 0
 	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.shr_u	$push13=, $1, $pop63
+	i32.store8	sG+4($pop64), $pop13
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push14=, $1, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$1=, $pop14, $pop61
+	i32.const	$push60=, 0
+	i32.const	$push59=, 16
+	i32.shr_u	$push15=, $1, $pop59
+	i32.store8	sG+5($pop60), $pop15
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push16=, $1, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$1=, $pop16, $pop57
 	i32.const	$push56=, 0
+	i32.const	$push55=, 16
+	i32.shr_u	$push17=, $1, $pop55
+	i32.store8	sG+6($pop56), $pop17
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push18=, $1, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$1=, $pop18, $pop53
+	i32.const	$push52=, 0
+	i32.const	$push51=, 16
+	i32.shr_u	$push19=, $1, $pop51
+	i32.store8	sG+7($pop52), $pop19
+	i32.const	$push50=, 1103515245
+	i32.mul 	$push20=, $1, $pop50
+	i32.const	$push49=, 12345
+	i32.add 	$1=, $pop20, $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push21=, $1, $pop47
+	i32.store8	sG+8($pop48), $pop21
 	i32.const	$push22=, -341751747
 	i32.mul 	$push23=, $1, $pop22
 	i32.const	$push24=, 229283573
-	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.add 	$1=, $pop23, $pop24
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push25=, $1, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$2=, $pop25, $pop45
+	i32.const	$push44=, 0
+	i32.store	myrnd.s($pop44), $2
+	i32.const	$push43=, 16
+	i32.shr_u	$1=, $1, $pop43
+	i32.const	$push42=, 16
+	i32.shr_u	$2=, $2, $pop42
 	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.and 	$push29=, $2, $pop28
 	i32.const	$push26=, 63
-	i32.and 	$push27=, $pop43, $pop26
-	i32.add 	$push42=, $pop29, $pop27
-	tee_local	$push41=, $3=, $pop42
+	i32.and 	$push27=, $1, $pop26
+	i32.add 	$3=, $pop29, $pop27
+	i32.const	$push41=, 0
 	i32.const	$push30=, 2
-	i32.shl 	$push31=, $pop41, $pop30
+	i32.shl 	$push31=, $3, $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
+	i32.store8	sG($pop41), $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
+# %bb.1:                                # %if.end155
 	return
 .LBB42_2:                               # %if.then154
 	end_block                       # label3:
@@ -1721,7 +1617,7 @@ testG:                                  # @testG
 	.type	retmeH,@function
 retmeH:                                 # @retmeH
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -1742,7 +1638,7 @@ retmeH:                                 # @retmeH
 fn1H:                                   # @fn1H
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sH+1($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -1760,7 +1656,7 @@ fn1H:                                   # @fn1H
 fn2H:                                   # @fn2H
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sH+1($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -1779,7 +1675,7 @@ fn2H:                                   # @fn2H
 	.type	retitH,@function
 retitH:                                 # @retitH
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sH+1($pop0)
                                         # fallthrough-return: $pop1
@@ -1794,13 +1690,12 @@ retitH:                                 # @retitH
 fn3H:                                   # @fn3H
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push6=, 0
-	i32.load8_u	$push1=, sH+1($pop6)
-	i32.add 	$push5=, $pop1, $0
-	tee_local	$push4=, $0=, $pop5
-	i32.store8	sH+1($pop0), $pop4
+	i32.load8_u	$push1=, sH+1($pop0)
+	i32.add 	$0=, $pop1, $0
+	i32.const	$push4=, 0
+	i32.store8	sH+1($pop4), $0
 	i32.const	$push2=, 255
 	i32.and 	$push3=, $0, $pop2
                                         # fallthrough-return: $pop3
@@ -1814,123 +1709,109 @@ fn3H:                                   # @fn3H
 	.type	testH,@function
 testH:                                  # @testH
 	.local  	i32, i32, i32
-# BB#0:                                 # %lor.lhs.false130
+# %bb.0:                                # %lor.lhs.false130
 	i32.const	$push0=, 0
-	i32.const	$push101=, 0
-	i32.load	$push1=, myrnd.s($pop101)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push100=, $pop3, $pop4
-	tee_local	$push99=, $0=, $pop100
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push73=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop99, $pop5
-	i32.store8	sH($pop0), $pop6
-	i32.const	$push98=, 0
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sH($pop73), $pop6
 	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.add 	$0=, $pop8, $pop9
+	i32.const	$push72=, 0
 	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.shr_u	$push10=, $0, $pop71
+	i32.store8	sH+2($pop72), $pop10
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push11=, $0, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$0=, $pop11, $pop69
+	i32.const	$push68=, 0
+	i32.const	$push67=, 16
+	i32.shr_u	$push12=, $0, $pop67
+	i32.store8	sH+3($pop68), $pop12
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push13=, $0, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$0=, $pop13, $pop65
 	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	$push63=, 16
+	i32.shr_u	$push14=, $0, $pop63
+	i32.store8	sH+4($pop64), $pop14
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push15=, $0, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$0=, $pop15, $pop61
+	i32.const	$push60=, 0
 	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.shr_u	$push16=, $0, $pop59
+	i32.store8	sH+5($pop60), $pop16
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push17=, $0, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$0=, $pop17, $pop57
+	i32.const	$push56=, 0
+	i32.const	$push55=, 16
+	i32.shr_u	$push18=, $0, $pop55
+	i32.store8	sH+6($pop56), $pop18
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push19=, $0, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$0=, $pop19, $pop53
 	i32.const	$push52=, 0
+	i32.const	$push51=, 16
+	i32.shr_u	$push20=, $0, $pop51
+	i32.store8	sH+7($pop52), $pop20
+	i32.const	$push50=, 1103515245
+	i32.mul 	$push21=, $0, $pop50
+	i32.const	$push49=, 12345
+	i32.add 	$0=, $pop21, $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push22=, $0, $pop47
+	i32.store8	sH+8($pop48), $pop22
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push23=, $0, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$0=, $pop23, $pop45
+	i32.const	$push44=, 0
+	i32.const	$push43=, 16
+	i32.shr_u	$push24=, $0, $pop43
+	i32.store8	sH+9($pop44), $pop24
 	i32.const	$push25=, -341751747
 	i32.mul 	$push26=, $0, $pop25
 	i32.const	$push27=, 229283573
-	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.add 	$0=, $pop26, $pop27
+	i32.const	$push42=, 1103515245
+	i32.mul 	$push28=, $0, $pop42
+	i32.const	$push41=, 12345
+	i32.add 	$1=, $pop28, $pop41
+	i32.const	$push40=, 0
+	i32.store	myrnd.s($pop40), $1
+	i32.const	$push39=, 16
+	i32.shr_u	$0=, $0, $pop39
+	i32.const	$push38=, 16
+	i32.shr_u	$1=, $1, $pop38
 	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.and 	$push32=, $1, $pop31
 	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
+	i32.and 	$push30=, $0, $pop29
+	i32.add 	$2=, $pop32, $pop30
+	i32.const	$push37=, 0
+	i32.store8	sH+1($pop37), $2
 	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
+# %bb.1:                                # %if.end136
 	return
 .LBB48_2:                               # %if.then135
 	end_block                       # label4:
@@ -1946,7 +1827,7 @@ testH:                                  # @testH
 	.type	retmeI,@function
 retmeI:                                 # @retmeI
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -1967,7 +1848,7 @@ retmeI:                                 # @retmeI
 fn1I:                                   # @fn1I
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sI($pop0)
 	i32.const	$push2=, 7
@@ -1987,7 +1868,7 @@ fn1I:                                   # @fn1I
 fn2I:                                   # @fn2I
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sI($pop0)
 	i32.const	$push2=, 7
@@ -2006,7 +1887,7 @@ fn2I:                                   # @fn2I
 	.type	retitI,@function
 retitI:                                 # @retitI
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sI($pop0)
 	i32.const	$push2=, 7
@@ -2024,21 +1905,19 @@ fn3I:                                   # @fn3I
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load8_u	$push13=, sI($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load8_u	$1=, sI($pop0)
 	i32.const	$push3=, 7
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 7
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 127
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store8	sI($pop0), $pop6
+	i32.store8	sI($pop10), $pop6
 	i32.const	$push7=, 1
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -2052,126 +1931,112 @@ fn3I:                                   # @fn3I
 	.type	testI,@function
 testI:                                  # @testI
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %lor.lhs.false149
+# %bb.0:                                # %lor.lhs.false149
 	i32.const	$push0=, 0
-	i32.const	$push105=, 0
-	i32.load	$push1=, myrnd.s($pop105)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	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.add 	$0=, $pop3, $pop4
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push5=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$1=, $pop5, $pop76
+	i32.const	$push75=, 0
 	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 	$push10=, $1, $pop91
-	i32.const	$push90=, 12345
-	i32.add 	$push89=, $pop10, $pop90
-	tee_local	$push88=, $1=, $pop89
-	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.shr_u	$push7=, $1, $pop6
+	i32.store8	sI+1($pop75), $pop7
+	i32.const	$push74=, 1103515245
+	i32.mul 	$push8=, $1, $pop74
+	i32.const	$push73=, 12345
+	i32.add 	$1=, $pop8, $pop73
+	i32.const	$push72=, 0
+	i32.const	$push71=, 16
+	i32.shr_u	$push9=, $1, $pop71
+	i32.store8	sI+2($pop72), $pop9
+	i32.const	$push70=, 1103515245
+	i32.mul 	$push10=, $1, $pop70
+	i32.const	$push69=, 12345
+	i32.add 	$1=, $pop10, $pop69
 	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	$push67=, 16
+	i32.shr_u	$push11=, $1, $pop67
+	i32.store8	sI+3($pop68), $pop11
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push12=, $1, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$1=, $pop12, $pop65
+	i32.const	$push64=, 0
 	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.shr_u	$push13=, $1, $pop63
+	i32.store8	sI+4($pop64), $pop13
+	i32.const	$push62=, 1103515245
+	i32.mul 	$push14=, $1, $pop62
+	i32.const	$push61=, 12345
+	i32.add 	$1=, $pop14, $pop61
+	i32.const	$push60=, 0
+	i32.const	$push59=, 16
+	i32.shr_u	$push15=, $1, $pop59
+	i32.store8	sI+5($pop60), $pop15
+	i32.const	$push58=, 1103515245
+	i32.mul 	$push16=, $1, $pop58
+	i32.const	$push57=, 12345
+	i32.add 	$1=, $pop16, $pop57
 	i32.const	$push56=, 0
+	i32.const	$push55=, 16
+	i32.shr_u	$push17=, $1, $pop55
+	i32.store8	sI+6($pop56), $pop17
+	i32.const	$push54=, 1103515245
+	i32.mul 	$push18=, $1, $pop54
+	i32.const	$push53=, 12345
+	i32.add 	$1=, $pop18, $pop53
+	i32.const	$push52=, 0
+	i32.const	$push51=, 16
+	i32.shr_u	$push19=, $1, $pop51
+	i32.store8	sI+7($pop52), $pop19
+	i32.const	$push50=, 1103515245
+	i32.mul 	$push20=, $1, $pop50
+	i32.const	$push49=, 12345
+	i32.add 	$1=, $pop20, $pop49
+	i32.const	$push48=, 0
+	i32.const	$push47=, 16
+	i32.shr_u	$push21=, $1, $pop47
+	i32.store8	sI+8($pop48), $pop21
 	i32.const	$push22=, -341751747
 	i32.mul 	$push23=, $1, $pop22
 	i32.const	$push24=, 229283573
-	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.add 	$1=, $pop23, $pop24
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push25=, $1, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$2=, $pop25, $pop45
+	i32.const	$push44=, 0
+	i32.store	myrnd.s($pop44), $2
+	i32.const	$push43=, 16
+	i32.shr_u	$1=, $1, $pop43
+	i32.const	$push42=, 16
+	i32.shr_u	$2=, $2, $pop42
 	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.and 	$push29=, $2, $pop28
 	i32.const	$push26=, 1
-	i32.and 	$push27=, $pop43, $pop26
-	i32.add 	$push42=, $pop29, $pop27
-	tee_local	$push41=, $3=, $pop42
+	i32.and 	$push27=, $1, $pop26
+	i32.add 	$3=, $pop29, $pop27
+	i32.const	$push41=, 0
 	i32.const	$push30=, 7
-	i32.shl 	$push31=, $pop41, $pop30
+	i32.shl 	$push31=, $3, $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
+	i32.store8	sI($pop41), $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
+# %bb.1:                                # %if.end155
 	return
 .LBB54_2:                               # %if.then154
 	end_block                       # label5:
@@ -2187,7 +2052,7 @@ testI:                                  # @testI
 	.type	retmeJ,@function
 retmeJ:                                 # @retmeJ
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=0
 	i32.store	0($0):p2align=1, $pop0
                                         # fallthrough-return
@@ -2202,7 +2067,7 @@ retmeJ:                                 # @retmeJ
 fn1J:                                   # @fn1J
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sJ($pop0)
 	i32.const	$push2=, 9
@@ -2222,7 +2087,7 @@ fn1J:                                   # @fn1J
 fn2J:                                   # @fn2J
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sJ($pop0)
 	i32.const	$push2=, 9
@@ -2243,7 +2108,7 @@ fn2J:                                   # @fn2J
 	.type	retitJ,@function
 retitJ:                                 # @retitJ
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sJ($pop0)
 	i32.const	$push2=, 9
@@ -2261,21 +2126,19 @@ fn3J:                                   # @fn3J
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, sJ($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, sJ($pop0)
 	i32.const	$push3=, 9
-	i32.shr_u	$push4=, $pop12, $pop3
-	i32.add 	$push11=, $pop4, $0
-	tee_local	$push10=, $0=, $pop11
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push10=, 0
 	i32.const	$push9=, 9
-	i32.shl 	$push5=, $pop10, $pop9
+	i32.shl 	$push5=, $0, $pop9
 	i32.const	$push1=, 511
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push6=, $pop5, $pop2
-	i32.store16	sJ($pop0), $pop6
+	i32.store16	sJ($pop10), $pop6
 	i32.const	$push7=, 127
 	i32.and 	$push8=, $0, $pop7
                                         # fallthrough-return: $pop8
@@ -2289,75 +2152,66 @@ fn3J:                                   # @fn3J
 	.type	testJ,@function
 testJ:                                  # @testJ
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push62=, 0
+	i32.load	$push0=, myrnd.s($pop62)
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop1, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push2=, $0, $pop58
+	i32.store8	sJ($pop59), $pop2
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push3=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop3, $pop56
 	i32.const	$push55=, 0
-	i32.const	$push54=, 0
-	i32.load16_u	$push9=, sJ($pop54)
+	i32.const	$push54=, 16
+	i32.shr_u	$push4=, $0, $pop54
+	i32.store8	sJ+1($pop55), $pop4
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push5=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop5, $pop52
+	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push6=, $0, $pop50
+	i32.store8	sJ+2($pop51), $pop6
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push7=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop7, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push8=, $0, $pop46
+	i32.store8	sJ+3($pop47), $pop8
+	i32.const	$push45=, 0
+	i32.load16_u	$push9=, sJ($pop45)
 	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
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push11=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop11, $pop43
+	i32.const	$push42=, 16
+	i32.shr_u	$2=, $0, $pop42
+	i32.const	$push41=, 0
+	i32.const	$push40=, 9
+	i32.shl 	$push12=, $2, $pop40
+	i32.or  	$push13=, $1, $pop12
+	i32.store16	sJ($pop41), $pop13
+	i32.const	$push39=, 1103515245
+	i32.mul 	$push14=, $0, $pop39
+	i32.const	$push38=, 12345
+	i32.add 	$0=, $pop14, $pop38
+	i32.const	$push37=, 0
+	i32.store	myrnd.s($pop37), $0
+	i32.const	$push36=, 16
+	i32.shr_u	$3=, $0, $pop36
 	block   	
-	i32.const	$push38=, 16
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.add 	$push15=, $pop36, $2
+	i32.add 	$push15=, $3, $2
 	i32.const	$push35=, 0
 	i32.load	$push16=, sJ($pop35)
 	i32.const	$push34=, 9
@@ -2367,42 +2221,37 @@ testJ:                                  # @testJ
 	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
+# %bb.1:                                # %lor.lhs.false136
 	i32.const	$push21=, -2139243339
 	i32.mul 	$push22=, $0, $pop21
 	i32.const	$push23=, -1492899873
-	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.add 	$0=, $pop22, $pop23
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push24=, $0, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$2=, $pop24, $pop70
+	i32.const	$push69=, 0
+	i32.store	myrnd.s($pop69), $2
+	i32.const	$push68=, 16
+	i32.shr_u	$0=, $0, $pop68
+	i32.const	$push67=, 16
+	i32.shr_u	$2=, $2, $pop67
 	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.and 	$push27=, $2, $pop26
+	i32.const	$push66=, 127
+	i32.and 	$push25=, $0, $pop66
+	i32.add 	$3=, $pop27, $pop25
+	i32.const	$push65=, 0
+	i32.const	$push64=, 9
+	i32.shl 	$push28=, $3, $pop64
 	i32.or  	$push29=, $pop28, $1
-	i32.store16	sJ($pop92), $pop29
+	i32.store16	sJ($pop65), $pop29
 	i32.add 	$push30=, $2, $0
 	i32.xor 	$push31=, $pop30, $3
-	i32.const	$push81=, 127
-	i32.and 	$push32=, $pop31, $pop81
+	i32.const	$push63=, 127
+	i32.and 	$push32=, $pop31, $pop63
 	br_if   	0, $pop32       # 0: down to label6
-# BB#2:                                 # %if.end142
+# %bb.2:                                # %if.end142
 	return
 .LBB60_3:                               # %if.then
 	end_block                       # label6:
@@ -2418,7 +2267,7 @@ testJ:                                  # @testJ
 	.type	retmeK,@function
 retmeK:                                 # @retmeK
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=0
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -2433,7 +2282,7 @@ retmeK:                                 # @retmeK
 fn1K:                                   # @fn1K
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sK($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2451,7 +2300,7 @@ fn1K:                                   # @fn1K
 fn2K:                                   # @fn2K
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sK($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2470,7 +2319,7 @@ fn2K:                                   # @fn2K
 	.type	retitK,@function
 retitK:                                 # @retitK
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sK($pop0)
 	i32.const	$push2=, 63
@@ -2488,21 +2337,19 @@ fn3K:                                   # @fn3K
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sK($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sK($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sK($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sK($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end65:
 	.size	fn3K, .Lfunc_end65-fn3K
@@ -2513,57 +2360,51 @@ fn3K:                                   # @fn3K
 	.type	testK,@function
 testK:                                  # @testK
 	.local  	i32, i32
-# BB#0:                                 # %if.end129
+# %bb.0:                                # %if.end129
 	i32.const	$push0=, 0
-	i32.const	$push57=, 0
-	i32.load	$push1=, myrnd.s($pop57)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push56=, $pop3, $pop4
-	tee_local	$push55=, $0=, $pop56
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push45=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop55, $pop5
-	i32.store8	sK($pop0), $pop6
-	i32.const	$push54=, 0
-	i32.const	$push53=, 1103515245
-	i32.mul 	$push7=, $0, $pop53
-	i32.const	$push52=, 12345
-	i32.add 	$push51=, $pop7, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.const	$push49=, 16
-	i32.shr_u	$push8=, $pop50, $pop49
-	i32.store8	sK+1($pop54), $pop8
-	i32.const	$push48=, 0
-	i32.const	$push47=, 1103515245
-	i32.mul 	$push9=, $0, $pop47
-	i32.const	$push46=, 12345
-	i32.add 	$push45=, $pop9, $pop46
-	tee_local	$push44=, $0=, $pop45
-	i32.const	$push43=, 16
-	i32.shr_u	$push10=, $pop44, $pop43
-	i32.store8	sK+2($pop48), $pop10
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sK($pop45), $pop6
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push7=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop7, $pop43
 	i32.const	$push42=, 0
-	i32.const	$push41=, 1103515245
-	i32.mul 	$push11=, $0, $pop41
-	i32.const	$push40=, 12345
-	i32.add 	$push39=, $pop11, $pop40
-	tee_local	$push38=, $0=, $pop39
+	i32.const	$push41=, 16
+	i32.shr_u	$push8=, $0, $pop41
+	i32.store8	sK+1($pop42), $pop8
+	i32.const	$push40=, 1103515245
+	i32.mul 	$push9=, $0, $pop40
+	i32.const	$push39=, 12345
+	i32.add 	$0=, $pop9, $pop39
+	i32.const	$push38=, 0
 	i32.const	$push37=, 16
-	i32.shr_u	$push12=, $pop38, $pop37
-	i32.store8	sK+3($pop42), $pop12
-	i32.const	$push36=, 0
+	i32.shr_u	$push10=, $0, $pop37
+	i32.store8	sK+2($pop38), $pop10
+	i32.const	$push36=, 1103515245
+	i32.mul 	$push11=, $0, $pop36
+	i32.const	$push35=, 12345
+	i32.add 	$0=, $pop11, $pop35
+	i32.const	$push34=, 0
+	i32.const	$push33=, 16
+	i32.shr_u	$push12=, $0, $pop33
+	i32.store8	sK+3($pop34), $pop12
 	i32.const	$push13=, -341751747
 	i32.mul 	$push14=, $0, $pop13
 	i32.const	$push15=, 229283573
-	i32.add 	$push35=, $pop14, $pop15
-	tee_local	$push34=, $0=, $pop35
-	i32.const	$push33=, 1103515245
-	i32.mul 	$push16=, $pop34, $pop33
-	i32.const	$push32=, 12345
-	i32.add 	$push31=, $pop16, $pop32
-	tee_local	$push30=, $1=, $pop31
-	i32.store	myrnd.s($pop36), $pop30
+	i32.add 	$0=, $pop14, $pop15
+	i32.const	$push32=, 1103515245
+	i32.mul 	$push16=, $0, $pop32
+	i32.const	$push31=, 12345
+	i32.add 	$1=, $pop16, $pop31
+	i32.const	$push30=, 0
+	i32.store	myrnd.s($pop30), $1
 	i32.const	$push29=, 0
 	i32.const	$push28=, 16
 	i32.shr_u	$push18=, $1, $pop28
@@ -2589,7 +2430,7 @@ testK:                                  # @testK
 	.type	retmeL,@function
 retmeL:                                 # @retmeL
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -2604,7 +2445,7 @@ retmeL:                                 # @retmeL
 fn1L:                                   # @fn1L
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sL($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2622,7 +2463,7 @@ fn1L:                                   # @fn1L
 fn2L:                                   # @fn2L
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sL($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2641,7 +2482,7 @@ fn2L:                                   # @fn2L
 	.type	retitL,@function
 retitL:                                 # @retitL
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sL($pop0)
 	i32.const	$push2=, 63
@@ -2659,21 +2500,19 @@ fn3L:                                   # @fn3L
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sL($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sL($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sL($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sL($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end71:
 	.size	fn3L, .Lfunc_end71-fn3L
@@ -2684,140 +2523,124 @@ fn3L:                                   # @fn3L
 	.type	testL,@function
 testL:                                  # @testL
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push106=, 0
-	i32.const	$push105=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push78=, 0
+	i32.load	$push0=, myrnd.s($pop78)
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop1, $pop76
 	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	$push74=, 16
+	i32.shr_u	$push2=, $0, $pop74
+	i32.store8	sL($pop75), $pop2
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push3=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop3, $pop72
+	i32.const	$push71=, 0
 	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.shr_u	$push4=, $0, $pop70
+	i32.store8	sL+1($pop71), $pop4
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push5=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop5, $pop68
+	i32.const	$push67=, 0
+	i32.const	$push66=, 16
+	i32.shr_u	$push6=, $0, $pop66
+	i32.store8	sL+2($pop67), $pop6
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push7=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop7, $pop64
 	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	$push62=, 16
+	i32.shr_u	$push8=, $0, $pop62
+	i32.store8	sL+3($pop63), $pop8
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push9=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop9, $pop60
+	i32.const	$push59=, 0
 	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.shr_u	$push10=, $0, $pop58
+	i32.store8	sL+4($pop59), $pop10
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push11=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop11, $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push12=, $0, $pop54
+	i32.store8	sL+5($pop55), $pop12
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push13=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop13, $pop52
+	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push14=, $0, $pop50
+	i32.store8	sL+6($pop51), $pop14
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push15=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop15, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push16=, $0, $pop46
+	i32.store8	sL+7($pop47), $pop16
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push17=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$2=, $pop17, $pop44
+	i32.const	$push43=, 1103515245
+	i32.mul 	$push18=, $2, $pop43
+	i32.const	$push42=, 12345
+	i32.add 	$0=, $pop18, $pop42
+	i32.const	$push41=, 0
+	i32.store	myrnd.s($pop41), $0
+	i32.const	$push40=, 0
+	i32.load	$push19=, sL($pop40)
 	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
+	i32.and 	$1=, $pop19, $pop20
+	i32.const	$push39=, 16
+	i32.shr_u	$2=, $2, $pop39
+	i32.const	$push38=, 63
+	i32.and 	$push21=, $2, $pop38
+	i32.or  	$3=, $pop21, $1
+	i32.const	$push37=, 0
+	i32.store	sL($pop37), $3
+	i32.const	$push36=, 16
+	i32.shr_u	$4=, $0, $pop36
 	block   	
-	i32.const	$push38=, 16
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $4=, $pop37
-	i32.add 	$push23=, $pop36, $2
+	i32.add 	$push23=, $4, $2
 	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 label7
-# BB#1:                                 # %if.end113
-	i32.const	$push117=, 0
+# %bb.1:                                # %if.end113
 	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=, $2=, $pop112
-	i32.store	myrnd.s($pop117), $pop111
-	i32.const	$push110=, 0
-	i32.const	$push109=, 16
-	i32.shr_u	$push31=, $2, $pop109
-	i32.const	$push108=, 16
-	i32.shr_u	$push30=, $0, $pop108
+	i32.add 	$0=, $pop27, $pop28
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push29=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$2=, $pop29, $pop84
+	i32.const	$push83=, 0
+	i32.store	myrnd.s($pop83), $2
+	i32.const	$push82=, 0
+	i32.const	$push81=, 16
+	i32.shr_u	$push31=, $2, $pop81
+	i32.const	$push80=, 16
+	i32.shr_u	$push30=, $0, $pop80
 	i32.add 	$push32=, $pop31, $pop30
-	i32.const	$push107=, 63
-	i32.and 	$push33=, $pop32, $pop107
+	i32.const	$push79=, 63
+	i32.and 	$push33=, $pop32, $pop79
 	i32.or  	$push34=, $pop33, $1
-	i32.store	sL($pop110), $pop34
+	i32.store	sL($pop82), $pop34
 	return
 .LBB72_2:                               # %if.then
 	end_block                       # label7:
@@ -2833,7 +2656,7 @@ testL:                                  # @testL
 	.type	retmeM,@function
 retmeM:                                 # @retmeM
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -2848,7 +2671,7 @@ retmeM:                                 # @retmeM
 fn1M:                                   # @fn1M
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sM+4($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2866,7 +2689,7 @@ fn1M:                                   # @fn1M
 fn2M:                                   # @fn2M
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sM+4($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -2885,7 +2708,7 @@ fn2M:                                   # @fn2M
 	.type	retitM,@function
 retitM:                                 # @retitM
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sM+4($pop0)
 	i32.const	$push2=, 63
@@ -2903,21 +2726,19 @@ fn3M:                                   # @fn3M
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sM+4($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sM+4($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 63
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -64
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sM+4($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sM+4($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end77:
 	.size	fn3M, .Lfunc_end77-fn3M
@@ -2928,140 +2749,124 @@ fn3M:                                   # @fn3M
 	.type	testM,@function
 testM:                                  # @testM
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push106=, 0
-	i32.const	$push105=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push78=, 0
+	i32.load	$push0=, myrnd.s($pop78)
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop1, $pop76
+	i32.const	$push75=, 1103515245
+	i32.mul 	$push2=, $0, $pop75
+	i32.const	$push74=, 12345
+	i32.add 	$1=, $pop2, $pop74
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push3=, $1, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$2=, $pop3, $pop72
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push4=, $2, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$3=, $pop4, $pop70
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push5=, $3, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$4=, $pop5, $pop68
+	i32.const	$push67=, 0
 	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.shr_u	$push6=, $4, $pop66
+	i32.store8	sM+4($pop67), $pop6
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push7=, $4, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$4=, $pop7, $pop64
 	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.shr_u	$push8=, $4, $pop62
+	i32.store8	sM+5($pop63), $pop8
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push9=, $4, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$4=, $pop9, $pop60
 	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.shr_u	$push10=, $4, $pop58
+	i32.store8	sM+6($pop59), $pop10
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push11=, $4, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$4=, $pop11, $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push12=, $4, $pop54
+	i32.store8	sM+7($pop55), $pop12
+	i32.const	$push53=, 0
+	i32.const	$push52=, 16
+	i32.shr_u	$push13=, $0, $pop52
+	i32.store8	sM($pop53), $pop13
+	i32.const	$push51=, 0
+	i32.const	$push50=, 16
+	i32.shr_u	$push14=, $1, $pop50
+	i32.store8	sM+1($pop51), $pop14
+	i32.const	$push49=, 0
+	i32.const	$push48=, 16
+	i32.shr_u	$push15=, $2, $pop48
+	i32.store8	sM+2($pop49), $pop15
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push16=, $3, $pop46
+	i32.store8	sM+3($pop47), $pop16
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push17=, $4, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$1=, $pop17, $pop44
+	i32.const	$push43=, 1103515245
+	i32.mul 	$push18=, $1, $pop43
+	i32.const	$push42=, 12345
+	i32.add 	$0=, $pop18, $pop42
+	i32.const	$push41=, 0
+	i32.store	myrnd.s($pop41), $0
+	i32.const	$push40=, 0
+	i32.load	$push19=, sM+4($pop40)
 	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
+	i32.and 	$2=, $pop19, $pop20
+	i32.const	$push39=, 16
+	i32.shr_u	$1=, $1, $pop39
+	i32.const	$push38=, 63
+	i32.and 	$push21=, $1, $pop38
+	i32.or  	$3=, $pop21, $2
+	i32.const	$push37=, 0
+	i32.store	sM+4($pop37), $3
+	i32.const	$push36=, 16
+	i32.shr_u	$4=, $0, $pop36
 	block   	
-	i32.const	$push38=, 16
-	i32.shr_u	$push37=, $0, $pop38
-	tee_local	$push36=, $4=, $pop37
-	i32.add 	$push23=, $pop36, $1
+	i32.add 	$push23=, $4, $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
+# %bb.1:                                # %if.end159
 	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=, $0, $pop108
+	i32.add 	$0=, $pop27, $pop28
+	i32.const	$push85=, 1103515245
+	i32.mul 	$push29=, $0, $pop85
+	i32.const	$push84=, 12345
+	i32.add 	$1=, $pop29, $pop84
+	i32.const	$push83=, 0
+	i32.store	myrnd.s($pop83), $1
+	i32.const	$push82=, 0
+	i32.const	$push81=, 16
+	i32.shr_u	$push31=, $1, $pop81
+	i32.const	$push80=, 16
+	i32.shr_u	$push30=, $0, $pop80
 	i32.add 	$push32=, $pop31, $pop30
-	i32.const	$push107=, 63
-	i32.and 	$push33=, $pop32, $pop107
+	i32.const	$push79=, 63
+	i32.and 	$push33=, $pop32, $pop79
 	i32.or  	$push34=, $pop33, $2
-	i32.store	sM+4($pop110), $pop34
+	i32.store	sM+4($pop82), $pop34
 	return
 .LBB78_2:                               # %if.then
 	end_block                       # label8:
@@ -3077,7 +2882,7 @@ testM:                                  # @testM
 	.type	retmeN,@function
 retmeN:                                 # @retmeN
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -3092,7 +2897,7 @@ retmeN:                                 # @retmeN
 fn1N:                                   # @fn1N
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sN($pop0)
 	i32.const	$push2=, 6
@@ -3112,7 +2917,7 @@ fn1N:                                   # @fn1N
 fn2N:                                   # @fn2N
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sN($pop0)
 	i32.const	$push2=, 6
@@ -3133,7 +2938,7 @@ fn2N:                                   # @fn2N
 	.type	retitN,@function
 retitN:                                 # @retitN
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sN($pop0)
 	i32.const	$push2=, 6
@@ -3153,25 +2958,23 @@ fn3N:                                   # @fn3N
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push18=, 0
-	i64.load	$push17=, sN($pop18)
-	tee_local	$push16=, $1=, $pop17
-	i64.const	$push1=, -4033
-	i64.and 	$push2=, $pop16, $pop1
+	i64.load	$1=, sN($pop0)
 	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.add 	$0=, $pop5, $0
+	i32.const	$push14=, 0
+	i64.const	$push1=, -4033
+	i64.and 	$push2=, $1, $pop1
 	i32.const	$push6=, 6
-	i32.shl 	$push7=, $pop14, $pop6
+	i32.shl 	$push7=, $0, $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
+	i64.store	sN($pop14), $pop11
 	i32.const	$push12=, 63
 	i32.and 	$push13=, $0, $pop12
                                         # fallthrough-return: $pop13
@@ -3184,233 +2987,205 @@ fn3N:                                   # @fn3N
 	.globl	testN
 	.type	testN,@function
 testN:                                  # @testN
-	.local  	i64, i32, i32, i32, i64, i64, i32, i32, i32, i64
-# BB#0:                                 # %lor.lhs.false
+	.local  	i64, i32, i32, i64, i64, i32, i32, i32, i32, i64
+# %bb.0:                                # %lor.lhs.false
 	i32.const	$push3=, 0
-	i32.const	$push173=, 0
-	i32.load	$push4=, myrnd.s($pop173)
+	i32.load	$push4=, myrnd.s($pop3)
 	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.add 	$8=, $pop6, $pop7
+	i32.const	$push143=, 0
+	i32.const	$push142=, 16
+	i32.shr_u	$push8=, $8, $pop142
+	i32.store8	sN($pop143), $pop8
+	i32.const	$push141=, 1103515245
+	i32.mul 	$push9=, $8, $pop141
+	i32.const	$push140=, 12345
+	i32.add 	$8=, $pop9, $pop140
 	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	$push138=, 16
+	i32.shr_u	$push10=, $8, $pop138
+	i32.store8	sN+1($pop139), $pop10
+	i32.const	$push137=, 1103515245
+	i32.mul 	$push11=, $8, $pop137
+	i32.const	$push136=, 12345
+	i32.add 	$8=, $pop11, $pop136
+	i32.const	$push135=, 0
 	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.shr_u	$push12=, $8, $pop134
+	i32.store8	sN+2($pop135), $pop12
+	i32.const	$push133=, 1103515245
+	i32.mul 	$push13=, $8, $pop133
+	i32.const	$push132=, 12345
+	i32.add 	$8=, $pop13, $pop132
+	i32.const	$push131=, 0
+	i32.const	$push130=, 16
+	i32.shr_u	$push14=, $8, $pop130
+	i32.store8	sN+3($pop131), $pop14
+	i32.const	$push129=, 1103515245
+	i32.mul 	$push15=, $8, $pop129
+	i32.const	$push128=, 12345
+	i32.add 	$8=, $pop15, $pop128
 	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=, 0
-	i64.load	$push116=, sN($pop117)
-	tee_local	$push115=, $0=, $pop116
+	i32.const	$push126=, 16
+	i32.shr_u	$push16=, $8, $pop126
+	i32.store8	sN+4($pop127), $pop16
+	i32.const	$push125=, 1103515245
+	i32.mul 	$push17=, $8, $pop125
+	i32.const	$push124=, 12345
+	i32.add 	$8=, $pop17, $pop124
+	i32.const	$push123=, 0
+	i32.const	$push122=, 16
+	i32.shr_u	$push18=, $8, $pop122
+	i32.store8	sN+5($pop123), $pop18
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push19=, $8, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$8=, $pop19, $pop120
+	i32.const	$push119=, 0
+	i32.const	$push118=, 16
+	i32.shr_u	$push20=, $8, $pop118
+	i32.store8	sN+6($pop119), $pop20
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push21=, $8, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$8=, $pop21, $pop116
+	i32.const	$push115=, 0
+	i32.const	$push114=, 16
+	i32.shr_u	$push22=, $8, $pop114
+	i32.store8	sN+7($pop115), $pop22
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push23=, $8, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$8=, $pop23, $pop112
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push24=, $8, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$1=, $pop24, $pop110
+	i32.const	$push109=, 0
+	i32.store	myrnd.s($pop109), $1
+	i32.const	$push108=, 0
+	i64.load	$0=, sN($pop108)
 	i64.const	$push25=, -4033
-	i64.and 	$push114=, $pop115, $pop25
-	tee_local	$push113=, $4=, $pop114
+	i64.and 	$3=, $0, $pop25
 	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   	
+	i32.and 	$2=, $pop27, $pop28
+	i64.extend_u/i32	$push29=, $2
+	i64.or  	$4=, $3, $pop29
+	i32.const	$push107=, 0
+	i64.store	sN($pop107), $4
 	i64.const	$push32=, 4032
 	i64.or  	$push33=, $0, $pop32
-	i64.xor 	$push108=, $5, $pop33
-	tee_local	$push107=, $9=, $pop108
+	i64.xor 	$9=, $4, $pop33
+	block   	
 	i64.const	$push34=, 34359734272
-	i64.and 	$push35=, $pop107, $pop34
+	i64.and 	$push35=, $9, $pop34
 	i64.const	$push106=, 0
 	i64.ne  	$push36=, $pop35, $pop106
 	br_if   	0, $pop36       # 0: down to label9
-# BB#1:                                 # %lor.lhs.false29
+# %bb.1:                                # %lor.lhs.false29
 	i64.const	$push41=, 63
 	i64.and 	$push42=, $9, $pop41
-	i64.const	$push174=, 0
-	i64.ne  	$push43=, $pop42, $pop174
+	i64.const	$push144=, 0
+	i64.ne  	$push43=, $pop42, $pop144
 	br_if   	0, $pop43       # 0: down to label9
-# BB#2:                                 # %lor.lhs.false29
-	i32.const	$push40=, 6
-	i32.shr_u	$push37=, $3, $pop40
+# %bb.2:                                # %lor.lhs.false29
 	i64.const	$push30=, 6
-	i64.shr_u	$push31=, $5, $pop30
-	i32.wrap/i64	$push176=, $pop31
-	tee_local	$push175=, $3=, $pop176
+	i64.shr_u	$push31=, $4, $pop30
+	i32.wrap/i64	$5=, $pop31
+	i32.const	$push40=, 6
+	i32.shr_u	$push37=, $2, $pop40
 	i32.const	$push39=, 63
-	i32.and 	$push38=, $pop175, $pop39
+	i32.and 	$push38=, $5, $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
+# %bb.3:                                # %lor.lhs.false49
+	i32.const	$push147=, 16
+	i32.shr_u	$2=, $1, $pop147
+	i32.add 	$push1=, $2, $5
+	i32.const	$push146=, 16
+	i32.shr_u	$push0=, $8, $pop146
 	i32.add 	$push45=, $2, $pop0
 	i32.xor 	$push46=, $pop1, $pop45
-	i32.const	$push177=, 63
-	i32.and 	$push47=, $pop46, $pop177
+	i32.const	$push145=, 63
+	i32.and 	$push47=, $pop46, $pop145
 	br_if   	0, $pop47       # 0: down to label9
-# BB#4:                                 # %lor.lhs.false69
-	i32.const	$push52=, 0
+# %bb.4:                                # %lor.lhs.false69
 	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.add 	$8=, $pop49, $pop50
+	i32.const	$push153=, 1103515245
+	i32.mul 	$push51=, $8, $pop153
+	i32.const	$push152=, 12345
+	i32.add 	$1=, $pop51, $pop152
+	i32.const	$push52=, 0
+	i32.store	myrnd.s($pop52), $1
 	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
+	i32.and 	$2=, $pop54, $pop55
+	i64.extend_u/i32	$push56=, $2
+	i64.or  	$9=, $3, $pop56
+	i32.const	$push151=, 0
+	i64.store	sN($pop151), $9
+	i32.const	$push150=, 16
+	i32.shr_u	$5=, $1, $pop150
 	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.wrap/i64	$6=, $pop58
+	i32.add 	$push59=, $5, $6
+	i32.const	$push149=, 63
+	i32.and 	$push60=, $pop59, $pop149
 	i32.const	$push61=, 15
 	i32.rem_u	$7=, $pop60, $pop61
-	i64.xor 	$push184=, $9, $5
-	tee_local	$push183=, $5=, $pop184
+	i64.xor 	$4=, $9, $4
 	i64.const	$push62=, 34359734272
-	i64.and 	$push63=, $pop183, $pop62
-	i64.const	$push182=, 0
-	i64.ne  	$push64=, $pop63, $pop182
+	i64.and 	$push63=, $4, $pop62
+	i64.const	$push148=, 0
+	i64.ne  	$push64=, $pop63, $pop148
 	br_if   	0, $pop64       # 0: down to label9
-# BB#5:                                 # %lor.lhs.false80
+# %bb.5:                                # %lor.lhs.false80
 	i64.const	$push69=, 63
-	i64.and 	$push70=, $5, $pop69
-	i64.const	$push202=, 0
-	i64.ne  	$push71=, $pop70, $pop202
+	i64.and 	$push70=, $4, $pop69
+	i64.const	$push154=, 0
+	i64.ne  	$push71=, $pop70, $pop154
 	br_if   	0, $pop71       # 0: down to label9
-# BB#6:                                 # %lor.lhs.false80
+# %bb.6:                                # %lor.lhs.false80
 	i32.const	$push68=, 6
-	i32.shr_u	$push65=, $3, $pop68
+	i32.shr_u	$push65=, $2, $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
+# %bb.7:                                # %lor.lhs.false100
+	i32.const	$push156=, 16
+	i32.shr_u	$push2=, $8, $pop156
+	i32.add 	$push73=, $5, $pop2
+	i32.const	$push155=, 63
+	i32.and 	$push74=, $pop73, $pop155
 	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
+# %bb.8:                                # %lor.lhs.false125
 	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.add 	$8=, $pop79, $pop80
+	i32.const	$push162=, 1103515245
+	i32.mul 	$push81=, $8, $pop162
+	i32.const	$push161=, 12345
+	i32.add 	$1=, $pop81, $pop161
+	i32.const	$push82=, 0
+	i32.store	myrnd.s($pop82), $1
 	i32.const	$push94=, 16
-	i32.shr_u	$push211=, $1, $pop94
-	tee_local	$push210=, $1=, $pop211
+	i32.shr_u	$1=, $1, $pop94
 	i32.const	$push95=, 2047
-	i32.and 	$push96=, $pop210, $pop95
+	i32.and 	$push96=, $1, $pop95
 	i64.const	$push83=, 274877902848
 	i64.and 	$push84=, $0, $pop83
 	i32.const	$push85=, 10
@@ -3422,23 +3197,23 @@ testN:                                  # @testN
 	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.add 	$2=, $pop96, $pop93
+	i32.const	$push160=, 0
 	i32.const	$push97=, 6
-	i32.shl 	$push98=, $pop208, $pop97
-	i32.const	$push207=, 4032
-	i32.and 	$push99=, $pop98, $pop207
+	i32.shl 	$push98=, $2, $pop97
+	i32.const	$push159=, 4032
+	i32.and 	$push99=, $pop98, $pop159
 	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
+	i64.or  	$push101=, $3, $pop100
+	i64.store	sN($pop160), $pop101
+	i32.const	$push158=, 16
+	i32.shr_u	$push102=, $8, $pop158
 	i32.add 	$push103=, $1, $pop102
-	i32.xor 	$push104=, $pop103, $3
-	i32.const	$push205=, 63
-	i32.and 	$push105=, $pop104, $pop205
+	i32.xor 	$push104=, $pop103, $2
+	i32.const	$push157=, 63
+	i32.and 	$push105=, $pop104, $pop157
 	br_if   	0, $pop105      # 0: down to label9
-# BB#9:                                 # %if.end158
+# %bb.9:                                # %if.end158
 	return
 .LBB84_10:                              # %if.then
 	end_block                       # label9:
@@ -3454,7 +3229,7 @@ testN:                                  # @testN
 	.type	retmeO,@function
 retmeO:                                 # @retmeO
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -3475,7 +3250,7 @@ retmeO:                                 # @retmeO
 fn1O:                                   # @fn1O
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sO+8($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3493,7 +3268,7 @@ fn1O:                                   # @fn1O
 fn2O:                                   # @fn2O
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sO+8($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3512,7 +3287,7 @@ fn2O:                                   # @fn2O
 	.type	retitO,@function
 retitO:                                 # @retitO
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sO+8($pop0)
 	i32.const	$push2=, 4095
@@ -3530,23 +3305,21 @@ fn3O:                                   # @fn3O
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i64.load	$push11=, sO+8($pop12)
-	tee_local	$push10=, $1=, $pop11
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $pop10, $pop1
+	i64.load	$1=, sO+8($pop0)
 	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
+	i32.and 	$0=, $pop4, $pop5
+	i32.const	$push8=, 0
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $1, $pop1
+	i64.extend_u/i32	$push6=, $0
 	i64.or  	$push7=, $pop2, $pop6
-	i64.store	sO+8($pop0), $pop7
-	copy_local	$push13=, $0
-                                        # fallthrough-return: $pop13
+	i64.store	sO+8($pop8), $pop7
+	copy_local	$push9=, $0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end89:
 	.size	fn3O, .Lfunc_end89-fn3O
@@ -3557,270 +3330,239 @@ fn3O:                                   # @fn3O
 	.type	testO,@function
 testO:                                  # @testO
 	.local  	i32, i64, i32, i64, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push197=, 0
-	i32.load	$push3=, myrnd.s($pop197)
+	i32.load	$push3=, myrnd.s($pop2)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	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	$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.add 	$0=, $pop5, $pop6
+	i32.const	$push153=, 0
 	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.shr_u	$push7=, $0, $pop152
+	i32.store8	sO($pop153), $pop7
+	i32.const	$push151=, 1103515245
+	i32.mul 	$push8=, $0, $pop151
+	i32.const	$push150=, 12345
+	i32.add 	$0=, $pop8, $pop150
+	i32.const	$push149=, 0
+	i32.const	$push148=, 16
+	i32.shr_u	$push9=, $0, $pop148
+	i32.store8	sO+1($pop149), $pop9
+	i32.const	$push147=, 1103515245
+	i32.mul 	$push10=, $0, $pop147
+	i32.const	$push146=, 12345
+	i32.add 	$0=, $pop10, $pop146
 	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	$push144=, 16
+	i32.shr_u	$push11=, $0, $pop144
+	i32.store8	sO+2($pop145), $pop11
+	i32.const	$push143=, 1103515245
+	i32.mul 	$push12=, $0, $pop143
+	i32.const	$push142=, 12345
+	i32.add 	$0=, $pop12, $pop142
+	i32.const	$push141=, 0
 	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.shr_u	$push13=, $0, $pop140
+	i32.store8	sO+3($pop141), $pop13
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push14=, $0, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$0=, $pop14, $pop138
+	i32.const	$push137=, 0
+	i32.const	$push136=, 16
+	i32.shr_u	$push15=, $0, $pop136
+	i32.store8	sO+4($pop137), $pop15
+	i32.const	$push135=, 1103515245
+	i32.mul 	$push16=, $0, $pop135
+	i32.const	$push134=, 12345
+	i32.add 	$0=, $pop16, $pop134
 	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	$push132=, 16
+	i32.shr_u	$push17=, $0, $pop132
+	i32.store8	sO+5($pop133), $pop17
+	i32.const	$push131=, 1103515245
+	i32.mul 	$push18=, $0, $pop131
+	i32.const	$push130=, 12345
+	i32.add 	$0=, $pop18, $pop130
+	i32.const	$push129=, 0
 	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.shr_u	$push19=, $0, $pop128
+	i32.store8	sO+6($pop129), $pop19
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push20=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$0=, $pop20, $pop126
+	i32.const	$push125=, 0
+	i32.const	$push124=, 16
+	i32.shr_u	$push21=, $0, $pop124
+	i32.store8	sO+7($pop125), $pop21
+	i32.const	$push123=, 1103515245
+	i32.mul 	$push22=, $0, $pop123
+	i32.const	$push122=, 12345
+	i32.add 	$0=, $pop22, $pop122
 	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	$push120=, 16
+	i32.shr_u	$push23=, $0, $pop120
+	i32.store8	sO+8($pop121), $pop23
+	i32.const	$push119=, 1103515245
+	i32.mul 	$push24=, $0, $pop119
+	i32.const	$push118=, 12345
+	i32.add 	$0=, $pop24, $pop118
+	i32.const	$push117=, 0
 	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.shr_u	$push25=, $0, $pop116
+	i32.store8	sO+9($pop117), $pop25
+	i32.const	$push115=, 1103515245
+	i32.mul 	$push26=, $0, $pop115
+	i32.const	$push114=, 12345
+	i32.add 	$0=, $pop26, $pop114
+	i32.const	$push113=, 0
+	i32.const	$push112=, 16
+	i32.shr_u	$push27=, $0, $pop112
+	i32.store8	sO+10($pop113), $pop27
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push28=, $0, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$0=, $pop28, $pop110
 	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	$push108=, 16
+	i32.shr_u	$push29=, $0, $pop108
+	i32.store8	sO+11($pop109), $pop29
+	i32.const	$push107=, 1103515245
+	i32.mul 	$push30=, $0, $pop107
+	i32.const	$push106=, 12345
+	i32.add 	$0=, $pop30, $pop106
+	i32.const	$push105=, 0
 	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.shr_u	$push31=, $0, $pop104
+	i32.store8	sO+12($pop105), $pop31
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push32=, $0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$0=, $pop32, $pop102
+	i32.const	$push101=, 0
+	i32.const	$push100=, 16
+	i32.shr_u	$push33=, $0, $pop100
+	i32.store8	sO+13($pop101), $pop33
+	i32.const	$push99=, 1103515245
+	i32.mul 	$push34=, $0, $pop99
+	i32.const	$push98=, 12345
+	i32.add 	$0=, $pop34, $pop98
+	i32.const	$push97=, 0
+	i32.const	$push96=, 16
+	i32.shr_u	$push35=, $0, $pop96
+	i32.store8	sO+14($pop97), $pop35
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push36=, $0, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$0=, $pop36, $pop94
 	i32.const	$push93=, 0
-	i64.load	$push40=, sO+8($pop93)
+	i32.const	$push92=, 16
+	i32.shr_u	$push37=, $0, $pop92
+	i32.store8	sO+15($pop93), $pop37
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push38=, $0, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$2=, $pop38, $pop90
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push39=, $2, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop39, $pop88
+	i32.const	$push87=, 0
+	i32.store	myrnd.s($pop87), $0
+	i32.const	$push86=, 0
+	i64.load	$push40=, sO+8($pop86)
 	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
+	i64.and 	$1=, $pop40, $pop41
+	i32.const	$push85=, 16
+	i32.shr_u	$push42=, $2, $pop85
+	i32.const	$push84=, 2047
+	i32.and 	$2=, $pop42, $pop84
+	i64.extend_u/i32	$push43=, $2
+	i64.or  	$3=, $1, $pop43
+	i32.const	$push83=, 0
+	i64.store	sO+8($pop83), $3
+	i32.wrap/i64	$5=, $3
 	block   	
-	i32.wrap/i64	$push84=, $3
-	tee_local	$push83=, $5=, $pop84
 	i32.const	$push82=, 2047
-	i32.and 	$push47=, $pop83, $pop82
+	i32.and 	$push47=, $5, $pop82
 	i32.ne  	$push48=, $2, $pop47
 	br_if   	0, $pop48       # 0: down to label10
-# BB#1:                                 # %entry
-	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
+# %bb.1:                                # %entry
+	i32.const	$push155=, 16
+	i32.shr_u	$push44=, $0, $pop155
+	i32.const	$push154=, 2047
+	i32.and 	$4=, $pop44, $pop154
+	i32.add 	$push0=, $4, $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
-# BB#2:                                 # %if.end
-	i32.const	$push54=, 0
+# %bb.2:                                # %if.end
 	i32.const	$push50=, 1103515245
 	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	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.add 	$2=, $pop51, $pop52
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push53=, $2, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$0=, $pop53, $pop160
+	i32.const	$push54=, 0
+	i32.store	myrnd.s($pop54), $0
+	i32.const	$push159=, 16
+	i32.shr_u	$push55=, $2, $pop159
+	i32.const	$push158=, 2047
+	i32.and 	$2=, $pop55, $pop158
+	i64.extend_u/i32	$push56=, $2
+	i64.or  	$3=, $1, $pop56
+	i32.const	$push157=, 0
+	i64.store	sO+8($pop157), $3
+	i32.wrap/i64	$5=, $3
+	i32.const	$push156=, 2047
+	i32.and 	$push57=, $5, $pop156
 	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
+# %bb.3:                                # %lor.lhs.false87
+	i32.const	$push164=, 16
+	i32.shr_u	$push59=, $0, $pop164
+	i32.const	$push163=, 2047
+	i32.and 	$4=, $pop59, $pop163
+	i32.add 	$push60=, $4, $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.const	$push162=, 15
+	i32.rem_u	$push66=, $pop65, $pop162
 	i32.ne  	$push67=, $pop62, $pop66
 	br_if   	0, $pop67       # 0: down to label10
-# BB#4:                                 # %if.end140
-	i32.const	$push72=, 0
+# %bb.4:                                # %if.end140
 	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.add 	$0=, $pop69, $pop70
+	i32.const	$push169=, 1103515245
+	i32.mul 	$push71=, $0, $pop169
+	i32.const	$push168=, 12345
+	i32.add 	$2=, $pop71, $pop168
+	i32.const	$push72=, 0
+	i32.store	myrnd.s($pop72), $2
+	i32.const	$push167=, 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	$push74=, $0, $pop224
-	i32.const	$push223=, 2047
-	i32.and 	$push76=, $pop74, $pop223
+	i32.const	$push166=, 16
+	i32.shr_u	$push74=, $0, $pop166
+	i32.const	$push165=, 2047
+	i32.and 	$push76=, $pop74, $pop165
 	i32.add 	$push79=, $pop78, $pop76
 	i64.extend_u/i32	$push80=, $pop79
 	i64.or  	$push81=, $1, $pop80
-	i64.store	sO+8($pop225), $pop81
+	i64.store	sO+8($pop167), $pop81
 	return
 .LBB90_5:                               # %if.then
 	end_block                       # label10:
@@ -3836,7 +3578,7 @@ testO:                                  # @testO
 	.type	retmeP,@function
 retmeP:                                 # @retmeP
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -3857,7 +3599,7 @@ retmeP:                                 # @retmeP
 fn1P:                                   # @fn1P
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sP($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3875,7 +3617,7 @@ fn1P:                                   # @fn1P
 fn2P:                                   # @fn2P
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sP($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -3894,7 +3636,7 @@ fn2P:                                   # @fn2P
 	.type	retitP,@function
 retitP:                                 # @retitP
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sP($pop0)
 	i32.const	$push2=, 4095
@@ -3912,23 +3654,21 @@ fn3P:                                   # @fn3P
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i64.load	$push11=, sP($pop12)
-	tee_local	$push10=, $1=, $pop11
-	i64.const	$push1=, -4096
-	i64.and 	$push2=, $pop10, $pop1
+	i64.load	$1=, sP($pop0)
 	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
+	i32.and 	$0=, $pop4, $pop5
+	i32.const	$push8=, 0
+	i64.const	$push1=, -4096
+	i64.and 	$push2=, $1, $pop1
+	i64.extend_u/i32	$push6=, $0
 	i64.or  	$push7=, $pop2, $pop6
-	i64.store	sP($pop0), $pop7
-	copy_local	$push13=, $0
-                                        # fallthrough-return: $pop13
+	i64.store	sP($pop8), $pop7
+	copy_local	$push9=, $0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end95:
 	.size	fn3P, .Lfunc_end95-fn3P
@@ -3939,270 +3679,239 @@ fn3P:                                   # @fn3P
 	.type	testP,@function
 testP:                                  # @testP
 	.local  	i32, i64, i32, i64, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push197=, 0
-	i32.load	$push3=, myrnd.s($pop197)
+	i32.load	$push3=, myrnd.s($pop2)
 	i32.const	$push4=, 1103515245
 	i32.mul 	$push5=, $pop3, $pop4
 	i32.const	$push6=, 12345
-	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	$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.add 	$0=, $pop5, $pop6
+	i32.const	$push153=, 0
 	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.shr_u	$push7=, $0, $pop152
+	i32.store8	sP($pop153), $pop7
+	i32.const	$push151=, 1103515245
+	i32.mul 	$push8=, $0, $pop151
+	i32.const	$push150=, 12345
+	i32.add 	$0=, $pop8, $pop150
+	i32.const	$push149=, 0
+	i32.const	$push148=, 16
+	i32.shr_u	$push9=, $0, $pop148
+	i32.store8	sP+1($pop149), $pop9
+	i32.const	$push147=, 1103515245
+	i32.mul 	$push10=, $0, $pop147
+	i32.const	$push146=, 12345
+	i32.add 	$0=, $pop10, $pop146
 	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	$push144=, 16
+	i32.shr_u	$push11=, $0, $pop144
+	i32.store8	sP+2($pop145), $pop11
+	i32.const	$push143=, 1103515245
+	i32.mul 	$push12=, $0, $pop143
+	i32.const	$push142=, 12345
+	i32.add 	$0=, $pop12, $pop142
+	i32.const	$push141=, 0
 	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.shr_u	$push13=, $0, $pop140
+	i32.store8	sP+3($pop141), $pop13
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push14=, $0, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$0=, $pop14, $pop138
+	i32.const	$push137=, 0
+	i32.const	$push136=, 16
+	i32.shr_u	$push15=, $0, $pop136
+	i32.store8	sP+4($pop137), $pop15
+	i32.const	$push135=, 1103515245
+	i32.mul 	$push16=, $0, $pop135
+	i32.const	$push134=, 12345
+	i32.add 	$0=, $pop16, $pop134
 	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	$push132=, 16
+	i32.shr_u	$push17=, $0, $pop132
+	i32.store8	sP+5($pop133), $pop17
+	i32.const	$push131=, 1103515245
+	i32.mul 	$push18=, $0, $pop131
+	i32.const	$push130=, 12345
+	i32.add 	$0=, $pop18, $pop130
+	i32.const	$push129=, 0
 	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.shr_u	$push19=, $0, $pop128
+	i32.store8	sP+6($pop129), $pop19
+	i32.const	$push127=, 1103515245
+	i32.mul 	$push20=, $0, $pop127
+	i32.const	$push126=, 12345
+	i32.add 	$0=, $pop20, $pop126
+	i32.const	$push125=, 0
+	i32.const	$push124=, 16
+	i32.shr_u	$push21=, $0, $pop124
+	i32.store8	sP+7($pop125), $pop21
+	i32.const	$push123=, 1103515245
+	i32.mul 	$push22=, $0, $pop123
+	i32.const	$push122=, 12345
+	i32.add 	$0=, $pop22, $pop122
 	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	$push120=, 16
+	i32.shr_u	$push23=, $0, $pop120
+	i32.store8	sP+8($pop121), $pop23
+	i32.const	$push119=, 1103515245
+	i32.mul 	$push24=, $0, $pop119
+	i32.const	$push118=, 12345
+	i32.add 	$0=, $pop24, $pop118
+	i32.const	$push117=, 0
 	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.shr_u	$push25=, $0, $pop116
+	i32.store8	sP+9($pop117), $pop25
+	i32.const	$push115=, 1103515245
+	i32.mul 	$push26=, $0, $pop115
+	i32.const	$push114=, 12345
+	i32.add 	$0=, $pop26, $pop114
+	i32.const	$push113=, 0
+	i32.const	$push112=, 16
+	i32.shr_u	$push27=, $0, $pop112
+	i32.store8	sP+10($pop113), $pop27
+	i32.const	$push111=, 1103515245
+	i32.mul 	$push28=, $0, $pop111
+	i32.const	$push110=, 12345
+	i32.add 	$0=, $pop28, $pop110
 	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	$push108=, 16
+	i32.shr_u	$push29=, $0, $pop108
+	i32.store8	sP+11($pop109), $pop29
+	i32.const	$push107=, 1103515245
+	i32.mul 	$push30=, $0, $pop107
+	i32.const	$push106=, 12345
+	i32.add 	$0=, $pop30, $pop106
+	i32.const	$push105=, 0
 	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.shr_u	$push31=, $0, $pop104
+	i32.store8	sP+12($pop105), $pop31
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push32=, $0, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$0=, $pop32, $pop102
+	i32.const	$push101=, 0
+	i32.const	$push100=, 16
+	i32.shr_u	$push33=, $0, $pop100
+	i32.store8	sP+13($pop101), $pop33
+	i32.const	$push99=, 1103515245
+	i32.mul 	$push34=, $0, $pop99
+	i32.const	$push98=, 12345
+	i32.add 	$0=, $pop34, $pop98
+	i32.const	$push97=, 0
+	i32.const	$push96=, 16
+	i32.shr_u	$push35=, $0, $pop96
+	i32.store8	sP+14($pop97), $pop35
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push36=, $0, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$0=, $pop36, $pop94
 	i32.const	$push93=, 0
-	i64.load	$push40=, sP($pop93)
+	i32.const	$push92=, 16
+	i32.shr_u	$push37=, $0, $pop92
+	i32.store8	sP+15($pop93), $pop37
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push38=, $0, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$2=, $pop38, $pop90
+	i32.const	$push89=, 1103515245
+	i32.mul 	$push39=, $2, $pop89
+	i32.const	$push88=, 12345
+	i32.add 	$0=, $pop39, $pop88
+	i32.const	$push87=, 0
+	i32.store	myrnd.s($pop87), $0
+	i32.const	$push86=, 0
+	i64.load	$push40=, sP($pop86)
 	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
+	i64.and 	$1=, $pop40, $pop41
+	i32.const	$push85=, 16
+	i32.shr_u	$push42=, $2, $pop85
+	i32.const	$push84=, 2047
+	i32.and 	$2=, $pop42, $pop84
+	i64.extend_u/i32	$push43=, $2
+	i64.or  	$3=, $1, $pop43
+	i32.const	$push83=, 0
+	i64.store	sP($pop83), $3
+	i32.wrap/i64	$5=, $3
 	block   	
-	i32.wrap/i64	$push84=, $3
-	tee_local	$push83=, $5=, $pop84
 	i32.const	$push82=, 2047
-	i32.and 	$push47=, $pop83, $pop82
+	i32.and 	$push47=, $5, $pop82
 	i32.ne  	$push48=, $2, $pop47
 	br_if   	0, $pop48       # 0: down to label11
-# BB#1:                                 # %entry
-	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
+# %bb.1:                                # %entry
+	i32.const	$push155=, 16
+	i32.shr_u	$push44=, $0, $pop155
+	i32.const	$push154=, 2047
+	i32.and 	$4=, $pop44, $pop154
+	i32.add 	$push0=, $4, $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 label11
-# BB#2:                                 # %if.end
-	i32.const	$push54=, 0
+# %bb.2:                                # %if.end
 	i32.const	$push50=, 1103515245
 	i32.mul 	$push51=, $0, $pop50
 	i32.const	$push52=, 12345
-	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.add 	$2=, $pop51, $pop52
+	i32.const	$push161=, 1103515245
+	i32.mul 	$push53=, $2, $pop161
+	i32.const	$push160=, 12345
+	i32.add 	$0=, $pop53, $pop160
+	i32.const	$push54=, 0
+	i32.store	myrnd.s($pop54), $0
+	i32.const	$push159=, 16
+	i32.shr_u	$push55=, $2, $pop159
+	i32.const	$push158=, 2047
+	i32.and 	$2=, $pop55, $pop158
+	i64.extend_u/i32	$push56=, $2
+	i64.or  	$3=, $1, $pop56
+	i32.const	$push157=, 0
+	i64.store	sP($pop157), $3
+	i32.wrap/i64	$5=, $3
+	i32.const	$push156=, 2047
+	i32.and 	$push57=, $5, $pop156
 	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
+# %bb.3:                                # %lor.lhs.false83
+	i32.const	$push164=, 16
+	i32.shr_u	$push59=, $0, $pop164
+	i32.const	$push163=, 2047
+	i32.and 	$4=, $pop59, $pop163
+	i32.add 	$push60=, $4, $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.const	$push162=, 15
+	i32.rem_u	$push66=, $pop65, $pop162
 	i32.ne  	$push67=, $pop62, $pop66
 	br_if   	0, $pop67       # 0: down to label11
-# BB#4:                                 # %if.end134
-	i32.const	$push72=, 0
+# %bb.4:                                # %if.end134
 	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.add 	$0=, $pop69, $pop70
+	i32.const	$push169=, 1103515245
+	i32.mul 	$push71=, $0, $pop169
+	i32.const	$push168=, 12345
+	i32.add 	$2=, $pop71, $pop168
+	i32.const	$push72=, 0
+	i32.store	myrnd.s($pop72), $2
+	i32.const	$push167=, 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	$push74=, $0, $pop224
-	i32.const	$push223=, 2047
-	i32.and 	$push76=, $pop74, $pop223
+	i32.const	$push166=, 16
+	i32.shr_u	$push74=, $0, $pop166
+	i32.const	$push165=, 2047
+	i32.and 	$push76=, $pop74, $pop165
 	i32.add 	$push79=, $pop78, $pop76
 	i64.extend_u/i32	$push80=, $pop79
 	i64.or  	$push81=, $1, $pop80
-	i64.store	sP($pop225), $pop81
+	i64.store	sP($pop167), $pop81
 	return
 .LBB96_5:                               # %if.then
 	end_block                       # label11:
@@ -4218,7 +3927,7 @@ testP:                                  # @testP
 	.type	retmeQ,@function
 retmeQ:                                 # @retmeQ
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -4239,7 +3948,7 @@ retmeQ:                                 # @retmeQ
 fn1Q:                                   # @fn1Q
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sQ($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4257,7 +3966,7 @@ fn1Q:                                   # @fn1Q
 fn2Q:                                   # @fn2Q
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sQ($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4276,7 +3985,7 @@ fn2Q:                                   # @fn2Q
 	.type	retitQ,@function
 retitQ:                                 # @retitQ
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sQ($pop0)
 	i32.const	$push2=, 4095
@@ -4294,21 +4003,19 @@ fn3Q:                                   # @fn3Q
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load16_u	$push9=, sQ($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load16_u	$1=, sQ($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, 61440
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store16	sQ($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store16	sQ($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end101:
 	.size	fn3Q, .Lfunc_end101-fn3Q
@@ -4319,175 +4026,158 @@ fn3Q:                                   # @fn3Q
 	.type	testQ,@function
 testQ:                                  # @testQ
 	.local  	i32, i32, i32
-# 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=, $1, $pop102
-	i32.const	$push101=, 12345
-	i32.add 	$push100=, $pop7, $pop101
-	tee_local	$push99=, $1=, $pop100
-	i32.const	$push98=, 16
-	i32.shr_u	$push8=, $pop99, $pop98
-	i32.store8	sQ+3($pop103), $pop8
-	i32.const	$push97=, 0
-	i32.const	$push96=, 1103515245
-	i32.mul 	$push9=, $1, $pop96
-	i32.const	$push95=, 12345
-	i32.add 	$push94=, $pop9, $pop95
-	tee_local	$push93=, $1=, $pop94
+# %bb.0:                                # %entry
+	i32.const	$push96=, 0
+	i32.load	$push0=, myrnd.s($pop96)
+	i32.const	$push95=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop95
+	i32.const	$push94=, 12345
+	i32.add 	$1=, $pop1, $pop94
+	i32.const	$push93=, 0
 	i32.const	$push92=, 16
-	i32.shr_u	$push10=, $pop93, $pop92
-	i32.store8	sQ+4($pop97), $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	sQ+5($pop91), $pop12
+	i32.shr_u	$push2=, $1, $pop92
+	i32.store8	sQ($pop93), $pop2
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push3=, $1, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$1=, $pop3, $pop90
+	i32.const	$push89=, 0
+	i32.const	$push88=, 16
+	i32.shr_u	$push4=, $1, $pop88
+	i32.store8	sQ+1($pop89), $pop4
+	i32.const	$push87=, 1103515245
+	i32.mul 	$push5=, $1, $pop87
+	i32.const	$push86=, 12345
+	i32.add 	$1=, $pop5, $pop86
 	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	$push84=, 16
+	i32.shr_u	$push6=, $1, $pop84
+	i32.store8	sQ+2($pop85), $pop6
+	i32.const	$push83=, 1103515245
+	i32.mul 	$push7=, $1, $pop83
+	i32.const	$push82=, 12345
+	i32.add 	$1=, $pop7, $pop82
+	i32.const	$push81=, 0
 	i32.const	$push80=, 16
-	i32.shr_u	$push14=, $pop81, $pop80
-	i32.store8	sQ+6($pop85), $pop14
-	i32.const	$push79=, 0
-	i32.const	$push78=, 1103515245
-	i32.mul 	$push15=, $1, $pop78
-	i32.const	$push77=, 12345
-	i32.add 	$push76=, $pop15, $pop77
-	tee_local	$push75=, $1=, $pop76
-	i32.const	$push74=, 16
-	i32.shr_u	$push16=, $pop75, $pop74
-	i32.store8	sQ+7($pop79), $pop16
+	i32.shr_u	$push8=, $1, $pop80
+	i32.store8	sQ+3($pop81), $pop8
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push9=, $1, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$1=, $pop9, $pop78
+	i32.const	$push77=, 0
+	i32.const	$push76=, 16
+	i32.shr_u	$push10=, $1, $pop76
+	i32.store8	sQ+4($pop77), $pop10
+	i32.const	$push75=, 1103515245
+	i32.mul 	$push11=, $1, $pop75
+	i32.const	$push74=, 12345
+	i32.add 	$1=, $pop11, $pop74
 	i32.const	$push73=, 0
-	i32.const	$push72=, 1103515245
-	i32.mul 	$push17=, $1, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop17, $pop71
-	tee_local	$push69=, $1=, $pop70
+	i32.const	$push72=, 16
+	i32.shr_u	$push12=, $1, $pop72
+	i32.store8	sQ+5($pop73), $pop12
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push13=, $1, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$1=, $pop13, $pop70
+	i32.const	$push69=, 0
 	i32.const	$push68=, 16
-	i32.shr_u	$push18=, $pop69, $pop68
-	i32.store8	sQ+8($pop73), $pop18
-	i32.const	$push67=, 0
-	i32.const	$push66=, 1103515245
-	i32.mul 	$push19=, $1, $pop66
-	i32.const	$push65=, 12345
-	i32.add 	$push64=, $pop19, $pop65
-	tee_local	$push63=, $1=, $pop64
-	i32.const	$push62=, 16
-	i32.shr_u	$push20=, $pop63, $pop62
-	i32.store8	sQ+9($pop67), $pop20
+	i32.shr_u	$push14=, $1, $pop68
+	i32.store8	sQ+6($pop69), $pop14
+	i32.const	$push67=, 1103515245
+	i32.mul 	$push15=, $1, $pop67
+	i32.const	$push66=, 12345
+	i32.add 	$1=, $pop15, $pop66
+	i32.const	$push65=, 0
+	i32.const	$push64=, 16
+	i32.shr_u	$push16=, $1, $pop64
+	i32.store8	sQ+7($pop65), $pop16
+	i32.const	$push63=, 1103515245
+	i32.mul 	$push17=, $1, $pop63
+	i32.const	$push62=, 12345
+	i32.add 	$1=, $pop17, $pop62
 	i32.const	$push61=, 0
-	i32.const	$push60=, 1103515245
-	i32.mul 	$push21=, $1, $pop60
-	i32.const	$push59=, 12345
-	i32.add 	$push58=, $pop21, $pop59
-	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	$push23=, sQ($pop49)
+	i32.const	$push60=, 16
+	i32.shr_u	$push18=, $1, $pop60
+	i32.store8	sQ+8($pop61), $pop18
+	i32.const	$push59=, 1103515245
+	i32.mul 	$push19=, $1, $pop59
+	i32.const	$push58=, 12345
+	i32.add 	$1=, $pop19, $pop58
+	i32.const	$push57=, 0
+	i32.const	$push56=, 16
+	i32.shr_u	$push20=, $1, $pop56
+	i32.store8	sQ+9($pop57), $pop20
+	i32.const	$push55=, 1103515245
+	i32.mul 	$push21=, $1, $pop55
+	i32.const	$push54=, 12345
+	i32.add 	$2=, $pop21, $pop54
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push22=, $2, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop22, $pop52
+	i32.const	$push51=, 0
+	i32.store	myrnd.s($pop51), $0
+	i32.const	$push50=, 0
+	i32.load16_u	$push23=, sQ($pop50)
 	i32.const	$push24=, -4096
-	i32.and 	$push48=, $pop23, $pop24
-	tee_local	$push47=, $1=, $pop48
-	i32.or  	$push27=, $pop26, $pop47
-	i32.store16	sQ($pop52), $pop27
+	i32.and 	$1=, $pop23, $pop24
+	i32.const	$push49=, 0
+	i32.const	$push48=, 16
+	i32.shr_u	$push25=, $2, $pop48
+	i32.const	$push47=, 2047
+	i32.and 	$push26=, $pop25, $pop47
+	i32.or  	$push27=, $pop26, $1
+	i32.store16	sQ($pop49), $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.eqz 	$push111=, $pop46
+	br_if   	0, $pop111      # 0: down to label12
+# %bb.1:                                # %if.end
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push28=, $0, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$2=, $pop28, $pop104
+	i32.const	$push103=, 1103515245
+	i32.mul 	$push29=, $2, $pop103
+	i32.const	$push102=, 12345
+	i32.add 	$0=, $pop29, $pop102
+	i32.const	$push101=, 0
+	i32.store	myrnd.s($pop101), $0
+	i32.const	$push100=, 0
+	i32.const	$push99=, 16
+	i32.shr_u	$push30=, $2, $pop99
+	i32.const	$push98=, 2047
+	i32.and 	$push31=, $pop30, $pop98
 	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.store16	sQ($pop100), $pop32
+	i32.const	$push97=, 1
+	i32.eqz 	$push112=, $pop97
+	br_if   	0, $pop112      # 0: down to label12
+# %bb.2:                                # %if.end134
 	i32.const	$push33=, 1103515245
-	i32.mul 	$push34=, $2, $pop33
+	i32.mul 	$push34=, $0, $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.add 	$2=, $pop34, $pop35
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push36=, $2, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$0=, $pop36, $pop109
+	i32.const	$push37=, 0
+	i32.store	myrnd.s($pop37), $0
+	i32.const	$push108=, 0
 	i32.const	$push38=, 16
-	i32.shr_u	$push42=, $2, $pop38
+	i32.shr_u	$push42=, $0, $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.const	$push107=, 16
+	i32.shr_u	$push39=, $2, $pop107
+	i32.const	$push106=, 2047
+	i32.and 	$push41=, $pop39, $pop106
 	i32.add 	$push44=, $pop43, $pop41
 	i32.or  	$push45=, $1, $pop44
-	i32.store16	sQ($pop138), $pop45
+	i32.store16	sQ($pop108), $pop45
 	return
 .LBB102_3:                              # %if.then
 	end_block                       # label12:
@@ -4503,7 +4193,7 @@ testQ:                                  # @testQ
 	.type	retmeR,@function
 retmeR:                                 # @retmeR
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -4524,7 +4214,7 @@ retmeR:                                 # @retmeR
 fn1R:                                   # @fn1R
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sR($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4542,7 +4232,7 @@ fn1R:                                   # @fn1R
 fn2R:                                   # @fn2R
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sR($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4559,7 +4249,7 @@ fn2R:                                   # @fn2R
 	.type	retitR,@function
 retitR:                                 # @retitR
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sR($pop0)
 	i32.const	$push2=, 3
@@ -4577,21 +4267,19 @@ fn3R:                                   # @fn3R
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load16_u	$push9=, sR($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load16_u	$1=, sR($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 3
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, 65532
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store16	sR($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store16	sR($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end107:
 	.size	fn3R, .Lfunc_end107-fn3R
@@ -4602,111 +4290,99 @@ fn3R:                                   # @fn3R
 	.type	testR,@function
 testR:                                  # @testR
 	.local  	i32, i32
-# BB#0:                                 # %if.end90
+# %bb.0:                                # %if.end90
 	i32.const	$push0=, 0
-	i32.const	$push106=, 0
-	i32.load	$push1=, myrnd.s($pop106)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push105=, $pop3, $pop4
-	tee_local	$push104=, $0=, $pop105
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push82=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop104, $pop5
-	i32.store8	sR($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sR($pop82), $pop6
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push7=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop7, $pop80
 	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	$push78=, 16
+	i32.shr_u	$push8=, $0, $pop78
+	i32.store8	sR+1($pop79), $pop8
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push9=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop9, $pop76
+	i32.const	$push75=, 0
 	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.shr_u	$push10=, $0, $pop74
+	i32.store8	sR+2($pop75), $pop10
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push11=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop11, $pop72
+	i32.const	$push71=, 0
+	i32.const	$push70=, 16
+	i32.shr_u	$push12=, $0, $pop70
+	i32.store8	sR+3($pop71), $pop12
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push13=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop13, $pop68
 	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	$push66=, 16
+	i32.shr_u	$push14=, $0, $pop66
+	i32.store8	sR+4($pop67), $pop14
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push15=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop15, $pop64
+	i32.const	$push63=, 0
 	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.shr_u	$push16=, $0, $pop62
+	i32.store8	sR+5($pop63), $pop16
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push17=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop17, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push18=, $0, $pop58
+	i32.store8	sR+6($pop59), $pop18
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push19=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop19, $pop56
 	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	$push54=, 16
+	i32.shr_u	$push20=, $0, $pop54
+	i32.store8	sR+7($pop55), $pop20
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push21=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop21, $pop52
+	i32.const	$push51=, 0
 	i32.const	$push50=, 16
-	i32.shr_u	$push24=, $pop51, $pop50
-	i32.store8	sR+9($pop55), $pop24
-	i32.const	$push49=, 0
+	i32.shr_u	$push22=, $0, $pop50
+	i32.store8	sR+8($pop51), $pop22
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push23=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop23, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push24=, $0, $pop46
+	i32.store8	sR+9($pop47), $pop24
 	i32.const	$push25=, -341751747
 	i32.mul 	$push26=, $0, $pop25
 	i32.const	$push27=, 229283573
-	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.add 	$0=, $pop26, $pop27
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push28=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$1=, $pop28, $pop44
+	i32.const	$push43=, 0
+	i32.store	myrnd.s($pop43), $1
 	i32.const	$push42=, 0
 	i32.const	$push41=, 16
 	i32.shr_u	$push30=, $1, $pop41
@@ -4723,9 +4399,9 @@ testR:                                  # @testR
 	i32.store16	sR($pop42), $pop37
 	block   	
 	i32.const	$push38=, 1
-	i32.eqz 	$push107=, $pop38
-	br_if   	0, $pop107      # 0: down to label13
-# BB#1:                                 # %if.end134
+	i32.eqz 	$push83=, $pop38
+	br_if   	0, $pop83       # 0: down to label13
+# %bb.1:                                # %if.end134
 	return
 .LBB108_2:                              # %if.then133
 	end_block                       # label13:
@@ -4741,7 +4417,7 @@ testR:                                  # @testR
 	.type	retmeS,@function
 retmeS:                                 # @retmeS
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -4762,7 +4438,7 @@ retmeS:                                 # @retmeS
 fn1S:                                   # @fn1S
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sS($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4780,7 +4456,7 @@ fn1S:                                   # @fn1S
 fn2S:                                   # @fn2S
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sS($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -4797,7 +4473,7 @@ fn2S:                                   # @fn2S
 	.type	retitS,@function
 retitS:                                 # @retitS
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sS($pop0)
 	i32.const	$push2=, 1
@@ -4815,21 +4491,19 @@ fn3S:                                   # @fn3S
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %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.load16_u	$1=, sS($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 1
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	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
+	i32.or  	$push5=, $0, $pop2
+	i32.store16	sS($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end113:
 	.size	fn3S, .Lfunc_end113-fn3S
@@ -4840,111 +4514,99 @@ fn3S:                                   # @fn3S
 	.type	testS,@function
 testS:                                  # @testS
 	.local  	i32, i32
-# BB#0:                                 # %if.end90
+# %bb.0:                                # %if.end90
 	i32.const	$push0=, 0
-	i32.const	$push106=, 0
-	i32.load	$push1=, myrnd.s($pop106)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push105=, $pop3, $pop4
-	tee_local	$push104=, $0=, $pop105
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push82=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop104, $pop5
-	i32.store8	sS($pop0), $pop6
-	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.shr_u	$push6=, $0, $pop5
+	i32.store8	sS($pop82), $pop6
+	i32.const	$push81=, 1103515245
+	i32.mul 	$push7=, $0, $pop81
+	i32.const	$push80=, 12345
+	i32.add 	$0=, $pop7, $pop80
 	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	$push78=, 16
+	i32.shr_u	$push8=, $0, $pop78
+	i32.store8	sS+1($pop79), $pop8
+	i32.const	$push77=, 1103515245
+	i32.mul 	$push9=, $0, $pop77
+	i32.const	$push76=, 12345
+	i32.add 	$0=, $pop9, $pop76
+	i32.const	$push75=, 0
 	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.shr_u	$push10=, $0, $pop74
+	i32.store8	sS+2($pop75), $pop10
+	i32.const	$push73=, 1103515245
+	i32.mul 	$push11=, $0, $pop73
+	i32.const	$push72=, 12345
+	i32.add 	$0=, $pop11, $pop72
+	i32.const	$push71=, 0
+	i32.const	$push70=, 16
+	i32.shr_u	$push12=, $0, $pop70
+	i32.store8	sS+3($pop71), $pop12
+	i32.const	$push69=, 1103515245
+	i32.mul 	$push13=, $0, $pop69
+	i32.const	$push68=, 12345
+	i32.add 	$0=, $pop13, $pop68
 	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	$push66=, 16
+	i32.shr_u	$push14=, $0, $pop66
+	i32.store8	sS+4($pop67), $pop14
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push15=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$0=, $pop15, $pop64
+	i32.const	$push63=, 0
 	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.shr_u	$push16=, $0, $pop62
+	i32.store8	sS+5($pop63), $pop16
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push17=, $0, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$0=, $pop17, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push18=, $0, $pop58
+	i32.store8	sS+6($pop59), $pop18
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push19=, $0, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$0=, $pop19, $pop56
 	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	$push54=, 16
+	i32.shr_u	$push20=, $0, $pop54
+	i32.store8	sS+7($pop55), $pop20
+	i32.const	$push53=, 1103515245
+	i32.mul 	$push21=, $0, $pop53
+	i32.const	$push52=, 12345
+	i32.add 	$0=, $pop21, $pop52
+	i32.const	$push51=, 0
 	i32.const	$push50=, 16
-	i32.shr_u	$push24=, $pop51, $pop50
-	i32.store8	sS+9($pop55), $pop24
-	i32.const	$push49=, 0
+	i32.shr_u	$push22=, $0, $pop50
+	i32.store8	sS+8($pop51), $pop22
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push23=, $0, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$0=, $pop23, $pop48
+	i32.const	$push47=, 0
+	i32.const	$push46=, 16
+	i32.shr_u	$push24=, $0, $pop46
+	i32.store8	sS+9($pop47), $pop24
 	i32.const	$push25=, -341751747
 	i32.mul 	$push26=, $0, $pop25
 	i32.const	$push27=, 229283573
-	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.add 	$0=, $pop26, $pop27
+	i32.const	$push45=, 1103515245
+	i32.mul 	$push28=, $0, $pop45
+	i32.const	$push44=, 12345
+	i32.add 	$1=, $pop28, $pop44
+	i32.const	$push43=, 0
+	i32.store	myrnd.s($pop43), $1
 	i32.const	$push42=, 0
 	i32.const	$push41=, 16
 	i32.shr_u	$push30=, $1, $pop41
@@ -4961,9 +4623,9 @@ testS:                                  # @testS
 	i32.store16	sS($pop42), $pop37
 	block   	
 	i32.const	$push38=, 1
-	i32.eqz 	$push107=, $pop38
-	br_if   	0, $pop107      # 0: down to label14
-# BB#1:                                 # %if.end134
+	i32.eqz 	$push83=, $pop38
+	br_if   	0, $pop83       # 0: down to label14
+# %bb.1:                                # %if.end134
 	return
 .LBB114_2:                              # %if.then133
 	end_block                       # label14:
@@ -4979,7 +4641,7 @@ testS:                                  # @testS
 	.type	retmeT,@function
 retmeT:                                 # @retmeT
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=0
 	i32.store	0($0):p2align=1, $pop0
                                         # fallthrough-return
@@ -4994,7 +4656,7 @@ retmeT:                                 # @retmeT
 fn1T:                                   # @fn1T
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sT($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5012,7 +4674,7 @@ fn1T:                                   # @fn1T
 fn2T:                                   # @fn2T
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sT($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5029,7 +4691,7 @@ fn2T:                                   # @fn2T
 	.type	retitT,@function
 retitT:                                 # @retitT
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sT($pop0)
 	i32.const	$push2=, 1
@@ -5047,21 +4709,19 @@ fn3T:                                   # @fn3T
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load16_u	$push9=, sT($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load16_u	$1=, sT($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 1
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, 65534
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store16	sT($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store16	sT($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end119:
 	.size	fn3T, .Lfunc_end119-fn3T
@@ -5072,75 +4732,66 @@ fn3T:                                   # @fn3T
 	.type	testT,@function
 testT:                                  # @testT
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push75=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push57=, 0
+	i32.load	$push0=, myrnd.s($pop57)
+	i32.const	$push56=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop56
+	i32.const	$push55=, 12345
+	i32.add 	$0=, $pop1, $pop55
+	i32.const	$push54=, 0
+	i32.const	$push53=, 16
+	i32.shr_u	$push2=, $0, $pop53
+	i32.store8	sT($pop54), $pop2
+	i32.const	$push52=, 1103515245
+	i32.mul 	$push3=, $0, $pop52
+	i32.const	$push51=, 12345
+	i32.add 	$0=, $pop3, $pop51
 	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	$push49=, 16
+	i32.shr_u	$push4=, $0, $pop49
+	i32.store8	sT+1($pop50), $pop4
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push5=, $0, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$0=, $pop5, $pop47
+	i32.const	$push46=, 0
 	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.shr_u	$push6=, $0, $pop45
+	i32.store8	sT+2($pop46), $pop6
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push7=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop7, $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push8=, $0, $pop41
+	i32.store8	sT+3($pop42), $pop8
+	i32.const	$push40=, 0
+	i32.load16_u	$push9=, sT($pop40)
 	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
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push39=, 1103515245
+	i32.mul 	$push11=, $0, $pop39
+	i32.const	$push38=, 12345
+	i32.add 	$0=, $pop11, $pop38
+	i32.const	$push37=, 16
+	i32.shr_u	$2=, $0, $pop37
+	i32.const	$push36=, 0
+	i32.const	$push35=, 1
+	i32.and 	$push12=, $2, $pop35
+	i32.or  	$push13=, $pop12, $1
+	i32.store16	sT($pop36), $pop13
+	i32.const	$push34=, 1103515245
+	i32.mul 	$push14=, $0, $pop34
+	i32.const	$push33=, 12345
+	i32.add 	$0=, $pop14, $pop33
+	i32.const	$push32=, 0
+	i32.store	myrnd.s($pop32), $0
+	i32.const	$push31=, 16
+	i32.shr_u	$3=, $0, $pop31
 	block   	
-	i32.const	$push33=, 16
-	i32.shr_u	$push32=, $0, $pop33
-	tee_local	$push31=, $3=, $pop32
-	i32.add 	$push15=, $pop31, $2
+	i32.add 	$push15=, $3, $2
 	i32.const	$push30=, 0
 	i32.load	$push16=, sT($pop30)
 	i32.add 	$push17=, $3, $pop16
@@ -5148,33 +4799,31 @@ testT:                                  # @testT
 	i32.const	$push29=, 1
 	i32.and 	$push19=, $pop18, $pop29
 	br_if   	0, $pop19       # 0: down to label15
-# BB#1:                                 # %if.end94
-	i32.const	$push87=, 0
+# %bb.1:                                # %if.end94
 	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 	$0=, $pop21, $pop22
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push23=, $0, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$2=, $pop23, $pop64
+	i32.const	$push63=, 0
+	i32.store	myrnd.s($pop63), $2
+	i32.const	$push62=, 0
+	i32.const	$push61=, 16
+	i32.shr_u	$push25=, $2, $pop61
+	i32.const	$push60=, 16
+	i32.shr_u	$push24=, $0, $pop60
 	i32.add 	$push26=, $pop25, $pop24
-	i32.const	$push77=, 1
-	i32.and 	$push27=, $pop26, $pop77
+	i32.const	$push59=, 1
+	i32.and 	$push27=, $pop26, $pop59
 	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
+	i32.store16	sT($pop62), $pop28
+	i32.const	$push58=, 1
+	i32.eqz 	$push66=, $pop58
+	br_if   	0, $pop66       # 0: down to label15
+# %bb.2:                                # %if.end140
 	return
 .LBB120_3:                              # %if.then
 	end_block                       # label15:
@@ -5190,7 +4839,7 @@ testT:                                  # @testT
 	.type	retmeU,@function
 retmeU:                                 # @retmeU
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 8
@@ -5211,7 +4860,7 @@ retmeU:                                 # @retmeU
 fn1U:                                   # @fn1U
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sU($pop0)
 	i32.const	$push2=, 6
@@ -5231,7 +4880,7 @@ fn1U:                                   # @fn1U
 fn2U:                                   # @fn2U
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sU($pop0)
 	i32.const	$push2=, 6
@@ -5250,7 +4899,7 @@ fn2U:                                   # @fn2U
 	.type	retitU,@function
 retitU:                                 # @retitU
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, sU($pop0)
 	i32.const	$push2=, 6
@@ -5270,23 +4919,21 @@ fn3U:                                   # @fn3U
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i32.load16_u	$push15=, sU($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i32.load16_u	$1=, sU($pop0)
 	i32.const	$push3=, 6
-	i32.shr_u	$push4=, $pop14, $pop3
-	i32.add 	$push13=, $pop4, $0
-	tee_local	$push12=, $0=, $pop13
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push12=, 0
 	i32.const	$push11=, 6
-	i32.shl 	$push5=, $pop12, $pop11
+	i32.shl 	$push5=, $0, $pop11
 	i32.const	$push6=, 64
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 65471
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store16	sU($pop0), $pop8
+	i32.store16	sU($pop12), $pop8
 	i32.const	$push9=, 1
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -5300,240 +4947,211 @@ fn3U:                                   # @fn3U
 	.type	testU,@function
 testU:                                  # @testU
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push165=, 0
-	i32.load	$push1=, myrnd.s($pop165)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	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	$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.add 	$1=, $pop3, $pop4
 	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	$push130=, 16
+	i32.shr_u	$push5=, $1, $pop130
+	i32.store8	sU($pop131), $pop5
+	i32.const	$push129=, 1103515245
+	i32.mul 	$push6=, $1, $pop129
+	i32.const	$push128=, 12345
+	i32.add 	$1=, $pop6, $pop128
+	i32.const	$push127=, 0
 	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.shr_u	$push7=, $1, $pop126
+	i32.store8	sU+1($pop127), $pop7
+	i32.const	$push125=, 1103515245
+	i32.mul 	$push8=, $1, $pop125
+	i32.const	$push124=, 12345
+	i32.add 	$1=, $pop8, $pop124
+	i32.const	$push123=, 0
+	i32.const	$push122=, 16
+	i32.shr_u	$push9=, $1, $pop122
+	i32.store8	sU+2($pop123), $pop9
+	i32.const	$push121=, 1103515245
+	i32.mul 	$push10=, $1, $pop121
+	i32.const	$push120=, 12345
+	i32.add 	$1=, $pop10, $pop120
 	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	$push118=, 16
+	i32.shr_u	$push11=, $1, $pop118
+	i32.store8	sU+3($pop119), $pop11
+	i32.const	$push117=, 1103515245
+	i32.mul 	$push12=, $1, $pop117
+	i32.const	$push116=, 12345
+	i32.add 	$1=, $pop12, $pop116
+	i32.const	$push115=, 0
 	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.shr_u	$push13=, $1, $pop114
+	i32.store8	sU+4($pop115), $pop13
+	i32.const	$push113=, 1103515245
+	i32.mul 	$push14=, $1, $pop113
+	i32.const	$push112=, 12345
+	i32.add 	$1=, $pop14, $pop112
+	i32.const	$push111=, 0
+	i32.const	$push110=, 16
+	i32.shr_u	$push15=, $1, $pop110
+	i32.store8	sU+5($pop111), $pop15
+	i32.const	$push109=, 1103515245
+	i32.mul 	$push16=, $1, $pop109
+	i32.const	$push108=, 12345
+	i32.add 	$1=, $pop16, $pop108
 	i32.const	$push107=, 0
-	i32.const	$push106=, 1103515245
-	i32.mul 	$push24=, $2, $pop106
-	i32.const	$push105=, 12345
-	i32.add 	$push104=, $pop24, $pop105
-	tee_local	$push103=, $2=, $pop104
-	i32.const	$push102=, 1103515245
-	i32.mul 	$push25=, $pop103, $pop102
-	i32.const	$push101=, 12345
-	i32.add 	$push100=, $pop25, $pop101
-	tee_local	$push99=, $1=, $pop100
-	i32.store	myrnd.s($pop107), $pop99
-	i32.const	$push98=, 0
-	i32.const	$push97=, 16
-	i32.shr_u	$push96=, $2, $pop97
-	tee_local	$push95=, $0=, $pop96
+	i32.const	$push106=, 16
+	i32.shr_u	$push17=, $1, $pop106
+	i32.store8	sU+6($pop107), $pop17
+	i32.const	$push105=, 1103515245
+	i32.mul 	$push18=, $1, $pop105
+	i32.const	$push104=, 12345
+	i32.add 	$1=, $pop18, $pop104
+	i32.const	$push103=, 0
+	i32.const	$push102=, 16
+	i32.shr_u	$push19=, $1, $pop102
+	i32.store8	sU+7($pop103), $pop19
+	i32.const	$push101=, 1103515245
+	i32.mul 	$push20=, $1, $pop101
+	i32.const	$push100=, 12345
+	i32.add 	$1=, $pop20, $pop100
+	i32.const	$push99=, 0
+	i32.const	$push98=, 16
+	i32.shr_u	$push21=, $1, $pop98
+	i32.store8	sU+8($pop99), $pop21
+	i32.const	$push97=, 1103515245
+	i32.mul 	$push22=, $1, $pop97
+	i32.const	$push96=, 12345
+	i32.add 	$1=, $pop22, $pop96
+	i32.const	$push95=, 0
+	i32.const	$push94=, 16
+	i32.shr_u	$push23=, $1, $pop94
+	i32.store8	sU+9($pop95), $pop23
+	i32.const	$push93=, 1103515245
+	i32.mul 	$push24=, $1, $pop93
+	i32.const	$push92=, 12345
+	i32.add 	$2=, $pop24, $pop92
+	i32.const	$push91=, 1103515245
+	i32.mul 	$push25=, $2, $pop91
+	i32.const	$push90=, 12345
+	i32.add 	$0=, $pop25, $pop90
+	i32.const	$push89=, 0
+	i32.store	myrnd.s($pop89), $0
+	i32.const	$push88=, 0
+	i32.load16_u	$push26=, sU($pop88)
+	i32.const	$push27=, -65
+	i32.and 	$1=, $pop26, $pop27
+	i32.const	$push87=, 16
+	i32.shr_u	$2=, $2, $pop87
 	i32.const	$push28=, 2047
-	i32.and 	$push94=, $pop95, $pop28
-	tee_local	$push93=, $3=, $pop94
+	i32.and 	$3=, $2, $pop28
 	i32.const	$push29=, 6
-	i32.shl 	$push30=, $pop93, $pop29
+	i32.shl 	$push30=, $3, $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.or  	$4=, $pop32, $1
+	i32.const	$push86=, 0
+	i32.store16	sU($pop86), $4
 	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	$push85=, 6
+	i32.shr_u	$4=, $pop34, $pop85
+	block   	
+	i32.xor 	$push35=, $4, $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	$push169=, 16
-	i32.shr_u	$push168=, $1, $pop169
-	tee_local	$push167=, $3=, $pop168
-	i32.add 	$push38=, $pop167, $4
-	i32.add 	$push37=, $3, $0
+# %bb.1:                                # %lor.lhs.false41
+	i32.const	$push133=, 16
+	i32.shr_u	$3=, $0, $pop133
+	i32.add 	$push38=, $3, $4
+	i32.add 	$push37=, $3, $2
 	i32.xor 	$push39=, $pop38, $pop37
-	i32.const	$push166=, 1
-	i32.and 	$push40=, $pop39, $pop166
+	i32.const	$push132=, 1
+	i32.and 	$push40=, $pop39, $pop132
 	br_if   	0, $pop40       # 0: down to label16
-# BB#2:                                 # %if.end
-	i32.const	$push45=, 0
+# %bb.2:                                # %if.end
 	i32.const	$push41=, 1103515245
-	i32.mul 	$push42=, $1, $pop41
+	i32.mul 	$push42=, $0, $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.add 	$2=, $pop42, $pop43
+	i32.const	$push139=, 1103515245
+	i32.mul 	$push44=, $2, $pop139
+	i32.const	$push138=, 12345
+	i32.add 	$0=, $pop44, $pop138
+	i32.const	$push45=, 0
+	i32.store	myrnd.s($pop45), $0
+	i32.const	$push137=, 16
+	i32.shr_u	$2=, $2, $pop137
 	i32.const	$push46=, 2047
-	i32.and 	$push177=, $pop178, $pop46
-	tee_local	$push176=, $3=, $pop177
+	i32.and 	$3=, $2, $pop46
 	i32.const	$push47=, 6
-	i32.shl 	$push48=, $pop176, $pop47
+	i32.shl 	$push48=, $3, $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.or  	$4=, $pop50, $1
+	i32.const	$push136=, 0
+	i32.store16	sU($pop136), $4
 	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
+	i32.const	$push135=, 6
+	i32.shr_u	$4=, $pop52, $pop135
+	i32.xor 	$push53=, $4, $3
+	i32.const	$push134=, 1
+	i32.and 	$push54=, $pop53, $pop134
 	br_if   	0, $pop54       # 0: down to label16
-# BB#3:                                 # %lor.lhs.false85
-	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
+# %bb.3:                                # %lor.lhs.false85
+	i32.const	$push141=, 16
+	i32.shr_u	$3=, $0, $pop141
+	i32.add 	$push56=, $3, $4
+	i32.add 	$push55=, $3, $2
 	i32.xor 	$push57=, $pop56, $pop55
-	i32.const	$push188=, 1
-	i32.and 	$push58=, $pop57, $pop188
+	i32.const	$push140=, 1
+	i32.and 	$push58=, $pop57, $pop140
 	br_if   	0, $pop58       # 0: down to label16
-# BB#4:                                 # %lor.lhs.false130
-	i32.const	$push63=, 0
+# %bb.4:                                # %lor.lhs.false130
 	i32.const	$push59=, 1103515245
-	i32.mul 	$push60=, $1, $pop59
+	i32.mul 	$push60=, $0, $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.add 	$0=, $pop60, $pop61
+	i32.const	$push147=, 1103515245
+	i32.mul 	$push62=, $0, $pop147
+	i32.const	$push146=, 12345
+	i32.add 	$2=, $pop62, $pop146
+	i32.const	$push63=, 0
+	i32.store	myrnd.s($pop63), $2
 	i32.const	$push64=, 16
-	i32.shr_u	$push198=, $0, $pop64
-	tee_local	$push197=, $0=, $pop198
+	i32.shr_u	$2=, $2, $pop64
 	i32.const	$push65=, 2047
-	i32.and 	$push66=, $pop197, $pop65
+	i32.and 	$push66=, $2, $pop65
 	i32.const	$push67=, 10
-	i32.shr_u	$push68=, $1, $pop67
+	i32.shr_u	$push68=, $0, $pop67
 	i32.const	$push69=, 64
 	i32.and 	$push70=, $pop68, $pop69
-	i32.or  	$push71=, $pop70, $2
+	i32.or  	$push71=, $pop70, $1
 	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.add 	$3=, $pop66, $pop75
+	i32.const	$push145=, 0
+	i32.const	$push144=, 6
+	i32.shl 	$push76=, $3, $pop144
+	i32.const	$push143=, 64
+	i32.and 	$push77=, $pop76, $pop143
+	i32.or  	$push78=, $pop77, $1
+	i32.store16	sU($pop145), $pop78
+	i32.const	$push142=, 16
+	i32.shr_u	$push79=, $0, $pop142
+	i32.add 	$push80=, $2, $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
+# %bb.5:                                # %if.end136
 	return
 .LBB126_6:                              # %if.then
 	end_block                       # label16:
@@ -5549,7 +5167,7 @@ testU:                                  # @testU
 	.type	retmeV,@function
 retmeV:                                 # @retmeV
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1):p2align=0
 	i32.store	0($0):p2align=1, $pop0
                                         # fallthrough-return
@@ -5564,7 +5182,7 @@ retmeV:                                 # @retmeV
 fn1V:                                   # @fn1V
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sV($pop0)
 	i32.const	$push2=, 8
@@ -5584,7 +5202,7 @@ fn1V:                                   # @fn1V
 fn2V:                                   # @fn2V
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sV+1($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5601,7 +5219,7 @@ fn2V:                                   # @fn2V
 	.type	retitV,@function
 retitV:                                 # @retitV
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, sV+1($pop0)
 	i32.const	$push2=, 1
@@ -5619,23 +5237,21 @@ fn3V:                                   # @fn3V
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push16=, 0
-	i32.load16_u	$push15=, sV($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i32.load16_u	$1=, sV($pop0)
 	i32.const	$push3=, 8
-	i32.shr_u	$push4=, $pop14, $pop3
-	i32.add 	$push13=, $pop4, $0
-	tee_local	$push12=, $0=, $pop13
+	i32.shr_u	$push4=, $1, $pop3
+	i32.add 	$0=, $pop4, $0
+	i32.const	$push12=, 0
 	i32.const	$push11=, 8
-	i32.shl 	$push5=, $pop12, $pop11
+	i32.shl 	$push5=, $0, $pop11
 	i32.const	$push6=, 256
 	i32.and 	$push7=, $pop5, $pop6
 	i32.const	$push1=, 65279
 	i32.and 	$push2=, $1, $pop1
 	i32.or  	$push8=, $pop7, $pop2
-	i32.store16	sV($pop0), $pop8
+	i32.store16	sV($pop12), $pop8
 	i32.const	$push9=, 1
 	i32.and 	$push10=, $0, $pop9
                                         # fallthrough-return: $pop10
@@ -5649,76 +5265,68 @@ fn3V:                                   # @fn3V
 	.type	testV,@function
 testV:                                  # @testV
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push89=, 0
+	i32.load	$push0=, myrnd.s($pop89)
+	i32.const	$push88=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop88
+	i32.const	$push87=, 12345
+	i32.add 	$1=, $pop1, $pop87
 	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	$push85=, 16
+	i32.shr_u	$push2=, $1, $pop85
+	i32.store8	sV($pop86), $pop2
+	i32.const	$push84=, 1103515245
+	i32.mul 	$push3=, $1, $pop84
+	i32.const	$push83=, 12345
+	i32.add 	$1=, $pop3, $pop83
+	i32.const	$push82=, 0
 	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.load16_u	$push9=, sV($pop73)
+	i32.shr_u	$push4=, $1, $pop81
+	i32.store8	sV+1($pop82), $pop4
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push5=, $1, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$1=, $pop5, $pop79
+	i32.const	$push78=, 0
+	i32.const	$push77=, 16
+	i32.shr_u	$push6=, $1, $pop77
+	i32.store8	sV+2($pop78), $pop6
+	i32.const	$push76=, 1103515245
+	i32.mul 	$push7=, $1, $pop76
+	i32.const	$push75=, 12345
+	i32.add 	$2=, $pop7, $pop75
+	i32.const	$push74=, 0
+	i32.const	$push73=, 16
+	i32.shr_u	$push8=, $2, $pop73
+	i32.store8	sV+3($pop74), $pop8
+	i32.const	$push72=, 0
+	i32.load16_u	$push9=, sV($pop72)
 	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
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push71=, 1103515245
+	i32.mul 	$push11=, $2, $pop71
+	i32.const	$push70=, 12345
+	i32.add 	$2=, $pop11, $pop70
+	i32.const	$push69=, 0
+	i32.const	$push68=, 8
+	i32.shr_u	$push12=, $2, $pop68
+	i32.const	$push67=, 256
+	i32.and 	$push13=, $pop12, $pop67
+	i32.or  	$push14=, $pop13, $1
+	i32.store16	sV($pop69), $pop14
+	i32.const	$push66=, 1103515245
+	i32.mul 	$push15=, $2, $pop66
+	i32.const	$push65=, 12345
+	i32.add 	$0=, $pop15, $pop65
+	i32.const	$push64=, 0
+	i32.store	myrnd.s($pop64), $0
+	i32.const	$push63=, 16
+	i32.shr_u	$3=, $0, $pop63
 	block   	
-	i32.const	$push65=, 16
-	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.add 	$push17=, $3, $pop16
 	i32.const	$push61=, 0
 	i32.load	$push18=, sV($pop61)
 	i32.const	$push60=, 8
@@ -5728,71 +5336,60 @@ testV:                                  # @testV
 	i32.const	$push59=, 1
 	i32.and 	$push22=, $pop21, $pop59
 	br_if   	0, $pop22       # 0: down to label17
-# BB#1:                                 # %if.end
-	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
+# %bb.1:                                # %if.end
+	i32.const	$push100=, 1103515245
+	i32.mul 	$push23=, $0, $pop100
+	i32.const	$push99=, 12345
+	i32.add 	$0=, $pop23, $pop99
+	i32.const	$push98=, 1103515245
+	i32.mul 	$push24=, $0, $pop98
+	i32.const	$push97=, 12345
+	i32.add 	$2=, $pop24, $pop97
+	i32.const	$push96=, 0
+	i32.store	myrnd.s($pop96), $2
+	i32.const	$push95=, 16
+	i32.shr_u	$0=, $0, $pop95
 	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.and 	$3=, $0, $pop25
+	i32.const	$push94=, 8
+	i32.shl 	$push26=, $3, $pop94
+	i32.const	$push93=, 256
+	i32.and 	$push27=, $pop26, $pop93
+	i32.or  	$4=, $pop27, $1
+	i32.const	$push92=, 0
+	i32.store16	sV($pop92), $4
 	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
+	i32.const	$push91=, 8
+	i32.shr_u	$4=, $pop29, $pop91
+	i32.xor 	$push30=, $4, $3
+	i32.const	$push90=, 1
+	i32.and 	$push31=, $pop30, $pop90
 	br_if   	0, $pop31       # 0: down to label17
-# BB#2:                                 # %lor.lhs.false89
-	i32.const	$push132=, 16
-	i32.shr_u	$push131=, $2, $pop132
-	tee_local	$push130=, $3=, $pop131
-	i32.add 	$push33=, $pop130, $4
+# %bb.2:                                # %lor.lhs.false89
+	i32.const	$push102=, 16
+	i32.shr_u	$3=, $2, $pop102
+	i32.add 	$push33=, $3, $4
 	i32.add 	$push32=, $3, $0
 	i32.xor 	$push34=, $pop33, $pop32
-	i32.const	$push129=, 1
-	i32.and 	$push35=, $pop34, $pop129
+	i32.const	$push101=, 1
+	i32.and 	$push35=, $pop34, $pop101
 	br_if   	0, $pop35       # 0: down to label17
-# BB#3:                                 # %lor.lhs.false136
-	i32.const	$push40=, 0
+# %bb.3:                                # %lor.lhs.false136
 	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.add 	$2=, $pop37, $pop38
+	i32.const	$push110=, 1103515245
+	i32.mul 	$push39=, $2, $pop110
+	i32.const	$push109=, 12345
+	i32.add 	$0=, $pop39, $pop109
+	i32.const	$push40=, 0
+	i32.store	myrnd.s($pop40), $0
 	i32.const	$push41=, 16
-	i32.shr_u	$push141=, $0, $pop41
-	tee_local	$push140=, $0=, $pop141
+	i32.shr_u	$0=, $0, $pop41
 	i32.const	$push42=, 2047
-	i32.and 	$push43=, $pop140, $pop42
+	i32.and 	$push43=, $0, $pop42
 	i32.const	$push44=, 8
 	i32.shr_u	$push45=, $2, $pop44
 	i32.const	$push46=, 256
@@ -5800,24 +5397,24 @@ testV:                                  # @testV
 	i32.or  	$push48=, $pop47, $1
 	i32.const	$push49=, 65280
 	i32.and 	$push50=, $pop48, $pop49
-	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.const	$push108=, 8
+	i32.shr_u	$push51=, $pop50, $pop108
+	i32.add 	$3=, $pop43, $pop51
+	i32.const	$push107=, 0
+	i32.const	$push106=, 8
+	i32.shl 	$push52=, $3, $pop106
+	i32.const	$push105=, 256
+	i32.and 	$push53=, $pop52, $pop105
 	i32.or  	$push54=, $pop53, $1
-	i32.store16	sV($pop142), $pop54
-	i32.const	$push134=, 16
-	i32.shr_u	$push55=, $2, $pop134
+	i32.store16	sV($pop107), $pop54
+	i32.const	$push104=, 16
+	i32.shr_u	$push55=, $2, $pop104
 	i32.add 	$push56=, $0, $pop55
 	i32.xor 	$push57=, $pop56, $3
-	i32.const	$push133=, 1
-	i32.and 	$push58=, $pop57, $pop133
+	i32.const	$push103=, 1
+	i32.and 	$push58=, $pop57, $pop103
 	br_if   	0, $pop58       # 0: down to label17
-# BB#4:                                 # %if.end142
+# %bb.4:                                # %if.end142
 	return
 .LBB132_5:                              # %if.then
 	end_block                       # label17:
@@ -5833,7 +5430,7 @@ testV:                                  # @testV
 	.type	retmeW,@function
 retmeW:                                 # @retmeW
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 16
@@ -5860,7 +5457,7 @@ retmeW:                                 # @retmeW
 fn1W:                                   # @fn1W
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sW+16($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5878,7 +5475,7 @@ fn1W:                                   # @fn1W
 fn2W:                                   # @fn2W
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sW+16($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -5897,7 +5494,7 @@ fn2W:                                   # @fn2W
 	.type	retitW,@function
 retitW:                                 # @retitW
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sW+16($pop0)
 	i32.const	$push2=, 4095
@@ -5915,21 +5512,19 @@ fn3W:                                   # @fn3W
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sW+16($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sW+16($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sW+16($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sW+16($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end137:
 	.size	fn3W, .Lfunc_end137-fn3W
@@ -5940,63 +5535,57 @@ fn3W:                                   # @fn3W
 	.type	testW,@function
 testW:                                  # @testW
 	.local  	i32, i32
-# BB#0:                                 # %if.end119
+# %bb.0:                                # %if.end119
 	i32.const	$push0=, 0
-	i32.const	$push63=, 0
-	i32.load	$push1=, myrnd.s($pop63)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1670464429
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 2121308585
-	i32.add 	$push62=, $pop3, $pop4
-	tee_local	$push61=, $0=, $pop62
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push51=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop61, $pop5
-	i32.store8	sW+16($pop0), $pop6
-	i32.const	$push60=, 0
+	i32.shr_u	$push6=, $0, $pop5
+	i32.store8	sW+16($pop51), $pop6
 	i32.const	$push7=, 1103515245
 	i32.mul 	$push8=, $0, $pop7
 	i32.const	$push9=, 12345
-	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.add 	$0=, $pop8, $pop9
 	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	$push49=, 16
+	i32.shr_u	$push10=, $0, $pop49
+	i32.store8	sW+17($pop50), $pop10
+	i32.const	$push48=, 1103515245
+	i32.mul 	$push11=, $0, $pop48
+	i32.const	$push47=, 12345
+	i32.add 	$0=, $pop11, $pop47
+	i32.const	$push46=, 0
 	i32.const	$push45=, 16
-	i32.shr_u	$push14=, $pop46, $pop45
-	i32.store8	sW+19($pop50), $pop14
-	i32.const	$push44=, 0
+	i32.shr_u	$push12=, $0, $pop45
+	i32.store8	sW+18($pop46), $pop12
+	i32.const	$push44=, 1103515245
+	i32.mul 	$push13=, $0, $pop44
+	i32.const	$push43=, 12345
+	i32.add 	$0=, $pop13, $pop43
+	i32.const	$push42=, 0
+	i32.const	$push41=, 16
+	i32.shr_u	$push14=, $0, $pop41
+	i32.store8	sW+19($pop42), $pop14
+	i32.const	$push40=, 0
 	i64.const	$push15=, 4612055454334320640
-	i64.store	sW+8($pop44), $pop15
-	i32.const	$push43=, 0
+	i64.store	sW+8($pop40), $pop15
+	i32.const	$push39=, 0
 	i64.const	$push16=, 0
-	i64.store	sW($pop43), $pop16
-	i32.const	$push42=, 0
+	i64.store	sW($pop39), $pop16
 	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.add 	$0=, $pop18, $pop19
+	i32.const	$push38=, 1103515245
+	i32.mul 	$push20=, $0, $pop38
+	i32.const	$push37=, 12345
+	i32.add 	$1=, $pop20, $pop37
+	i32.const	$push36=, 0
+	i32.store	myrnd.s($pop36), $1
 	i32.const	$push35=, 0
 	i32.const	$push34=, 16
 	i32.shr_u	$push24=, $1, $pop34
@@ -6024,7 +5613,7 @@ testW:                                  # @testW
 	.type	retmeX,@function
 retmeX:                                 # @retmeX
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 16
@@ -6051,7 +5640,7 @@ retmeX:                                 # @retmeX
 fn1X:                                   # @fn1X
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sX($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6069,7 +5658,7 @@ fn1X:                                   # @fn1X
 fn2X:                                   # @fn2X
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sX($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6088,7 +5677,7 @@ fn2X:                                   # @fn2X
 	.type	retitX,@function
 retitX:                                 # @retitX
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sX($pop0)
 	i32.const	$push2=, 4095
@@ -6106,21 +5695,19 @@ fn3X:                                   # @fn3X
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sX($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sX($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sX($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sX($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end143:
 	.size	fn3X, .Lfunc_end143-fn3X
@@ -6131,63 +5718,57 @@ fn3X:                                   # @fn3X
 	.type	testX,@function
 testX:                                  # @testX
 	.local  	i32, i32
-# BB#0:                                 # %if.end113
+# %bb.0:                                # %if.end113
 	i32.const	$push0=, 0
-	i32.const	$push63=, 0
-	i32.load	$push1=, myrnd.s($pop63)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push62=, $pop3, $pop4
-	tee_local	$push61=, $0=, $pop62
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push51=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop61, $pop5
-	i32.store8	sX($pop0), $pop6
-	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=, 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.shr_u	$push6=, $0, $pop5
+	i32.store8	sX($pop51), $pop6
+	i32.const	$push50=, 1103515245
+	i32.mul 	$push7=, $0, $pop50
+	i32.const	$push49=, 12345
+	i32.add 	$0=, $pop7, $pop49
 	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	$push47=, 16
+	i32.shr_u	$push8=, $0, $pop47
+	i32.store8	sX+1($pop48), $pop8
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push9=, $0, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$0=, $pop9, $pop45
+	i32.const	$push44=, 0
 	i32.const	$push43=, 16
-	i32.shr_u	$push12=, $pop44, $pop43
-	i32.store8	sX+3($pop48), $pop12
-	i32.const	$push42=, 0
+	i32.shr_u	$push10=, $0, $pop43
+	i32.store8	sX+2($pop44), $pop10
+	i32.const	$push42=, 1103515245
+	i32.mul 	$push11=, $0, $pop42
+	i32.const	$push41=, 12345
+	i32.add 	$0=, $pop11, $pop41
+	i32.const	$push40=, 0
+	i32.const	$push39=, 16
+	i32.shr_u	$push12=, $0, $pop39
+	i32.store8	sX+3($pop40), $pop12
+	i32.const	$push38=, 0
 	i64.const	$push13=, 4612055454334320640
-	i64.store	sX+12($pop42):p2align=2, $pop13
-	i32.const	$push41=, 0
+	i64.store	sX+12($pop38):p2align=2, $pop13
+	i32.const	$push37=, 0
 	i64.const	$push14=, 0
-	i64.store	sX+4($pop41):p2align=2, $pop14
-	i32.const	$push40=, 0
+	i64.store	sX+4($pop37):p2align=2, $pop14
 	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.add 	$0=, $pop16, $pop17
+	i32.const	$push36=, 1103515245
+	i32.mul 	$push18=, $0, $pop36
+	i32.const	$push35=, 12345
+	i32.add 	$1=, $pop18, $pop35
+	i32.const	$push34=, 0
+	i32.store	myrnd.s($pop34), $1
 	i32.const	$push33=, 0
 	i32.const	$push32=, 16
 	i32.shr_u	$push22=, $1, $pop32
@@ -6215,7 +5796,7 @@ testX:                                  # @testX
 	.type	retmeY,@function
 retmeY:                                 # @retmeY
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 16
@@ -6242,7 +5823,7 @@ retmeY:                                 # @retmeY
 fn1Y:                                   # @fn1Y
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sY($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6260,7 +5841,7 @@ fn1Y:                                   # @fn1Y
 fn2Y:                                   # @fn2Y
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sY($pop0)
 	i32.add 	$push2=, $pop1, $0
@@ -6279,7 +5860,7 @@ fn2Y:                                   # @fn2Y
 	.type	retitY,@function
 retitY:                                 # @retitY
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sY($pop0)
 	i32.const	$push2=, 4095
@@ -6297,21 +5878,19 @@ fn3Y:                                   # @fn3Y
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, sY($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop8, $0
+	i32.load	$1=, sY($pop0)
+	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, 4095
-	i32.and 	$push7=, $pop3, $pop4
-	tee_local	$push6=, $0=, $pop7
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push6=, 0
 	i32.const	$push1=, -4096
 	i32.and 	$push2=, $1, $pop1
-	i32.or  	$push5=, $pop6, $pop2
-	i32.store	sY($pop0), $pop5
-	copy_local	$push11=, $0
-                                        # fallthrough-return: $pop11
+	i32.or  	$push5=, $0, $pop2
+	i32.store	sY($pop6), $pop5
+	copy_local	$push7=, $0
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end149:
 	.size	fn3Y, .Lfunc_end149-fn3Y
@@ -6322,63 +5901,57 @@ fn3Y:                                   # @fn3Y
 	.type	testY,@function
 testY:                                  # @testY
 	.local  	i32, i32
-# BB#0:                                 # %if.end113
+# %bb.0:                                # %if.end113
 	i32.const	$push0=, 0
-	i32.const	$push63=, 0
-	i32.load	$push1=, myrnd.s($pop63)
+	i32.load	$push1=, myrnd.s($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push62=, $pop3, $pop4
-	tee_local	$push61=, $0=, $pop62
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push51=, 0
 	i32.const	$push5=, 16
-	i32.shr_u	$push6=, $pop61, $pop5
-	i32.store8	sY($pop0), $pop6
-	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=, 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.shr_u	$push6=, $0, $pop5
+	i32.store8	sY($pop51), $pop6
+	i32.const	$push50=, 1103515245
+	i32.mul 	$push7=, $0, $pop50
+	i32.const	$push49=, 12345
+	i32.add 	$0=, $pop7, $pop49
 	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	$push47=, 16
+	i32.shr_u	$push8=, $0, $pop47
+	i32.store8	sY+1($pop48), $pop8
+	i32.const	$push46=, 1103515245
+	i32.mul 	$push9=, $0, $pop46
+	i32.const	$push45=, 12345
+	i32.add 	$0=, $pop9, $pop45
+	i32.const	$push44=, 0
 	i32.const	$push43=, 16
-	i32.shr_u	$push12=, $pop44, $pop43
-	i32.store8	sY+3($pop48), $pop12
-	i32.const	$push42=, 0
+	i32.shr_u	$push10=, $0, $pop43
+	i32.store8	sY+2($pop44), $pop10
+	i32.const	$push42=, 1103515245
+	i32.mul 	$push11=, $0, $pop42
+	i32.const	$push41=, 12345
+	i32.add 	$0=, $pop11, $pop41
+	i32.const	$push40=, 0
+	i32.const	$push39=, 16
+	i32.shr_u	$push12=, $0, $pop39
+	i32.store8	sY+3($pop40), $pop12
+	i32.const	$push38=, 0
 	i64.const	$push13=, 4612055454334320640
-	i64.store	sY+12($pop42):p2align=2, $pop13
-	i32.const	$push41=, 0
+	i64.store	sY+12($pop38):p2align=2, $pop13
+	i32.const	$push37=, 0
 	i64.const	$push14=, 0
-	i64.store	sY+4($pop41):p2align=2, $pop14
-	i32.const	$push40=, 0
+	i64.store	sY+4($pop37):p2align=2, $pop14
 	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.add 	$0=, $pop16, $pop17
+	i32.const	$push36=, 1103515245
+	i32.mul 	$push18=, $0, $pop36
+	i32.const	$push35=, 12345
+	i32.add 	$1=, $pop18, $pop35
+	i32.const	$push34=, 0
+	i32.store	myrnd.s($pop34), $1
 	i32.const	$push33=, 0
 	i32.const	$push32=, 16
 	i32.shr_u	$push22=, $1, $pop32
@@ -6406,7 +5979,7 @@ testY:                                  # @testY
 	.type	retmeZ,@function
 retmeZ:                                 # @retmeZ
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	i32.const	$push1=, 16
@@ -6433,7 +6006,7 @@ retmeZ:                                 # @retmeZ
 fn1Z:                                   # @fn1Z
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push3=, sZ+16($pop2)
 	i32.const	$push0=, 20
@@ -6453,7 +6026,7 @@ fn1Z:                                   # @fn1Z
 fn2Z:                                   # @fn2Z
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sZ+16($pop0)
 	i32.const	$push2=, 20
@@ -6474,7 +6047,7 @@ fn2Z:                                   # @fn2Z
 	.type	retitZ,@function
 retitZ:                                 # @retitZ
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, sZ+16($pop0)
 	i32.const	$push2=, 20
@@ -6491,15 +6064,14 @@ retitZ:                                 # @retitZ
 fn3Z:                                   # @fn3Z
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.const	$push8=, 0
-	i32.load	$push3=, sZ+16($pop8)
+	i32.load	$push3=, sZ+16($pop2)
 	i32.const	$push0=, 20
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push7=, $pop3, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.store	sZ+16($pop2), $pop6
+	i32.add 	$0=, $pop3, $pop1
+	i32.const	$push6=, 0
+	i32.store	sZ+16($pop6), $0
 	i32.const	$push5=, 20
 	i32.shr_u	$push4=, $0, $pop5
                                         # fallthrough-return: $pop4
@@ -6513,87 +6085,76 @@ fn3Z:                                   # @fn3Z
 	.type	testZ,@function
 testZ:                                  # @testZ
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push90=, 0
-	i32.const	$push89=, 0
-	i32.load	$push0=, myrnd.s($pop89)
+# %bb.0:                                # %entry
+	i32.const	$push68=, 0
+	i32.load	$push0=, myrnd.s($pop68)
 	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 	$push9=, $1, $pop72
-	i32.const	$push71=, 12345
-	i32.add 	$push70=, $pop9, $pop71
-	tee_local	$push69=, $1=, $pop70
-	i32.const	$push68=, 16
-	i32.shr_u	$push10=, $pop69, $pop68
-	i32.store8	sZ+19($pop73), $pop10
+	i32.add 	$1=, $pop2, $pop3
 	i32.const	$push67=, 0
+	i32.const	$push66=, 16
+	i32.shr_u	$push4=, $1, $pop66
+	i32.store8	sZ+16($pop67), $pop4
+	i32.const	$push65=, 1103515245
+	i32.mul 	$push5=, $1, $pop65
+	i32.const	$push64=, 12345
+	i32.add 	$1=, $pop5, $pop64
+	i32.const	$push63=, 0
+	i32.const	$push62=, 16
+	i32.shr_u	$push6=, $1, $pop62
+	i32.store8	sZ+17($pop63), $pop6
+	i32.const	$push61=, 1103515245
+	i32.mul 	$push7=, $1, $pop61
+	i32.const	$push60=, 12345
+	i32.add 	$1=, $pop7, $pop60
+	i32.const	$push59=, 0
+	i32.const	$push58=, 16
+	i32.shr_u	$push8=, $1, $pop58
+	i32.store8	sZ+18($pop59), $pop8
+	i32.const	$push57=, 1103515245
+	i32.mul 	$push9=, $1, $pop57
+	i32.const	$push56=, 12345
+	i32.add 	$1=, $pop9, $pop56
+	i32.const	$push55=, 0
+	i32.const	$push54=, 16
+	i32.shr_u	$push10=, $1, $pop54
+	i32.store8	sZ+19($pop55), $pop10
+	i32.const	$push53=, 0
 	i64.const	$push11=, 4612055454334320640
-	i64.store	sZ+8($pop67), $pop11
-	i32.const	$push66=, 0
+	i64.store	sZ+8($pop53), $pop11
+	i32.const	$push52=, 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
+	i64.store	sZ($pop52), $pop12
+	i32.const	$push51=, 1103515245
+	i32.mul 	$push13=, $1, $pop51
+	i32.const	$push50=, 12345
+	i32.add 	$3=, $pop13, $pop50
+	i32.const	$push49=, 1103515245
+	i32.mul 	$push14=, $3, $pop49
+	i32.const	$push48=, 12345
+	i32.add 	$1=, $pop14, $pop48
+	i32.const	$push47=, 0
+	i32.store	myrnd.s($pop47), $1
+	i32.const	$push46=, 0
+	i32.load	$0=, sZ+16($pop46)
+	i32.const	$push45=, 1048575
+	i32.and 	$2=, $0, $pop45
+	i32.const	$push44=, 16
+	i32.shr_u	$push15=, $3, $pop44
+	i32.const	$push43=, 2047
+	i32.and 	$3=, $pop15, $pop43
+	i32.const	$push42=, 20
+	i32.shl 	$push16=, $3, $pop42
+	i32.or  	$4=, $pop16, $2
+	i32.const	$push41=, 0
+	i32.store	sZ+16($pop41), $4
+	i32.const	$push40=, 16
+	i32.shr_u	$push17=, $1, $pop40
+	i32.const	$push39=, 2047
+	i32.and 	$5=, $pop17, $pop39
 	block   	
-	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.add 	$push18=, $5, $3
 	i32.const	$push38=, 20
 	i32.shl 	$push19=, $5, $pop38
 	i32.add 	$push20=, $pop19, $4
@@ -6601,49 +6162,44 @@ testZ:                                  # @testZ
 	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	$push111=, 0
+# %bb.1:                                # %if.end80
 	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.add 	$1=, $pop25, $pop26
+	i32.const	$push79=, 1103515245
+	i32.mul 	$push27=, $1, $pop79
+	i32.const	$push78=, 12345
+	i32.add 	$3=, $pop27, $pop78
+	i32.const	$push77=, 0
+	i32.store	myrnd.s($pop77), $3
+	i32.const	$push76=, 16
+	i32.shr_u	$push28=, $1, $pop76
+	i32.const	$push75=, 2047
+	i32.and 	$4=, $pop28, $pop75
+	i32.const	$push74=, 16
+	i32.shr_u	$push31=, $3, $pop74
+	i32.const	$push73=, 2047
+	i32.and 	$3=, $pop31, $pop73
+	i32.const	$push72=, 20
+	i32.shl 	$push32=, $3, $pop72
+	i32.const	$push71=, 20
+	i32.shl 	$push29=, $4, $pop71
 	i32.or  	$push30=, $pop29, $2
-	i32.add 	$push93=, $pop32, $pop30
-	tee_local	$push92=, $1=, $pop93
-	i32.store	sZ+16($pop104), $pop92
+	i32.add 	$1=, $pop32, $pop30
+	i32.const	$push70=, 0
+	i32.store	sZ+16($pop70), $1
 	i32.add 	$push33=, $3, $4
-	i32.const	$push91=, 20
-	i32.shr_u	$push34=, $1, $pop91
+	i32.const	$push69=, 20
+	i32.shr_u	$push34=, $1, $pop69
 	i32.ne  	$push35=, $pop33, $pop34
 	br_if   	0, $pop35       # 0: down to label18
-# BB#2:                                 # %if.end80
+# %bb.2:                                # %if.end80
 	i32.xor 	$push36=, $1, $0
-	i32.const	$push112=, 1048575
-	i32.and 	$push23=, $pop36, $pop112
+	i32.const	$push80=, 1048575
+	i32.and 	$push23=, $pop36, $pop80
 	br_if   	0, $pop23       # 0: down to label18
-# BB#3:                                 # %if.end121
+# %bb.3:                                # %if.end121
 	return
 .LBB156_4:                              # %if.then
 	end_block                       # label18:
@@ -6659,7 +6215,7 @@ testZ:                                  # @testZ
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	testA@FUNCTION
 	call    	testB@FUNCTION
 	call    	testC@FUNCTION
@@ -6933,6 +6489,6 @@ sZ:
 	.size	sZ, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 35ccc3a35..e853c19c9 100644
--- a/test/torture-s/20040805-1.c.s
+++ b/test/torture-s/20040805-1.c.s
@@ -6,13 +6,13 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push1=, foo@FUNCTION
 	i32.const	$push0=, 102
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	call    	exit@FUNCTION, $pop3
 	unreachable
@@ -29,12 +29,11 @@ main:                                   # @main
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push7=, 0
-	i32.load	$push6=, a($pop7)
-	tee_local	$push5=, $0=, $pop6
-	i32.store	a+4($pop0), $pop5
+	i32.load	$0=, a($pop0)
+	i32.const	$push5=, 0
+	i32.store	a+4($pop5), $0
 	i32.const	$push1=, 100
 	i32.call	$drop=, bar@FUNCTION, $pop1
 	i32.call	$push2=, bar@FUNCTION, $0
@@ -50,7 +49,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, a($pop4)
@@ -74,6 +73,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7b2b881f7..a71e93642 100644
--- a/test/torture-s/20040811-1.c.s
+++ b/test/torture-s/20040811-1.c.s
@@ -6,47 +6,56 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.load	$push9=, __stack_pointer($pop7)
-	tee_local	$push8=, $3=, $pop9
-	copy_local	$drop=, $pop8
-	i32.const	$2=, 0
+	.local  	i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push10=, 0
+	i32.load	$6=, __stack_pointer($pop10)
+	copy_local	$drop=, $6
+	i32.const	$2=, 1000000
+	i32.const	$3=, 0
+	i32.const	$4=, 1
+	i32.const	$5=, 0
 .LBB0_1:                                # %lab
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push24=, 1000
-	i32.rem_s	$push0=, $2, $pop24
-	i32.const	$push23=, 2
-	i32.shl 	$push22=, $pop0, $pop23
-	tee_local	$push21=, $0=, $pop22
-	i32.const	$push20=, 19
-	i32.add 	$push1=, $pop21, $pop20
+	i32.const	$push23=, 1000
+	i32.div_u	$0=, $5, $pop23
+	i32.const	$push22=, 1000
+	i32.mul 	$push0=, $0, $pop22
+	i32.sub 	$push1=, $4, $pop0
+	i32.const	$push21=, 2
+	i32.shl 	$push2=, $pop1, $pop21
+	i32.const	$push20=, 15
+	i32.add 	$push3=, $pop2, $pop20
 	i32.const	$push19=, -16
-	i32.and 	$push2=, $pop1, $pop19
-	i32.sub 	$push18=, $3, $pop2
-	tee_local	$push17=, $1=, $pop18
-	copy_local	$drop=, $pop17
-	i32.const	$push16=, 1
-	i32.store	0($1), $pop16
-	i32.const	$push15=, 0
-	i32.store	p($pop15), $1
-	i32.add 	$push4=, $1, $0
-	i32.const	$push14=, 2
-	i32.store	0($pop4), $pop14
-	copy_local	$push3=, $3
-	copy_local	$3=, $pop3
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $2, $pop13
-	tee_local	$push11=, $2=, $pop12
-	i32.const	$push10=, 1000000
-	i32.ne  	$push5=, $pop11, $pop10
-	br_if   	0, $pop5        # 0: up to label0
-# BB#2:                                 # %cleanup3
+	i32.and 	$push4=, $pop3, $pop19
+	i32.sub 	$1=, $6, $pop4
+	copy_local	$drop=, $1
+	i32.const	$push18=, 1
+	i32.store	0($1), $pop18
+	i32.const	$push17=, 0
+	i32.store	p($pop17), $1
+	i32.const	$push16=, 4000
+	i32.mul 	$push6=, $0, $pop16
+	i32.sub 	$push7=, $3, $pop6
+	i32.add 	$push8=, $1, $pop7
+	i32.const	$push15=, 2
+	i32.store	0($pop8), $pop15
+	i32.const	$push14=, -1
+	i32.add 	$2=, $2, $pop14
+	i32.const	$push13=, 4
+	i32.add 	$3=, $3, $pop13
+	i32.const	$push12=, 1
+	i32.add 	$4=, $4, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$5=, $5, $pop11
+	copy_local	$push5=, $6
+	copy_local	$6=, $pop5
+	br_if   	0, $2           # 0: up to label0
+# %bb.2:                                # %cleanup3
 	end_loop
-	i32.const	$push6=, 0
-                                        # fallthrough-return: $pop6
+	i32.const	$push9=, 0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -61,4 +70,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20040820-1.c.s b/test/torture-s/20040820-1.c.s
index be364d163..d1781b461 100644
--- a/test/torture-s/20040820-1.c.s
+++ b/test/torture-s/20040820-1.c.s
@@ -6,12 +6,12 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ check:                                  # @check
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 2
 	i32.const	$push0=, 0
@@ -38,7 +38,7 @@ test:                                   # @test
 	i32.const	$push5=, 1
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#1:                                 # %check.exit
+# %bb.1:                                # %check.exit
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -54,18 +54,15 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push1=, 1
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	call    	test@FUNCTION, $pop1, $pop0
-	i32.const	$push2=, 0
-	call    	exit@FUNCTION, $pop2
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3c6b31b43..c0ec6c011 100644
--- a/test/torture-s/20040823-1.c.s
+++ b/test/torture-s/20040823-1.c.s
@@ -5,13 +5,13 @@
 	.globl	bla
 	.type	bla,@function
 bla:                                    # @bla
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, pwarn($pop2)
 	i32.load	$push1=, 0($pop0)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -30,14 +30,13 @@ bla:                                    # @bla
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	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
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 1
 	i32.store	12($0), $pop0
 	i32.const	$push1=, 0
@@ -60,6 +59,6 @@ pwarn:
 	.size	pwarn, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 15e48615d..47c722664 100644
--- a/test/torture-s/20040831-1.c.s
+++ b/test/torture-s/20040831-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20040917-1.c.s b/test/torture-s/20040917-1.c.s
index 68a8bdaea..515417b91 100644
--- a/test/torture-s/20040917-1.c.s
+++ b/test/torture-s/20040917-1.c.s
@@ -5,7 +5,7 @@
 	.globl	not_inlinable
 	.type	not_inlinable,@function
 not_inlinable:                          # @not_inlinable
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, -10
 	i32.store	test_var($pop1), $pop0
@@ -20,7 +20,7 @@ not_inlinable:                          # @not_inlinable
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.const	$push0=, 10
 	i32.store	test_var($pop5), $pop0
@@ -31,7 +31,7 @@ main:                                   # @main
 	i32.const	$push3=, 10
 	i32.eq  	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -50,5 +50,5 @@ test_var:
 	.size	test_var, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20041011-1.c.s b/test/torture-s/20041011-1.c.s
index 94fc8b599..cc255a443 100644
--- a/test/torture-s/20041011-1.c.s
+++ b/test/torture-s/20041011-1.c.s
@@ -8,11 +8,11 @@ t1:                                     # @t1
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -21,139 +21,138 @@ t1:                                     # @t1
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push68=, 0
-	i32.load	$3=, gvol+4($pop68)
-	i32.const	$push67=, 0
-	i32.load	$4=, gvol+8($pop67)
 	i32.const	$push66=, 0
-	i32.load	$5=, gvol+12($pop66)
+	i32.load	$3=, gvol+4($pop66)
 	i32.const	$push65=, 0
-	i32.load	$6=, gvol+16($pop65)
+	i32.load	$4=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$7=, gvol+20($pop64)
+	i32.load	$5=, gvol+12($pop64)
 	i32.const	$push63=, 0
-	i32.load	$8=, gvol+24($pop63)
+	i32.load	$6=, gvol+16($pop63)
 	i32.const	$push62=, 0
-	i32.load	$9=, gvol+28($pop62)
+	i32.load	$7=, gvol+20($pop62)
 	i32.const	$push61=, 0
-	i32.load	$10=, gvol+32($pop61)
+	i32.load	$8=, gvol+24($pop61)
 	i32.const	$push60=, 0
-	i32.load	$11=, gvol+36($pop60)
+	i32.load	$9=, gvol+28($pop60)
 	i32.const	$push59=, 0
-	i32.load	$12=, gvol+40($pop59)
+	i32.load	$10=, gvol+32($pop59)
 	i32.const	$push58=, 0
-	i32.load	$13=, gvol+44($pop58)
+	i32.load	$11=, gvol+36($pop58)
 	i32.const	$push57=, 0
-	i32.load	$14=, gvol+48($pop57)
+	i32.load	$12=, gvol+40($pop57)
 	i32.const	$push56=, 0
-	i32.load	$15=, gvol+52($pop56)
+	i32.load	$13=, gvol+44($pop56)
 	i32.const	$push55=, 0
-	i32.load	$16=, gvol+56($pop55)
+	i32.load	$14=, gvol+48($pop55)
 	i32.const	$push54=, 0
-	i32.load	$17=, gvol+60($pop54)
+	i32.load	$15=, gvol+52($pop54)
 	i32.const	$push53=, 0
-	i32.load	$18=, gvol+64($pop53)
+	i32.load	$16=, gvol+56($pop53)
 	i32.const	$push52=, 0
-	i32.load	$19=, gvol+68($pop52)
+	i32.load	$17=, gvol+60($pop52)
 	i32.const	$push51=, 0
-	i32.load	$20=, gvol+72($pop51)
+	i32.load	$18=, gvol+64($pop51)
 	i32.const	$push50=, 0
-	i32.load	$21=, gvol+76($pop50)
+	i32.load	$19=, gvol+68($pop50)
 	i32.const	$push49=, 0
-	i32.load	$22=, gvol+80($pop49)
+	i32.load	$20=, gvol+72($pop49)
 	i32.const	$push48=, 0
-	i32.load	$23=, gvol+84($pop48)
+	i32.load	$21=, gvol+76($pop48)
 	i32.const	$push47=, 0
-	i32.load	$24=, gvol+88($pop47)
+	i32.load	$22=, gvol+80($pop47)
 	i32.const	$push46=, 0
-	i32.load	$25=, gvol+92($pop46)
+	i32.load	$23=, gvol+84($pop46)
 	i32.const	$push45=, 0
-	i32.load	$26=, gvol+96($pop45)
+	i32.load	$24=, gvol+88($pop45)
 	i32.const	$push44=, 0
-	i32.load	$27=, gvol+100($pop44)
+	i32.load	$25=, gvol+92($pop44)
 	i32.const	$push43=, 0
-	i32.load	$28=, gvol+104($pop43)
+	i32.load	$26=, gvol+96($pop43)
 	i32.const	$push42=, 0
-	i32.load	$29=, gvol+108($pop42)
+	i32.load	$27=, gvol+100($pop42)
 	i32.const	$push41=, 0
-	i32.load	$30=, gvol+112($pop41)
+	i32.load	$28=, gvol+104($pop41)
 	i32.const	$push40=, 0
-	i32.load	$31=, gvol+116($pop40)
+	i32.load	$29=, gvol+108($pop40)
 	i32.const	$push39=, 0
-	i32.load	$32=, gvol+120($pop39)
+	i32.load	$30=, gvol+112($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+4($pop38), $3
+	i32.load	$31=, gvol+116($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+8($pop37), $4
+	i32.load	$32=, gvol+120($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+12($pop36), $5
+	i32.store	gvol+4($pop36), $3
 	i32.const	$push35=, 0
-	i32.store	gvol+16($pop35), $6
+	i32.store	gvol+8($pop35), $4
 	i32.const	$push34=, 0
-	i32.store	gvol+20($pop34), $7
+	i32.store	gvol+12($pop34), $5
 	i32.const	$push33=, 0
-	i32.store	gvol+24($pop33), $8
+	i32.store	gvol+16($pop33), $6
 	i32.const	$push32=, 0
-	i32.store	gvol+28($pop32), $9
+	i32.store	gvol+20($pop32), $7
 	i32.const	$push31=, 0
-	i32.store	gvol+32($pop31), $10
+	i32.store	gvol+24($pop31), $8
 	i32.const	$push30=, 0
-	i32.store	gvol+36($pop30), $11
+	i32.store	gvol+28($pop30), $9
 	i32.const	$push29=, 0
-	i32.store	gvol+40($pop29), $12
+	i32.store	gvol+32($pop29), $10
 	i32.const	$push28=, 0
-	i32.store	gvol+44($pop28), $13
+	i32.store	gvol+36($pop28), $11
 	i32.const	$push27=, 0
-	i32.store	gvol+48($pop27), $14
+	i32.store	gvol+40($pop27), $12
 	i32.const	$push26=, 0
-	i32.store	gvol+52($pop26), $15
+	i32.store	gvol+44($pop26), $13
 	i32.const	$push25=, 0
-	i32.store	gvol+56($pop25), $16
+	i32.store	gvol+48($pop25), $14
 	i32.const	$push24=, 0
-	i32.store	gvol+60($pop24), $17
+	i32.store	gvol+52($pop24), $15
 	i32.const	$push23=, 0
-	i32.store	gvol+64($pop23), $18
+	i32.store	gvol+56($pop23), $16
 	i32.const	$push22=, 0
-	i32.store	gvol+68($pop22), $19
+	i32.store	gvol+60($pop22), $17
 	i32.const	$push21=, 0
-	i32.store	gvol+72($pop21), $20
+	i32.store	gvol+64($pop21), $18
 	i32.const	$push20=, 0
-	i32.store	gvol+76($pop20), $21
+	i32.store	gvol+68($pop20), $19
 	i32.const	$push19=, 0
-	i32.store	gvol+80($pop19), $22
+	i32.store	gvol+72($pop19), $20
 	i32.const	$push18=, 0
-	i32.store	gvol+84($pop18), $23
+	i32.store	gvol+76($pop18), $21
 	i32.const	$push17=, 0
-	i32.store	gvol+88($pop17), $24
+	i32.store	gvol+80($pop17), $22
 	i32.const	$push16=, 0
-	i32.store	gvol+92($pop16), $25
+	i32.store	gvol+84($pop16), $23
 	i32.const	$push15=, 0
-	i32.store	gvol+96($pop15), $26
+	i32.store	gvol+88($pop15), $24
 	i32.const	$push14=, 0
-	i32.store	gvol+100($pop14), $27
+	i32.store	gvol+92($pop14), $25
 	i32.const	$push13=, 0
-	i32.store	gvol+104($pop13), $28
+	i32.store	gvol+96($pop13), $26
 	i32.const	$push12=, 0
-	i32.store	gvol+108($pop12), $29
+	i32.store	gvol+100($pop12), $27
 	i32.const	$push11=, 0
-	i32.store	gvol+112($pop11), $30
+	i32.store	gvol+104($pop11), $28
 	i32.const	$push10=, 0
-	i32.store	gvol+116($pop10), $31
+	i32.store	gvol+108($pop10), $29
 	i32.const	$push9=, 0
-	i32.store	gvol+120($pop9), $32
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label1
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop9), $30
+	i32.const	$push8=, 0
+	i32.store	gvol+116($pop8), $31
+	i32.const	$push7=, 0
+	i32.store	gvol+120($pop7), $32
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label1
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push3=, -2048
 	i64.add 	$push4=, $1, $pop3
 	i64.sub 	$1=, $pop4, $2
 .LBB0_4:                                # %while.end
 	end_block                       # label0:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end0:
 	.size	t1, .Lfunc_end0-t1
@@ -166,152 +165,151 @@ t2:                                     # @t2
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label2
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label2
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push4=, -1
 	i32.add 	$push0=, $0, $pop4
 	i64.extend_u/i32	$2=, $pop0
 .LBB1_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push67=, 0
-	i32.load	$3=, gvol+4($pop67)
-	i32.const	$push66=, 0
-	i32.load	$4=, gvol+8($pop66)
 	i32.const	$push65=, 0
-	i32.load	$5=, gvol+12($pop65)
+	i32.load	$3=, gvol+4($pop65)
 	i32.const	$push64=, 0
-	i32.load	$6=, gvol+16($pop64)
+	i32.load	$4=, gvol+8($pop64)
 	i32.const	$push63=, 0
-	i32.load	$7=, gvol+20($pop63)
+	i32.load	$5=, gvol+12($pop63)
 	i32.const	$push62=, 0
-	i32.load	$8=, gvol+24($pop62)
+	i32.load	$6=, gvol+16($pop62)
 	i32.const	$push61=, 0
-	i32.load	$9=, gvol+28($pop61)
+	i32.load	$7=, gvol+20($pop61)
 	i32.const	$push60=, 0
-	i32.load	$10=, gvol+32($pop60)
+	i32.load	$8=, gvol+24($pop60)
 	i32.const	$push59=, 0
-	i32.load	$11=, gvol+36($pop59)
+	i32.load	$9=, gvol+28($pop59)
 	i32.const	$push58=, 0
-	i32.load	$12=, gvol+40($pop58)
+	i32.load	$10=, gvol+32($pop58)
 	i32.const	$push57=, 0
-	i32.load	$13=, gvol+44($pop57)
+	i32.load	$11=, gvol+36($pop57)
 	i32.const	$push56=, 0
-	i32.load	$14=, gvol+48($pop56)
+	i32.load	$12=, gvol+40($pop56)
 	i32.const	$push55=, 0
-	i32.load	$15=, gvol+52($pop55)
+	i32.load	$13=, gvol+44($pop55)
 	i32.const	$push54=, 0
-	i32.load	$16=, gvol+56($pop54)
+	i32.load	$14=, gvol+48($pop54)
 	i32.const	$push53=, 0
-	i32.load	$17=, gvol+60($pop53)
+	i32.load	$15=, gvol+52($pop53)
 	i32.const	$push52=, 0
-	i32.load	$18=, gvol+64($pop52)
+	i32.load	$16=, gvol+56($pop52)
 	i32.const	$push51=, 0
-	i32.load	$19=, gvol+68($pop51)
+	i32.load	$17=, gvol+60($pop51)
 	i32.const	$push50=, 0
-	i32.load	$20=, gvol+72($pop50)
+	i32.load	$18=, gvol+64($pop50)
 	i32.const	$push49=, 0
-	i32.load	$21=, gvol+76($pop49)
+	i32.load	$19=, gvol+68($pop49)
 	i32.const	$push48=, 0
-	i32.load	$22=, gvol+80($pop48)
+	i32.load	$20=, gvol+72($pop48)
 	i32.const	$push47=, 0
-	i32.load	$23=, gvol+84($pop47)
+	i32.load	$21=, gvol+76($pop47)
 	i32.const	$push46=, 0
-	i32.load	$24=, gvol+88($pop46)
+	i32.load	$22=, gvol+80($pop46)
 	i32.const	$push45=, 0
-	i32.load	$25=, gvol+92($pop45)
+	i32.load	$23=, gvol+84($pop45)
 	i32.const	$push44=, 0
-	i32.load	$26=, gvol+96($pop44)
+	i32.load	$24=, gvol+88($pop44)
 	i32.const	$push43=, 0
-	i32.load	$27=, gvol+100($pop43)
+	i32.load	$25=, gvol+92($pop43)
 	i32.const	$push42=, 0
-	i32.load	$28=, gvol+104($pop42)
+	i32.load	$26=, gvol+96($pop42)
 	i32.const	$push41=, 0
-	i32.load	$29=, gvol+108($pop41)
+	i32.load	$27=, gvol+100($pop41)
 	i32.const	$push40=, 0
-	i32.load	$30=, gvol+112($pop40)
+	i32.load	$28=, gvol+104($pop40)
 	i32.const	$push39=, 0
-	i32.load	$31=, gvol+116($pop39)
+	i32.load	$29=, gvol+108($pop39)
 	i32.const	$push38=, 0
-	i32.load	$32=, gvol+120($pop38)
+	i32.load	$30=, gvol+112($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+4($pop37), $3
+	i32.load	$31=, gvol+116($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+8($pop36), $4
+	i32.load	$32=, gvol+120($pop36)
 	i32.const	$push35=, 0
-	i32.store	gvol+12($pop35), $5
+	i32.store	gvol+4($pop35), $3
 	i32.const	$push34=, 0
-	i32.store	gvol+16($pop34), $6
+	i32.store	gvol+8($pop34), $4
 	i32.const	$push33=, 0
-	i32.store	gvol+20($pop33), $7
+	i32.store	gvol+12($pop33), $5
 	i32.const	$push32=, 0
-	i32.store	gvol+24($pop32), $8
+	i32.store	gvol+16($pop32), $6
 	i32.const	$push31=, 0
-	i32.store	gvol+28($pop31), $9
+	i32.store	gvol+20($pop31), $7
 	i32.const	$push30=, 0
-	i32.store	gvol+32($pop30), $10
+	i32.store	gvol+24($pop30), $8
 	i32.const	$push29=, 0
-	i32.store	gvol+36($pop29), $11
+	i32.store	gvol+28($pop29), $9
 	i32.const	$push28=, 0
-	i32.store	gvol+40($pop28), $12
+	i32.store	gvol+32($pop28), $10
 	i32.const	$push27=, 0
-	i32.store	gvol+44($pop27), $13
+	i32.store	gvol+36($pop27), $11
 	i32.const	$push26=, 0
-	i32.store	gvol+48($pop26), $14
+	i32.store	gvol+40($pop26), $12
 	i32.const	$push25=, 0
-	i32.store	gvol+52($pop25), $15
+	i32.store	gvol+44($pop25), $13
 	i32.const	$push24=, 0
-	i32.store	gvol+56($pop24), $16
+	i32.store	gvol+48($pop24), $14
 	i32.const	$push23=, 0
-	i32.store	gvol+60($pop23), $17
+	i32.store	gvol+52($pop23), $15
 	i32.const	$push22=, 0
-	i32.store	gvol+64($pop22), $18
+	i32.store	gvol+56($pop22), $16
 	i32.const	$push21=, 0
-	i32.store	gvol+68($pop21), $19
+	i32.store	gvol+60($pop21), $17
 	i32.const	$push20=, 0
-	i32.store	gvol+72($pop20), $20
+	i32.store	gvol+64($pop20), $18
 	i32.const	$push19=, 0
-	i32.store	gvol+76($pop19), $21
+	i32.store	gvol+68($pop19), $19
 	i32.const	$push18=, 0
-	i32.store	gvol+80($pop18), $22
+	i32.store	gvol+72($pop18), $20
 	i32.const	$push17=, 0
-	i32.store	gvol+84($pop17), $23
+	i32.store	gvol+76($pop17), $21
 	i32.const	$push16=, 0
-	i32.store	gvol+88($pop16), $24
+	i32.store	gvol+80($pop16), $22
 	i32.const	$push15=, 0
-	i32.store	gvol+92($pop15), $25
+	i32.store	gvol+84($pop15), $23
 	i32.const	$push14=, 0
-	i32.store	gvol+96($pop14), $26
+	i32.store	gvol+88($pop14), $24
 	i32.const	$push13=, 0
-	i32.store	gvol+100($pop13), $27
+	i32.store	gvol+92($pop13), $25
 	i32.const	$push12=, 0
-	i32.store	gvol+104($pop12), $28
+	i32.store	gvol+96($pop12), $26
 	i32.const	$push11=, 0
-	i32.store	gvol+108($pop11), $29
+	i32.store	gvol+100($pop11), $27
 	i32.const	$push10=, 0
-	i32.store	gvol+112($pop10), $30
+	i32.store	gvol+104($pop10), $28
 	i32.const	$push9=, 0
-	i32.store	gvol+116($pop9), $31
+	i32.store	gvol+108($pop9), $29
 	i32.const	$push8=, 0
-	i32.store	gvol+120($pop8), $32
-	i32.const	$push7=, -1
-	i32.add 	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	br_if   	0, $pop5        # 0: up to label3
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop8), $30
+	i32.const	$push7=, 0
+	i32.store	gvol+116($pop7), $31
+	i32.const	$push6=, 0
+	i32.store	gvol+120($pop6), $32
+	i32.const	$push5=, -1
+	i32.add 	$0=, $0, $pop5
+	br_if   	0, $0           # 0: up to label3
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push1=, -513
 	i64.mul 	$push2=, $2, $pop1
 	i64.add 	$push3=, $1, $pop2
-	i64.const	$push68=, -513
-	i64.add 	$1=, $pop3, $pop68
+	i64.const	$push66=, -513
+	i64.add 	$1=, $pop3, $pop66
 .LBB1_4:                                # %while.end
 	end_block                       # label2:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end1:
 	.size	t2, .Lfunc_end1-t2
@@ -324,11 +322,11 @@ t3:                                     # @t3
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label4
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label4
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -337,139 +335,138 @@ t3:                                     # @t3
 .LBB2_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.const	$push68=, 0
-	i32.load	$3=, gvol+4($pop68)
-	i32.const	$push67=, 0
-	i32.load	$4=, gvol+8($pop67)
 	i32.const	$push66=, 0
-	i32.load	$5=, gvol+12($pop66)
+	i32.load	$3=, gvol+4($pop66)
 	i32.const	$push65=, 0
-	i32.load	$6=, gvol+16($pop65)
+	i32.load	$4=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$7=, gvol+20($pop64)
+	i32.load	$5=, gvol+12($pop64)
 	i32.const	$push63=, 0
-	i32.load	$8=, gvol+24($pop63)
+	i32.load	$6=, gvol+16($pop63)
 	i32.const	$push62=, 0
-	i32.load	$9=, gvol+28($pop62)
+	i32.load	$7=, gvol+20($pop62)
 	i32.const	$push61=, 0
-	i32.load	$10=, gvol+32($pop61)
+	i32.load	$8=, gvol+24($pop61)
 	i32.const	$push60=, 0
-	i32.load	$11=, gvol+36($pop60)
+	i32.load	$9=, gvol+28($pop60)
 	i32.const	$push59=, 0
-	i32.load	$12=, gvol+40($pop59)
+	i32.load	$10=, gvol+32($pop59)
 	i32.const	$push58=, 0
-	i32.load	$13=, gvol+44($pop58)
+	i32.load	$11=, gvol+36($pop58)
 	i32.const	$push57=, 0
-	i32.load	$14=, gvol+48($pop57)
+	i32.load	$12=, gvol+40($pop57)
 	i32.const	$push56=, 0
-	i32.load	$15=, gvol+52($pop56)
+	i32.load	$13=, gvol+44($pop56)
 	i32.const	$push55=, 0
-	i32.load	$16=, gvol+56($pop55)
+	i32.load	$14=, gvol+48($pop55)
 	i32.const	$push54=, 0
-	i32.load	$17=, gvol+60($pop54)
+	i32.load	$15=, gvol+52($pop54)
 	i32.const	$push53=, 0
-	i32.load	$18=, gvol+64($pop53)
+	i32.load	$16=, gvol+56($pop53)
 	i32.const	$push52=, 0
-	i32.load	$19=, gvol+68($pop52)
+	i32.load	$17=, gvol+60($pop52)
 	i32.const	$push51=, 0
-	i32.load	$20=, gvol+72($pop51)
+	i32.load	$18=, gvol+64($pop51)
 	i32.const	$push50=, 0
-	i32.load	$21=, gvol+76($pop50)
+	i32.load	$19=, gvol+68($pop50)
 	i32.const	$push49=, 0
-	i32.load	$22=, gvol+80($pop49)
+	i32.load	$20=, gvol+72($pop49)
 	i32.const	$push48=, 0
-	i32.load	$23=, gvol+84($pop48)
+	i32.load	$21=, gvol+76($pop48)
 	i32.const	$push47=, 0
-	i32.load	$24=, gvol+88($pop47)
+	i32.load	$22=, gvol+80($pop47)
 	i32.const	$push46=, 0
-	i32.load	$25=, gvol+92($pop46)
+	i32.load	$23=, gvol+84($pop46)
 	i32.const	$push45=, 0
-	i32.load	$26=, gvol+96($pop45)
+	i32.load	$24=, gvol+88($pop45)
 	i32.const	$push44=, 0
-	i32.load	$27=, gvol+100($pop44)
+	i32.load	$25=, gvol+92($pop44)
 	i32.const	$push43=, 0
-	i32.load	$28=, gvol+104($pop43)
+	i32.load	$26=, gvol+96($pop43)
 	i32.const	$push42=, 0
-	i32.load	$29=, gvol+108($pop42)
+	i32.load	$27=, gvol+100($pop42)
 	i32.const	$push41=, 0
-	i32.load	$30=, gvol+112($pop41)
+	i32.load	$28=, gvol+104($pop41)
 	i32.const	$push40=, 0
-	i32.load	$31=, gvol+116($pop40)
+	i32.load	$29=, gvol+108($pop40)
 	i32.const	$push39=, 0
-	i32.load	$32=, gvol+120($pop39)
+	i32.load	$30=, gvol+112($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+4($pop38), $3
+	i32.load	$31=, gvol+116($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+8($pop37), $4
+	i32.load	$32=, gvol+120($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+12($pop36), $5
+	i32.store	gvol+4($pop36), $3
 	i32.const	$push35=, 0
-	i32.store	gvol+16($pop35), $6
+	i32.store	gvol+8($pop35), $4
 	i32.const	$push34=, 0
-	i32.store	gvol+20($pop34), $7
+	i32.store	gvol+12($pop34), $5
 	i32.const	$push33=, 0
-	i32.store	gvol+24($pop33), $8
+	i32.store	gvol+16($pop33), $6
 	i32.const	$push32=, 0
-	i32.store	gvol+28($pop32), $9
+	i32.store	gvol+20($pop32), $7
 	i32.const	$push31=, 0
-	i32.store	gvol+32($pop31), $10
+	i32.store	gvol+24($pop31), $8
 	i32.const	$push30=, 0
-	i32.store	gvol+36($pop30), $11
+	i32.store	gvol+28($pop30), $9
 	i32.const	$push29=, 0
-	i32.store	gvol+40($pop29), $12
+	i32.store	gvol+32($pop29), $10
 	i32.const	$push28=, 0
-	i32.store	gvol+44($pop28), $13
+	i32.store	gvol+36($pop28), $11
 	i32.const	$push27=, 0
-	i32.store	gvol+48($pop27), $14
+	i32.store	gvol+40($pop27), $12
 	i32.const	$push26=, 0
-	i32.store	gvol+52($pop26), $15
+	i32.store	gvol+44($pop26), $13
 	i32.const	$push25=, 0
-	i32.store	gvol+56($pop25), $16
+	i32.store	gvol+48($pop25), $14
 	i32.const	$push24=, 0
-	i32.store	gvol+60($pop24), $17
+	i32.store	gvol+52($pop24), $15
 	i32.const	$push23=, 0
-	i32.store	gvol+64($pop23), $18
+	i32.store	gvol+56($pop23), $16
 	i32.const	$push22=, 0
-	i32.store	gvol+68($pop22), $19
+	i32.store	gvol+60($pop22), $17
 	i32.const	$push21=, 0
-	i32.store	gvol+72($pop21), $20
+	i32.store	gvol+64($pop21), $18
 	i32.const	$push20=, 0
-	i32.store	gvol+76($pop20), $21
+	i32.store	gvol+68($pop20), $19
 	i32.const	$push19=, 0
-	i32.store	gvol+80($pop19), $22
+	i32.store	gvol+72($pop19), $20
 	i32.const	$push18=, 0
-	i32.store	gvol+84($pop18), $23
+	i32.store	gvol+76($pop18), $21
 	i32.const	$push17=, 0
-	i32.store	gvol+88($pop17), $24
+	i32.store	gvol+80($pop17), $22
 	i32.const	$push16=, 0
-	i32.store	gvol+92($pop16), $25
+	i32.store	gvol+84($pop16), $23
 	i32.const	$push15=, 0
-	i32.store	gvol+96($pop15), $26
+	i32.store	gvol+88($pop15), $24
 	i32.const	$push14=, 0
-	i32.store	gvol+100($pop14), $27
+	i32.store	gvol+92($pop14), $25
 	i32.const	$push13=, 0
-	i32.store	gvol+104($pop13), $28
+	i32.store	gvol+96($pop13), $26
 	i32.const	$push12=, 0
-	i32.store	gvol+108($pop12), $29
+	i32.store	gvol+100($pop12), $27
 	i32.const	$push11=, 0
-	i32.store	gvol+112($pop11), $30
+	i32.store	gvol+104($pop11), $28
 	i32.const	$push10=, 0
-	i32.store	gvol+116($pop10), $31
+	i32.store	gvol+108($pop10), $29
 	i32.const	$push9=, 0
-	i32.store	gvol+120($pop9), $32
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label5
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop9), $30
+	i32.const	$push8=, 0
+	i32.store	gvol+116($pop8), $31
+	i32.const	$push7=, 0
+	i32.store	gvol+120($pop7), $32
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label5
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push3=, -512
 	i64.add 	$push4=, $1, $pop3
 	i64.sub 	$1=, $pop4, $2
 .LBB2_4:                                # %while.end
 	end_block                       # label4:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end2:
 	.size	t3, .Lfunc_end2-t3
@@ -482,152 +479,151 @@ t4:                                     # @t4
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label6
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label6
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push4=, -1
 	i32.add 	$push0=, $0, $pop4
 	i64.extend_u/i32	$2=, $pop0
 .LBB3_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.const	$push67=, 0
-	i32.load	$3=, gvol+4($pop67)
-	i32.const	$push66=, 0
-	i32.load	$4=, gvol+8($pop66)
 	i32.const	$push65=, 0
-	i32.load	$5=, gvol+12($pop65)
+	i32.load	$3=, gvol+4($pop65)
 	i32.const	$push64=, 0
-	i32.load	$6=, gvol+16($pop64)
+	i32.load	$4=, gvol+8($pop64)
 	i32.const	$push63=, 0
-	i32.load	$7=, gvol+20($pop63)
+	i32.load	$5=, gvol+12($pop63)
 	i32.const	$push62=, 0
-	i32.load	$8=, gvol+24($pop62)
+	i32.load	$6=, gvol+16($pop62)
 	i32.const	$push61=, 0
-	i32.load	$9=, gvol+28($pop61)
+	i32.load	$7=, gvol+20($pop61)
 	i32.const	$push60=, 0
-	i32.load	$10=, gvol+32($pop60)
+	i32.load	$8=, gvol+24($pop60)
 	i32.const	$push59=, 0
-	i32.load	$11=, gvol+36($pop59)
+	i32.load	$9=, gvol+28($pop59)
 	i32.const	$push58=, 0
-	i32.load	$12=, gvol+40($pop58)
+	i32.load	$10=, gvol+32($pop58)
 	i32.const	$push57=, 0
-	i32.load	$13=, gvol+44($pop57)
+	i32.load	$11=, gvol+36($pop57)
 	i32.const	$push56=, 0
-	i32.load	$14=, gvol+48($pop56)
+	i32.load	$12=, gvol+40($pop56)
 	i32.const	$push55=, 0
-	i32.load	$15=, gvol+52($pop55)
+	i32.load	$13=, gvol+44($pop55)
 	i32.const	$push54=, 0
-	i32.load	$16=, gvol+56($pop54)
+	i32.load	$14=, gvol+48($pop54)
 	i32.const	$push53=, 0
-	i32.load	$17=, gvol+60($pop53)
+	i32.load	$15=, gvol+52($pop53)
 	i32.const	$push52=, 0
-	i32.load	$18=, gvol+64($pop52)
+	i32.load	$16=, gvol+56($pop52)
 	i32.const	$push51=, 0
-	i32.load	$19=, gvol+68($pop51)
+	i32.load	$17=, gvol+60($pop51)
 	i32.const	$push50=, 0
-	i32.load	$20=, gvol+72($pop50)
+	i32.load	$18=, gvol+64($pop50)
 	i32.const	$push49=, 0
-	i32.load	$21=, gvol+76($pop49)
+	i32.load	$19=, gvol+68($pop49)
 	i32.const	$push48=, 0
-	i32.load	$22=, gvol+80($pop48)
+	i32.load	$20=, gvol+72($pop48)
 	i32.const	$push47=, 0
-	i32.load	$23=, gvol+84($pop47)
+	i32.load	$21=, gvol+76($pop47)
 	i32.const	$push46=, 0
-	i32.load	$24=, gvol+88($pop46)
+	i32.load	$22=, gvol+80($pop46)
 	i32.const	$push45=, 0
-	i32.load	$25=, gvol+92($pop45)
+	i32.load	$23=, gvol+84($pop45)
 	i32.const	$push44=, 0
-	i32.load	$26=, gvol+96($pop44)
+	i32.load	$24=, gvol+88($pop44)
 	i32.const	$push43=, 0
-	i32.load	$27=, gvol+100($pop43)
+	i32.load	$25=, gvol+92($pop43)
 	i32.const	$push42=, 0
-	i32.load	$28=, gvol+104($pop42)
+	i32.load	$26=, gvol+96($pop42)
 	i32.const	$push41=, 0
-	i32.load	$29=, gvol+108($pop41)
+	i32.load	$27=, gvol+100($pop41)
 	i32.const	$push40=, 0
-	i32.load	$30=, gvol+112($pop40)
+	i32.load	$28=, gvol+104($pop40)
 	i32.const	$push39=, 0
-	i32.load	$31=, gvol+116($pop39)
+	i32.load	$29=, gvol+108($pop39)
 	i32.const	$push38=, 0
-	i32.load	$32=, gvol+120($pop38)
+	i32.load	$30=, gvol+112($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+4($pop37), $3
+	i32.load	$31=, gvol+116($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+8($pop36), $4
+	i32.load	$32=, gvol+120($pop36)
 	i32.const	$push35=, 0
-	i32.store	gvol+12($pop35), $5
+	i32.store	gvol+4($pop35), $3
 	i32.const	$push34=, 0
-	i32.store	gvol+16($pop34), $6
+	i32.store	gvol+8($pop34), $4
 	i32.const	$push33=, 0
-	i32.store	gvol+20($pop33), $7
+	i32.store	gvol+12($pop33), $5
 	i32.const	$push32=, 0
-	i32.store	gvol+24($pop32), $8
+	i32.store	gvol+16($pop32), $6
 	i32.const	$push31=, 0
-	i32.store	gvol+28($pop31), $9
+	i32.store	gvol+20($pop31), $7
 	i32.const	$push30=, 0
-	i32.store	gvol+32($pop30), $10
+	i32.store	gvol+24($pop30), $8
 	i32.const	$push29=, 0
-	i32.store	gvol+36($pop29), $11
+	i32.store	gvol+28($pop29), $9
 	i32.const	$push28=, 0
-	i32.store	gvol+40($pop28), $12
+	i32.store	gvol+32($pop28), $10
 	i32.const	$push27=, 0
-	i32.store	gvol+44($pop27), $13
+	i32.store	gvol+36($pop27), $11
 	i32.const	$push26=, 0
-	i32.store	gvol+48($pop26), $14
+	i32.store	gvol+40($pop26), $12
 	i32.const	$push25=, 0
-	i32.store	gvol+52($pop25), $15
+	i32.store	gvol+44($pop25), $13
 	i32.const	$push24=, 0
-	i32.store	gvol+56($pop24), $16
+	i32.store	gvol+48($pop24), $14
 	i32.const	$push23=, 0
-	i32.store	gvol+60($pop23), $17
+	i32.store	gvol+52($pop23), $15
 	i32.const	$push22=, 0
-	i32.store	gvol+64($pop22), $18
+	i32.store	gvol+56($pop22), $16
 	i32.const	$push21=, 0
-	i32.store	gvol+68($pop21), $19
+	i32.store	gvol+60($pop21), $17
 	i32.const	$push20=, 0
-	i32.store	gvol+72($pop20), $20
+	i32.store	gvol+64($pop20), $18
 	i32.const	$push19=, 0
-	i32.store	gvol+76($pop19), $21
+	i32.store	gvol+68($pop19), $19
 	i32.const	$push18=, 0
-	i32.store	gvol+80($pop18), $22
+	i32.store	gvol+72($pop18), $20
 	i32.const	$push17=, 0
-	i32.store	gvol+84($pop17), $23
+	i32.store	gvol+76($pop17), $21
 	i32.const	$push16=, 0
-	i32.store	gvol+88($pop16), $24
+	i32.store	gvol+80($pop16), $22
 	i32.const	$push15=, 0
-	i32.store	gvol+92($pop15), $25
+	i32.store	gvol+84($pop15), $23
 	i32.const	$push14=, 0
-	i32.store	gvol+96($pop14), $26
+	i32.store	gvol+88($pop14), $24
 	i32.const	$push13=, 0
-	i32.store	gvol+100($pop13), $27
+	i32.store	gvol+92($pop13), $25
 	i32.const	$push12=, 0
-	i32.store	gvol+104($pop12), $28
+	i32.store	gvol+96($pop12), $26
 	i32.const	$push11=, 0
-	i32.store	gvol+108($pop11), $29
+	i32.store	gvol+100($pop11), $27
 	i32.const	$push10=, 0
-	i32.store	gvol+112($pop10), $30
+	i32.store	gvol+104($pop10), $28
 	i32.const	$push9=, 0
-	i32.store	gvol+116($pop9), $31
+	i32.store	gvol+108($pop9), $29
 	i32.const	$push8=, 0
-	i32.store	gvol+120($pop8), $32
-	i32.const	$push7=, -1
-	i32.add 	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	br_if   	0, $pop5        # 0: up to label7
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop8), $30
+	i32.const	$push7=, 0
+	i32.store	gvol+116($pop7), $31
+	i32.const	$push6=, 0
+	i32.store	gvol+120($pop6), $32
+	i32.const	$push5=, -1
+	i32.add 	$0=, $0, $pop5
+	br_if   	0, $0           # 0: up to label7
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push1=, -511
 	i64.mul 	$push2=, $2, $pop1
 	i64.add 	$push3=, $1, $pop2
-	i64.const	$push68=, -511
-	i64.add 	$1=, $pop3, $pop68
+	i64.const	$push66=, -511
+	i64.add 	$1=, $pop3, $pop66
 .LBB3_4:                                # %while.end
 	end_block                       # label6:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end3:
 	.size	t4, .Lfunc_end3-t4
@@ -640,150 +636,149 @@ t5:                                     # @t5
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push67=, $0
-	br_if   	0, $pop67       # 0: down to label8
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push65=, $0
+	br_if   	0, $pop65       # 0: down to label8
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push3=, -1
 	i32.add 	$push0=, $0, $pop3
 	i64.extend_u/i32	$2=, $pop0
 .LBB4_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.const	$push66=, 0
-	i32.load	$3=, gvol+4($pop66)
-	i32.const	$push65=, 0
-	i32.load	$4=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$5=, gvol+12($pop64)
+	i32.load	$3=, gvol+4($pop64)
 	i32.const	$push63=, 0
-	i32.load	$6=, gvol+16($pop63)
+	i32.load	$4=, gvol+8($pop63)
 	i32.const	$push62=, 0
-	i32.load	$7=, gvol+20($pop62)
+	i32.load	$5=, gvol+12($pop62)
 	i32.const	$push61=, 0
-	i32.load	$8=, gvol+24($pop61)
+	i32.load	$6=, gvol+16($pop61)
 	i32.const	$push60=, 0
-	i32.load	$9=, gvol+28($pop60)
+	i32.load	$7=, gvol+20($pop60)
 	i32.const	$push59=, 0
-	i32.load	$10=, gvol+32($pop59)
+	i32.load	$8=, gvol+24($pop59)
 	i32.const	$push58=, 0
-	i32.load	$11=, gvol+36($pop58)
+	i32.load	$9=, gvol+28($pop58)
 	i32.const	$push57=, 0
-	i32.load	$12=, gvol+40($pop57)
+	i32.load	$10=, gvol+32($pop57)
 	i32.const	$push56=, 0
-	i32.load	$13=, gvol+44($pop56)
+	i32.load	$11=, gvol+36($pop56)
 	i32.const	$push55=, 0
-	i32.load	$14=, gvol+48($pop55)
+	i32.load	$12=, gvol+40($pop55)
 	i32.const	$push54=, 0
-	i32.load	$15=, gvol+52($pop54)
+	i32.load	$13=, gvol+44($pop54)
 	i32.const	$push53=, 0
-	i32.load	$16=, gvol+56($pop53)
+	i32.load	$14=, gvol+48($pop53)
 	i32.const	$push52=, 0
-	i32.load	$17=, gvol+60($pop52)
+	i32.load	$15=, gvol+52($pop52)
 	i32.const	$push51=, 0
-	i32.load	$18=, gvol+64($pop51)
+	i32.load	$16=, gvol+56($pop51)
 	i32.const	$push50=, 0
-	i32.load	$19=, gvol+68($pop50)
+	i32.load	$17=, gvol+60($pop50)
 	i32.const	$push49=, 0
-	i32.load	$20=, gvol+72($pop49)
+	i32.load	$18=, gvol+64($pop49)
 	i32.const	$push48=, 0
-	i32.load	$21=, gvol+76($pop48)
+	i32.load	$19=, gvol+68($pop48)
 	i32.const	$push47=, 0
-	i32.load	$22=, gvol+80($pop47)
+	i32.load	$20=, gvol+72($pop47)
 	i32.const	$push46=, 0
-	i32.load	$23=, gvol+84($pop46)
+	i32.load	$21=, gvol+76($pop46)
 	i32.const	$push45=, 0
-	i32.load	$24=, gvol+88($pop45)
+	i32.load	$22=, gvol+80($pop45)
 	i32.const	$push44=, 0
-	i32.load	$25=, gvol+92($pop44)
+	i32.load	$23=, gvol+84($pop44)
 	i32.const	$push43=, 0
-	i32.load	$26=, gvol+96($pop43)
+	i32.load	$24=, gvol+88($pop43)
 	i32.const	$push42=, 0
-	i32.load	$27=, gvol+100($pop42)
+	i32.load	$25=, gvol+92($pop42)
 	i32.const	$push41=, 0
-	i32.load	$28=, gvol+104($pop41)
+	i32.load	$26=, gvol+96($pop41)
 	i32.const	$push40=, 0
-	i32.load	$29=, gvol+108($pop40)
+	i32.load	$27=, gvol+100($pop40)
 	i32.const	$push39=, 0
-	i32.load	$30=, gvol+112($pop39)
+	i32.load	$28=, gvol+104($pop39)
 	i32.const	$push38=, 0
-	i32.load	$31=, gvol+116($pop38)
+	i32.load	$29=, gvol+108($pop38)
 	i32.const	$push37=, 0
-	i32.load	$32=, gvol+120($pop37)
+	i32.load	$30=, gvol+112($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+4($pop36), $3
+	i32.load	$31=, gvol+116($pop36)
 	i32.const	$push35=, 0
-	i32.store	gvol+8($pop35), $4
+	i32.load	$32=, gvol+120($pop35)
 	i32.const	$push34=, 0
-	i32.store	gvol+12($pop34), $5
+	i32.store	gvol+4($pop34), $3
 	i32.const	$push33=, 0
-	i32.store	gvol+16($pop33), $6
+	i32.store	gvol+8($pop33), $4
 	i32.const	$push32=, 0
-	i32.store	gvol+20($pop32), $7
+	i32.store	gvol+12($pop32), $5
 	i32.const	$push31=, 0
-	i32.store	gvol+24($pop31), $8
+	i32.store	gvol+16($pop31), $6
 	i32.const	$push30=, 0
-	i32.store	gvol+28($pop30), $9
+	i32.store	gvol+20($pop30), $7
 	i32.const	$push29=, 0
-	i32.store	gvol+32($pop29), $10
+	i32.store	gvol+24($pop29), $8
 	i32.const	$push28=, 0
-	i32.store	gvol+36($pop28), $11
+	i32.store	gvol+28($pop28), $9
 	i32.const	$push27=, 0
-	i32.store	gvol+40($pop27), $12
+	i32.store	gvol+32($pop27), $10
 	i32.const	$push26=, 0
-	i32.store	gvol+44($pop26), $13
+	i32.store	gvol+36($pop26), $11
 	i32.const	$push25=, 0
-	i32.store	gvol+48($pop25), $14
+	i32.store	gvol+40($pop25), $12
 	i32.const	$push24=, 0
-	i32.store	gvol+52($pop24), $15
+	i32.store	gvol+44($pop24), $13
 	i32.const	$push23=, 0
-	i32.store	gvol+56($pop23), $16
+	i32.store	gvol+48($pop23), $14
 	i32.const	$push22=, 0
-	i32.store	gvol+60($pop22), $17
+	i32.store	gvol+52($pop22), $15
 	i32.const	$push21=, 0
-	i32.store	gvol+64($pop21), $18
+	i32.store	gvol+56($pop21), $16
 	i32.const	$push20=, 0
-	i32.store	gvol+68($pop20), $19
+	i32.store	gvol+60($pop20), $17
 	i32.const	$push19=, 0
-	i32.store	gvol+72($pop19), $20
+	i32.store	gvol+64($pop19), $18
 	i32.const	$push18=, 0
-	i32.store	gvol+76($pop18), $21
+	i32.store	gvol+68($pop18), $19
 	i32.const	$push17=, 0
-	i32.store	gvol+80($pop17), $22
+	i32.store	gvol+72($pop17), $20
 	i32.const	$push16=, 0
-	i32.store	gvol+84($pop16), $23
+	i32.store	gvol+76($pop16), $21
 	i32.const	$push15=, 0
-	i32.store	gvol+88($pop15), $24
+	i32.store	gvol+80($pop15), $22
 	i32.const	$push14=, 0
-	i32.store	gvol+92($pop14), $25
+	i32.store	gvol+84($pop14), $23
 	i32.const	$push13=, 0
-	i32.store	gvol+96($pop13), $26
+	i32.store	gvol+88($pop13), $24
 	i32.const	$push12=, 0
-	i32.store	gvol+100($pop12), $27
+	i32.store	gvol+92($pop12), $25
 	i32.const	$push11=, 0
-	i32.store	gvol+104($pop11), $28
+	i32.store	gvol+96($pop11), $26
 	i32.const	$push10=, 0
-	i32.store	gvol+108($pop10), $29
+	i32.store	gvol+100($pop10), $27
 	i32.const	$push9=, 0
-	i32.store	gvol+112($pop9), $30
+	i32.store	gvol+104($pop9), $28
 	i32.const	$push8=, 0
-	i32.store	gvol+116($pop8), $31
+	i32.store	gvol+108($pop8), $29
 	i32.const	$push7=, 0
-	i32.store	gvol+120($pop7), $32
-	i32.const	$push6=, -1
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label9
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop7), $30
+	i32.const	$push6=, 0
+	i32.store	gvol+116($pop6), $31
+	i32.const	$push5=, 0
+	i32.store	gvol+120($pop5), $32
+	i32.const	$push4=, -1
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label9
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push1=, -1
 	i64.add 	$push2=, $1, $pop1
 	i64.sub 	$1=, $pop2, $2
 .LBB4_4:                                # %while.end
 	end_block                       # label8:
-	copy_local	$push68=, $1
-                                        # fallthrough-return: $pop68
+	copy_local	$push66=, $1
+                                        # fallthrough-return: $pop66
 	.endfunc
 .Lfunc_end4:
 	.size	t5, .Lfunc_end4-t5
@@ -796,11 +791,11 @@ t6:                                     # @t6
 	.param  	i32, i64
 	.result 	i64
 	.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
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push67=, $0
-	br_if   	0, $pop67       # 0: down to label10
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push65=, $0
+	br_if   	0, $pop65       # 0: down to label10
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push3=, -1
 	i32.add 	$push0=, $0, $pop3
 	i64.extend_u/i32	$push1=, $pop0
@@ -808,138 +803,137 @@ t6:                                     # @t6
 .LBB5_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label11:
-	i32.const	$push66=, 0
-	i32.load	$2=, gvol+4($pop66)
-	i32.const	$push65=, 0
-	i32.load	$3=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$4=, gvol+12($pop64)
+	i32.load	$2=, gvol+4($pop64)
 	i32.const	$push63=, 0
-	i32.load	$5=, gvol+16($pop63)
+	i32.load	$3=, gvol+8($pop63)
 	i32.const	$push62=, 0
-	i32.load	$6=, gvol+20($pop62)
+	i32.load	$4=, gvol+12($pop62)
 	i32.const	$push61=, 0
-	i32.load	$7=, gvol+24($pop61)
+	i32.load	$5=, gvol+16($pop61)
 	i32.const	$push60=, 0
-	i32.load	$8=, gvol+28($pop60)
+	i32.load	$6=, gvol+20($pop60)
 	i32.const	$push59=, 0
-	i32.load	$9=, gvol+32($pop59)
+	i32.load	$7=, gvol+24($pop59)
 	i32.const	$push58=, 0
-	i32.load	$10=, gvol+36($pop58)
+	i32.load	$8=, gvol+28($pop58)
 	i32.const	$push57=, 0
-	i32.load	$11=, gvol+40($pop57)
+	i32.load	$9=, gvol+32($pop57)
 	i32.const	$push56=, 0
-	i32.load	$12=, gvol+44($pop56)
+	i32.load	$10=, gvol+36($pop56)
 	i32.const	$push55=, 0
-	i32.load	$13=, gvol+48($pop55)
+	i32.load	$11=, gvol+40($pop55)
 	i32.const	$push54=, 0
-	i32.load	$14=, gvol+52($pop54)
+	i32.load	$12=, gvol+44($pop54)
 	i32.const	$push53=, 0
-	i32.load	$15=, gvol+56($pop53)
+	i32.load	$13=, gvol+48($pop53)
 	i32.const	$push52=, 0
-	i32.load	$16=, gvol+60($pop52)
+	i32.load	$14=, gvol+52($pop52)
 	i32.const	$push51=, 0
-	i32.load	$17=, gvol+64($pop51)
+	i32.load	$15=, gvol+56($pop51)
 	i32.const	$push50=, 0
-	i32.load	$18=, gvol+68($pop50)
+	i32.load	$16=, gvol+60($pop50)
 	i32.const	$push49=, 0
-	i32.load	$19=, gvol+72($pop49)
+	i32.load	$17=, gvol+64($pop49)
 	i32.const	$push48=, 0
-	i32.load	$20=, gvol+76($pop48)
+	i32.load	$18=, gvol+68($pop48)
 	i32.const	$push47=, 0
-	i32.load	$21=, gvol+80($pop47)
+	i32.load	$19=, gvol+72($pop47)
 	i32.const	$push46=, 0
-	i32.load	$22=, gvol+84($pop46)
+	i32.load	$20=, gvol+76($pop46)
 	i32.const	$push45=, 0
-	i32.load	$23=, gvol+88($pop45)
+	i32.load	$21=, gvol+80($pop45)
 	i32.const	$push44=, 0
-	i32.load	$24=, gvol+92($pop44)
+	i32.load	$22=, gvol+84($pop44)
 	i32.const	$push43=, 0
-	i32.load	$25=, gvol+96($pop43)
+	i32.load	$23=, gvol+88($pop43)
 	i32.const	$push42=, 0
-	i32.load	$26=, gvol+100($pop42)
+	i32.load	$24=, gvol+92($pop42)
 	i32.const	$push41=, 0
-	i32.load	$27=, gvol+104($pop41)
+	i32.load	$25=, gvol+96($pop41)
 	i32.const	$push40=, 0
-	i32.load	$28=, gvol+108($pop40)
+	i32.load	$26=, gvol+100($pop40)
 	i32.const	$push39=, 0
-	i32.load	$29=, gvol+112($pop39)
+	i32.load	$27=, gvol+104($pop39)
 	i32.const	$push38=, 0
-	i32.load	$30=, gvol+116($pop38)
+	i32.load	$28=, gvol+108($pop38)
 	i32.const	$push37=, 0
-	i32.load	$31=, gvol+120($pop37)
+	i32.load	$29=, gvol+112($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+4($pop36), $2
+	i32.load	$30=, gvol+116($pop36)
 	i32.const	$push35=, 0
-	i32.store	gvol+8($pop35), $3
+	i32.load	$31=, gvol+120($pop35)
 	i32.const	$push34=, 0
-	i32.store	gvol+12($pop34), $4
+	i32.store	gvol+4($pop34), $2
 	i32.const	$push33=, 0
-	i32.store	gvol+16($pop33), $5
+	i32.store	gvol+8($pop33), $3
 	i32.const	$push32=, 0
-	i32.store	gvol+20($pop32), $6
+	i32.store	gvol+12($pop32), $4
 	i32.const	$push31=, 0
-	i32.store	gvol+24($pop31), $7
+	i32.store	gvol+16($pop31), $5
 	i32.const	$push30=, 0
-	i32.store	gvol+28($pop30), $8
+	i32.store	gvol+20($pop30), $6
 	i32.const	$push29=, 0
-	i32.store	gvol+32($pop29), $9
+	i32.store	gvol+24($pop29), $7
 	i32.const	$push28=, 0
-	i32.store	gvol+36($pop28), $10
+	i32.store	gvol+28($pop28), $8
 	i32.const	$push27=, 0
-	i32.store	gvol+40($pop27), $11
+	i32.store	gvol+32($pop27), $9
 	i32.const	$push26=, 0
-	i32.store	gvol+44($pop26), $12
+	i32.store	gvol+36($pop26), $10
 	i32.const	$push25=, 0
-	i32.store	gvol+48($pop25), $13
+	i32.store	gvol+40($pop25), $11
 	i32.const	$push24=, 0
-	i32.store	gvol+52($pop24), $14
+	i32.store	gvol+44($pop24), $12
 	i32.const	$push23=, 0
-	i32.store	gvol+56($pop23), $15
+	i32.store	gvol+48($pop23), $13
 	i32.const	$push22=, 0
-	i32.store	gvol+60($pop22), $16
+	i32.store	gvol+52($pop22), $14
 	i32.const	$push21=, 0
-	i32.store	gvol+64($pop21), $17
+	i32.store	gvol+56($pop21), $15
 	i32.const	$push20=, 0
-	i32.store	gvol+68($pop20), $18
+	i32.store	gvol+60($pop20), $16
 	i32.const	$push19=, 0
-	i32.store	gvol+72($pop19), $19
+	i32.store	gvol+64($pop19), $17
 	i32.const	$push18=, 0
-	i32.store	gvol+76($pop18), $20
+	i32.store	gvol+68($pop18), $18
 	i32.const	$push17=, 0
-	i32.store	gvol+80($pop17), $21
+	i32.store	gvol+72($pop17), $19
 	i32.const	$push16=, 0
-	i32.store	gvol+84($pop16), $22
+	i32.store	gvol+76($pop16), $20
 	i32.const	$push15=, 0
-	i32.store	gvol+88($pop15), $23
+	i32.store	gvol+80($pop15), $21
 	i32.const	$push14=, 0
-	i32.store	gvol+92($pop14), $24
+	i32.store	gvol+84($pop14), $22
 	i32.const	$push13=, 0
-	i32.store	gvol+96($pop13), $25
+	i32.store	gvol+88($pop13), $23
 	i32.const	$push12=, 0
-	i32.store	gvol+100($pop12), $26
+	i32.store	gvol+92($pop12), $24
 	i32.const	$push11=, 0
-	i32.store	gvol+104($pop11), $27
+	i32.store	gvol+96($pop11), $25
 	i32.const	$push10=, 0
-	i32.store	gvol+108($pop10), $28
+	i32.store	gvol+100($pop10), $26
 	i32.const	$push9=, 0
-	i32.store	gvol+112($pop9), $29
+	i32.store	gvol+104($pop9), $27
 	i32.const	$push8=, 0
-	i32.store	gvol+116($pop8), $30
+	i32.store	gvol+108($pop8), $28
 	i32.const	$push7=, 0
-	i32.store	gvol+120($pop7), $31
-	i32.const	$push6=, -1
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label11
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop7), $29
+	i32.const	$push6=, 0
+	i32.store	gvol+116($pop6), $30
+	i32.const	$push5=, 0
+	i32.store	gvol+120($pop5), $31
+	i32.const	$push4=, -1
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label11
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push2=, 1
 	i64.add 	$1=, $1, $pop2
 .LBB5_4:                                # %while.end
 	end_block                       # label10:
-	copy_local	$push68=, $1
-                                        # fallthrough-return: $pop68
+	copy_local	$push66=, $1
+                                        # fallthrough-return: $pop66
 	.endfunc
 .Lfunc_end5:
 	.size	t6, .Lfunc_end5-t6
@@ -952,11 +946,11 @@ t7:                                     # @t7
 	.param  	i32, i64
 	.result 	i64
 	.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
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label12
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label12
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -966,138 +960,137 @@ t7:                                     # @t7
 .LBB6_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	i32.const	$push68=, 0
-	i32.load	$2=, gvol+4($pop68)
-	i32.const	$push67=, 0
-	i32.load	$3=, gvol+8($pop67)
 	i32.const	$push66=, 0
-	i32.load	$4=, gvol+12($pop66)
+	i32.load	$2=, gvol+4($pop66)
 	i32.const	$push65=, 0
-	i32.load	$5=, gvol+16($pop65)
+	i32.load	$3=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$6=, gvol+20($pop64)
+	i32.load	$4=, gvol+12($pop64)
 	i32.const	$push63=, 0
-	i32.load	$7=, gvol+24($pop63)
+	i32.load	$5=, gvol+16($pop63)
 	i32.const	$push62=, 0
-	i32.load	$8=, gvol+28($pop62)
+	i32.load	$6=, gvol+20($pop62)
 	i32.const	$push61=, 0
-	i32.load	$9=, gvol+32($pop61)
+	i32.load	$7=, gvol+24($pop61)
 	i32.const	$push60=, 0
-	i32.load	$10=, gvol+36($pop60)
+	i32.load	$8=, gvol+28($pop60)
 	i32.const	$push59=, 0
-	i32.load	$11=, gvol+40($pop59)
+	i32.load	$9=, gvol+32($pop59)
 	i32.const	$push58=, 0
-	i32.load	$12=, gvol+44($pop58)
+	i32.load	$10=, gvol+36($pop58)
 	i32.const	$push57=, 0
-	i32.load	$13=, gvol+48($pop57)
+	i32.load	$11=, gvol+40($pop57)
 	i32.const	$push56=, 0
-	i32.load	$14=, gvol+52($pop56)
+	i32.load	$12=, gvol+44($pop56)
 	i32.const	$push55=, 0
-	i32.load	$15=, gvol+56($pop55)
+	i32.load	$13=, gvol+48($pop55)
 	i32.const	$push54=, 0
-	i32.load	$16=, gvol+60($pop54)
+	i32.load	$14=, gvol+52($pop54)
 	i32.const	$push53=, 0
-	i32.load	$17=, gvol+64($pop53)
+	i32.load	$15=, gvol+56($pop53)
 	i32.const	$push52=, 0
-	i32.load	$18=, gvol+68($pop52)
+	i32.load	$16=, gvol+60($pop52)
 	i32.const	$push51=, 0
-	i32.load	$19=, gvol+72($pop51)
+	i32.load	$17=, gvol+64($pop51)
 	i32.const	$push50=, 0
-	i32.load	$20=, gvol+76($pop50)
+	i32.load	$18=, gvol+68($pop50)
 	i32.const	$push49=, 0
-	i32.load	$21=, gvol+80($pop49)
+	i32.load	$19=, gvol+72($pop49)
 	i32.const	$push48=, 0
-	i32.load	$22=, gvol+84($pop48)
+	i32.load	$20=, gvol+76($pop48)
 	i32.const	$push47=, 0
-	i32.load	$23=, gvol+88($pop47)
+	i32.load	$21=, gvol+80($pop47)
 	i32.const	$push46=, 0
-	i32.load	$24=, gvol+92($pop46)
+	i32.load	$22=, gvol+84($pop46)
 	i32.const	$push45=, 0
-	i32.load	$25=, gvol+96($pop45)
+	i32.load	$23=, gvol+88($pop45)
 	i32.const	$push44=, 0
-	i32.load	$26=, gvol+100($pop44)
+	i32.load	$24=, gvol+92($pop44)
 	i32.const	$push43=, 0
-	i32.load	$27=, gvol+104($pop43)
+	i32.load	$25=, gvol+96($pop43)
 	i32.const	$push42=, 0
-	i32.load	$28=, gvol+108($pop42)
+	i32.load	$26=, gvol+100($pop42)
 	i32.const	$push41=, 0
-	i32.load	$29=, gvol+112($pop41)
+	i32.load	$27=, gvol+104($pop41)
 	i32.const	$push40=, 0
-	i32.load	$30=, gvol+116($pop40)
+	i32.load	$28=, gvol+108($pop40)
 	i32.const	$push39=, 0
-	i32.load	$31=, gvol+120($pop39)
+	i32.load	$29=, gvol+112($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+4($pop38), $2
+	i32.load	$30=, gvol+116($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+8($pop37), $3
+	i32.load	$31=, gvol+120($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+12($pop36), $4
+	i32.store	gvol+4($pop36), $2
 	i32.const	$push35=, 0
-	i32.store	gvol+16($pop35), $5
+	i32.store	gvol+8($pop35), $3
 	i32.const	$push34=, 0
-	i32.store	gvol+20($pop34), $6
+	i32.store	gvol+12($pop34), $4
 	i32.const	$push33=, 0
-	i32.store	gvol+24($pop33), $7
+	i32.store	gvol+16($pop33), $5
 	i32.const	$push32=, 0
-	i32.store	gvol+28($pop32), $8
+	i32.store	gvol+20($pop32), $6
 	i32.const	$push31=, 0
-	i32.store	gvol+32($pop31), $9
+	i32.store	gvol+24($pop31), $7
 	i32.const	$push30=, 0
-	i32.store	gvol+36($pop30), $10
+	i32.store	gvol+28($pop30), $8
 	i32.const	$push29=, 0
-	i32.store	gvol+40($pop29), $11
+	i32.store	gvol+32($pop29), $9
 	i32.const	$push28=, 0
-	i32.store	gvol+44($pop28), $12
+	i32.store	gvol+36($pop28), $10
 	i32.const	$push27=, 0
-	i32.store	gvol+48($pop27), $13
+	i32.store	gvol+40($pop27), $11
 	i32.const	$push26=, 0
-	i32.store	gvol+52($pop26), $14
+	i32.store	gvol+44($pop26), $12
 	i32.const	$push25=, 0
-	i32.store	gvol+56($pop25), $15
+	i32.store	gvol+48($pop25), $13
 	i32.const	$push24=, 0
-	i32.store	gvol+60($pop24), $16
+	i32.store	gvol+52($pop24), $14
 	i32.const	$push23=, 0
-	i32.store	gvol+64($pop23), $17
+	i32.store	gvol+56($pop23), $15
 	i32.const	$push22=, 0
-	i32.store	gvol+68($pop22), $18
+	i32.store	gvol+60($pop22), $16
 	i32.const	$push21=, 0
-	i32.store	gvol+72($pop21), $19
+	i32.store	gvol+64($pop21), $17
 	i32.const	$push20=, 0
-	i32.store	gvol+76($pop20), $20
+	i32.store	gvol+68($pop20), $18
 	i32.const	$push19=, 0
-	i32.store	gvol+80($pop19), $21
+	i32.store	gvol+72($pop19), $19
 	i32.const	$push18=, 0
-	i32.store	gvol+84($pop18), $22
+	i32.store	gvol+76($pop18), $20
 	i32.const	$push17=, 0
-	i32.store	gvol+88($pop17), $23
+	i32.store	gvol+80($pop17), $21
 	i32.const	$push16=, 0
-	i32.store	gvol+92($pop16), $24
+	i32.store	gvol+84($pop16), $22
 	i32.const	$push15=, 0
-	i32.store	gvol+96($pop15), $25
+	i32.store	gvol+88($pop15), $23
 	i32.const	$push14=, 0
-	i32.store	gvol+100($pop14), $26
+	i32.store	gvol+92($pop14), $24
 	i32.const	$push13=, 0
-	i32.store	gvol+104($pop13), $27
+	i32.store	gvol+96($pop13), $25
 	i32.const	$push12=, 0
-	i32.store	gvol+108($pop12), $28
+	i32.store	gvol+100($pop12), $26
 	i32.const	$push11=, 0
-	i32.store	gvol+112($pop11), $29
+	i32.store	gvol+104($pop11), $27
 	i32.const	$push10=, 0
-	i32.store	gvol+116($pop10), $30
+	i32.store	gvol+108($pop10), $28
 	i32.const	$push9=, 0
-	i32.store	gvol+120($pop9), $31
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label13
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop9), $29
+	i32.const	$push8=, 0
+	i32.store	gvol+116($pop8), $30
+	i32.const	$push7=, 0
+	i32.store	gvol+120($pop7), $31
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label13
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push4=, 511
 	i64.add 	$1=, $1, $pop4
 .LBB6_4:                                # %while.end
 	end_block                       # label12:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end6:
 	.size	t7, .Lfunc_end6-t7
@@ -1110,11 +1103,11 @@ t8:                                     # @t8
 	.param  	i32, i64
 	.result 	i64
 	.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
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label14
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label14
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -1124,138 +1117,137 @@ t8:                                     # @t8
 .LBB7_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.const	$push68=, 0
-	i32.load	$2=, gvol+4($pop68)
-	i32.const	$push67=, 0
-	i32.load	$3=, gvol+8($pop67)
 	i32.const	$push66=, 0
-	i32.load	$4=, gvol+12($pop66)
+	i32.load	$2=, gvol+4($pop66)
 	i32.const	$push65=, 0
-	i32.load	$5=, gvol+16($pop65)
+	i32.load	$3=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$6=, gvol+20($pop64)
+	i32.load	$4=, gvol+12($pop64)
 	i32.const	$push63=, 0
-	i32.load	$7=, gvol+24($pop63)
+	i32.load	$5=, gvol+16($pop63)
 	i32.const	$push62=, 0
-	i32.load	$8=, gvol+28($pop62)
+	i32.load	$6=, gvol+20($pop62)
 	i32.const	$push61=, 0
-	i32.load	$9=, gvol+32($pop61)
+	i32.load	$7=, gvol+24($pop61)
 	i32.const	$push60=, 0
-	i32.load	$10=, gvol+36($pop60)
+	i32.load	$8=, gvol+28($pop60)
 	i32.const	$push59=, 0
-	i32.load	$11=, gvol+40($pop59)
+	i32.load	$9=, gvol+32($pop59)
 	i32.const	$push58=, 0
-	i32.load	$12=, gvol+44($pop58)
+	i32.load	$10=, gvol+36($pop58)
 	i32.const	$push57=, 0
-	i32.load	$13=, gvol+48($pop57)
+	i32.load	$11=, gvol+40($pop57)
 	i32.const	$push56=, 0
-	i32.load	$14=, gvol+52($pop56)
+	i32.load	$12=, gvol+44($pop56)
 	i32.const	$push55=, 0
-	i32.load	$15=, gvol+56($pop55)
+	i32.load	$13=, gvol+48($pop55)
 	i32.const	$push54=, 0
-	i32.load	$16=, gvol+60($pop54)
+	i32.load	$14=, gvol+52($pop54)
 	i32.const	$push53=, 0
-	i32.load	$17=, gvol+64($pop53)
+	i32.load	$15=, gvol+56($pop53)
 	i32.const	$push52=, 0
-	i32.load	$18=, gvol+68($pop52)
+	i32.load	$16=, gvol+60($pop52)
 	i32.const	$push51=, 0
-	i32.load	$19=, gvol+72($pop51)
+	i32.load	$17=, gvol+64($pop51)
 	i32.const	$push50=, 0
-	i32.load	$20=, gvol+76($pop50)
+	i32.load	$18=, gvol+68($pop50)
 	i32.const	$push49=, 0
-	i32.load	$21=, gvol+80($pop49)
+	i32.load	$19=, gvol+72($pop49)
 	i32.const	$push48=, 0
-	i32.load	$22=, gvol+84($pop48)
+	i32.load	$20=, gvol+76($pop48)
 	i32.const	$push47=, 0
-	i32.load	$23=, gvol+88($pop47)
+	i32.load	$21=, gvol+80($pop47)
 	i32.const	$push46=, 0
-	i32.load	$24=, gvol+92($pop46)
+	i32.load	$22=, gvol+84($pop46)
 	i32.const	$push45=, 0
-	i32.load	$25=, gvol+96($pop45)
+	i32.load	$23=, gvol+88($pop45)
 	i32.const	$push44=, 0
-	i32.load	$26=, gvol+100($pop44)
+	i32.load	$24=, gvol+92($pop44)
 	i32.const	$push43=, 0
-	i32.load	$27=, gvol+104($pop43)
+	i32.load	$25=, gvol+96($pop43)
 	i32.const	$push42=, 0
-	i32.load	$28=, gvol+108($pop42)
+	i32.load	$26=, gvol+100($pop42)
 	i32.const	$push41=, 0
-	i32.load	$29=, gvol+112($pop41)
+	i32.load	$27=, gvol+104($pop41)
 	i32.const	$push40=, 0
-	i32.load	$30=, gvol+116($pop40)
+	i32.load	$28=, gvol+108($pop40)
 	i32.const	$push39=, 0
-	i32.load	$31=, gvol+120($pop39)
+	i32.load	$29=, gvol+112($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+4($pop38), $2
+	i32.load	$30=, gvol+116($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+8($pop37), $3
+	i32.load	$31=, gvol+120($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+12($pop36), $4
+	i32.store	gvol+4($pop36), $2
 	i32.const	$push35=, 0
-	i32.store	gvol+16($pop35), $5
+	i32.store	gvol+8($pop35), $3
 	i32.const	$push34=, 0
-	i32.store	gvol+20($pop34), $6
+	i32.store	gvol+12($pop34), $4
 	i32.const	$push33=, 0
-	i32.store	gvol+24($pop33), $7
+	i32.store	gvol+16($pop33), $5
 	i32.const	$push32=, 0
-	i32.store	gvol+28($pop32), $8
+	i32.store	gvol+20($pop32), $6
 	i32.const	$push31=, 0
-	i32.store	gvol+32($pop31), $9
+	i32.store	gvol+24($pop31), $7
 	i32.const	$push30=, 0
-	i32.store	gvol+36($pop30), $10
+	i32.store	gvol+28($pop30), $8
 	i32.const	$push29=, 0
-	i32.store	gvol+40($pop29), $11
+	i32.store	gvol+32($pop29), $9
 	i32.const	$push28=, 0
-	i32.store	gvol+44($pop28), $12
+	i32.store	gvol+36($pop28), $10
 	i32.const	$push27=, 0
-	i32.store	gvol+48($pop27), $13
+	i32.store	gvol+40($pop27), $11
 	i32.const	$push26=, 0
-	i32.store	gvol+52($pop26), $14
+	i32.store	gvol+44($pop26), $12
 	i32.const	$push25=, 0
-	i32.store	gvol+56($pop25), $15
+	i32.store	gvol+48($pop25), $13
 	i32.const	$push24=, 0
-	i32.store	gvol+60($pop24), $16
+	i32.store	gvol+52($pop24), $14
 	i32.const	$push23=, 0
-	i32.store	gvol+64($pop23), $17
+	i32.store	gvol+56($pop23), $15
 	i32.const	$push22=, 0
-	i32.store	gvol+68($pop22), $18
+	i32.store	gvol+60($pop22), $16
 	i32.const	$push21=, 0
-	i32.store	gvol+72($pop21), $19
+	i32.store	gvol+64($pop21), $17
 	i32.const	$push20=, 0
-	i32.store	gvol+76($pop20), $20
+	i32.store	gvol+68($pop20), $18
 	i32.const	$push19=, 0
-	i32.store	gvol+80($pop19), $21
+	i32.store	gvol+72($pop19), $19
 	i32.const	$push18=, 0
-	i32.store	gvol+84($pop18), $22
+	i32.store	gvol+76($pop18), $20
 	i32.const	$push17=, 0
-	i32.store	gvol+88($pop17), $23
+	i32.store	gvol+80($pop17), $21
 	i32.const	$push16=, 0
-	i32.store	gvol+92($pop16), $24
+	i32.store	gvol+84($pop16), $22
 	i32.const	$push15=, 0
-	i32.store	gvol+96($pop15), $25
+	i32.store	gvol+88($pop15), $23
 	i32.const	$push14=, 0
-	i32.store	gvol+100($pop14), $26
+	i32.store	gvol+92($pop14), $24
 	i32.const	$push13=, 0
-	i32.store	gvol+104($pop13), $27
+	i32.store	gvol+96($pop13), $25
 	i32.const	$push12=, 0
-	i32.store	gvol+108($pop12), $28
+	i32.store	gvol+100($pop12), $26
 	i32.const	$push11=, 0
-	i32.store	gvol+112($pop11), $29
+	i32.store	gvol+104($pop11), $27
 	i32.const	$push10=, 0
-	i32.store	gvol+116($pop10), $30
+	i32.store	gvol+108($pop10), $28
 	i32.const	$push9=, 0
-	i32.store	gvol+120($pop9), $31
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label15
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop9), $29
+	i32.const	$push8=, 0
+	i32.store	gvol+116($pop8), $30
+	i32.const	$push7=, 0
+	i32.store	gvol+120($pop7), $31
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label15
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push4=, 512
 	i64.add 	$1=, $1, $pop4
 .LBB7_4:                                # %while.end
 	end_block                       # label14:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end7:
 	.size	t8, .Lfunc_end7-t8
@@ -1268,11 +1260,11 @@ t9:                                     # @t9
 	.param  	i32, i64
 	.result 	i64
 	.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
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push69=, $0
-	br_if   	0, $pop69       # 0: down to label16
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label16
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push0=, $0, $pop5
 	i64.extend_u/i32	$push1=, $pop0
@@ -1282,138 +1274,137 @@ t9:                                     # @t9
 .LBB8_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label17:
-	i32.const	$push68=, 0
-	i32.load	$2=, gvol+4($pop68)
-	i32.const	$push67=, 0
-	i32.load	$3=, gvol+8($pop67)
 	i32.const	$push66=, 0
-	i32.load	$4=, gvol+12($pop66)
+	i32.load	$2=, gvol+4($pop66)
 	i32.const	$push65=, 0
-	i32.load	$5=, gvol+16($pop65)
+	i32.load	$3=, gvol+8($pop65)
 	i32.const	$push64=, 0
-	i32.load	$6=, gvol+20($pop64)
+	i32.load	$4=, gvol+12($pop64)
 	i32.const	$push63=, 0
-	i32.load	$7=, gvol+24($pop63)
+	i32.load	$5=, gvol+16($pop63)
 	i32.const	$push62=, 0
-	i32.load	$8=, gvol+28($pop62)
+	i32.load	$6=, gvol+20($pop62)
 	i32.const	$push61=, 0
-	i32.load	$9=, gvol+32($pop61)
+	i32.load	$7=, gvol+24($pop61)
 	i32.const	$push60=, 0
-	i32.load	$10=, gvol+36($pop60)
+	i32.load	$8=, gvol+28($pop60)
 	i32.const	$push59=, 0
-	i32.load	$11=, gvol+40($pop59)
+	i32.load	$9=, gvol+32($pop59)
 	i32.const	$push58=, 0
-	i32.load	$12=, gvol+44($pop58)
+	i32.load	$10=, gvol+36($pop58)
 	i32.const	$push57=, 0
-	i32.load	$13=, gvol+48($pop57)
+	i32.load	$11=, gvol+40($pop57)
 	i32.const	$push56=, 0
-	i32.load	$14=, gvol+52($pop56)
+	i32.load	$12=, gvol+44($pop56)
 	i32.const	$push55=, 0
-	i32.load	$15=, gvol+56($pop55)
+	i32.load	$13=, gvol+48($pop55)
 	i32.const	$push54=, 0
-	i32.load	$16=, gvol+60($pop54)
+	i32.load	$14=, gvol+52($pop54)
 	i32.const	$push53=, 0
-	i32.load	$17=, gvol+64($pop53)
+	i32.load	$15=, gvol+56($pop53)
 	i32.const	$push52=, 0
-	i32.load	$18=, gvol+68($pop52)
+	i32.load	$16=, gvol+60($pop52)
 	i32.const	$push51=, 0
-	i32.load	$19=, gvol+72($pop51)
+	i32.load	$17=, gvol+64($pop51)
 	i32.const	$push50=, 0
-	i32.load	$20=, gvol+76($pop50)
+	i32.load	$18=, gvol+68($pop50)
 	i32.const	$push49=, 0
-	i32.load	$21=, gvol+80($pop49)
+	i32.load	$19=, gvol+72($pop49)
 	i32.const	$push48=, 0
-	i32.load	$22=, gvol+84($pop48)
+	i32.load	$20=, gvol+76($pop48)
 	i32.const	$push47=, 0
-	i32.load	$23=, gvol+88($pop47)
+	i32.load	$21=, gvol+80($pop47)
 	i32.const	$push46=, 0
-	i32.load	$24=, gvol+92($pop46)
+	i32.load	$22=, gvol+84($pop46)
 	i32.const	$push45=, 0
-	i32.load	$25=, gvol+96($pop45)
+	i32.load	$23=, gvol+88($pop45)
 	i32.const	$push44=, 0
-	i32.load	$26=, gvol+100($pop44)
+	i32.load	$24=, gvol+92($pop44)
 	i32.const	$push43=, 0
-	i32.load	$27=, gvol+104($pop43)
+	i32.load	$25=, gvol+96($pop43)
 	i32.const	$push42=, 0
-	i32.load	$28=, gvol+108($pop42)
+	i32.load	$26=, gvol+100($pop42)
 	i32.const	$push41=, 0
-	i32.load	$29=, gvol+112($pop41)
+	i32.load	$27=, gvol+104($pop41)
 	i32.const	$push40=, 0
-	i32.load	$30=, gvol+116($pop40)
+	i32.load	$28=, gvol+108($pop40)
 	i32.const	$push39=, 0
-	i32.load	$31=, gvol+120($pop39)
+	i32.load	$29=, gvol+112($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+4($pop38), $2
+	i32.load	$30=, gvol+116($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+8($pop37), $3
+	i32.load	$31=, gvol+120($pop37)
 	i32.const	$push36=, 0
-	i32.store	gvol+12($pop36), $4
+	i32.store	gvol+4($pop36), $2
 	i32.const	$push35=, 0
-	i32.store	gvol+16($pop35), $5
+	i32.store	gvol+8($pop35), $3
 	i32.const	$push34=, 0
-	i32.store	gvol+20($pop34), $6
+	i32.store	gvol+12($pop34), $4
 	i32.const	$push33=, 0
-	i32.store	gvol+24($pop33), $7
+	i32.store	gvol+16($pop33), $5
 	i32.const	$push32=, 0
-	i32.store	gvol+28($pop32), $8
+	i32.store	gvol+20($pop32), $6
 	i32.const	$push31=, 0
-	i32.store	gvol+32($pop31), $9
+	i32.store	gvol+24($pop31), $7
 	i32.const	$push30=, 0
-	i32.store	gvol+36($pop30), $10
+	i32.store	gvol+28($pop30), $8
 	i32.const	$push29=, 0
-	i32.store	gvol+40($pop29), $11
+	i32.store	gvol+32($pop29), $9
 	i32.const	$push28=, 0
-	i32.store	gvol+44($pop28), $12
+	i32.store	gvol+36($pop28), $10
 	i32.const	$push27=, 0
-	i32.store	gvol+48($pop27), $13
+	i32.store	gvol+40($pop27), $11
 	i32.const	$push26=, 0
-	i32.store	gvol+52($pop26), $14
+	i32.store	gvol+44($pop26), $12
 	i32.const	$push25=, 0
-	i32.store	gvol+56($pop25), $15
+	i32.store	gvol+48($pop25), $13
 	i32.const	$push24=, 0
-	i32.store	gvol+60($pop24), $16
+	i32.store	gvol+52($pop24), $14
 	i32.const	$push23=, 0
-	i32.store	gvol+64($pop23), $17
+	i32.store	gvol+56($pop23), $15
 	i32.const	$push22=, 0
-	i32.store	gvol+68($pop22), $18
+	i32.store	gvol+60($pop22), $16
 	i32.const	$push21=, 0
-	i32.store	gvol+72($pop21), $19
+	i32.store	gvol+64($pop21), $17
 	i32.const	$push20=, 0
-	i32.store	gvol+76($pop20), $20
+	i32.store	gvol+68($pop20), $18
 	i32.const	$push19=, 0
-	i32.store	gvol+80($pop19), $21
+	i32.store	gvol+72($pop19), $19
 	i32.const	$push18=, 0
-	i32.store	gvol+84($pop18), $22
+	i32.store	gvol+76($pop18), $20
 	i32.const	$push17=, 0
-	i32.store	gvol+88($pop17), $23
+	i32.store	gvol+80($pop17), $21
 	i32.const	$push16=, 0
-	i32.store	gvol+92($pop16), $24
+	i32.store	gvol+84($pop16), $22
 	i32.const	$push15=, 0
-	i32.store	gvol+96($pop15), $25
+	i32.store	gvol+88($pop15), $23
 	i32.const	$push14=, 0
-	i32.store	gvol+100($pop14), $26
+	i32.store	gvol+92($pop14), $24
 	i32.const	$push13=, 0
-	i32.store	gvol+104($pop13), $27
+	i32.store	gvol+96($pop13), $25
 	i32.const	$push12=, 0
-	i32.store	gvol+108($pop12), $28
+	i32.store	gvol+100($pop12), $26
 	i32.const	$push11=, 0
-	i32.store	gvol+112($pop11), $29
+	i32.store	gvol+104($pop11), $27
 	i32.const	$push10=, 0
-	i32.store	gvol+116($pop10), $30
+	i32.store	gvol+108($pop10), $28
 	i32.const	$push9=, 0
-	i32.store	gvol+120($pop9), $31
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label17
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop9), $29
+	i32.const	$push8=, 0
+	i32.store	gvol+116($pop8), $30
+	i32.const	$push7=, 0
+	i32.store	gvol+120($pop7), $31
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label17
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.const	$push4=, 513
 	i64.add 	$1=, $1, $pop4
 .LBB8_4:                                # %while.end
 	end_block                       # label16:
-	copy_local	$push70=, $1
-                                        # fallthrough-return: $pop70
+	copy_local	$push68=, $1
+                                        # fallthrough-return: $pop68
 	.endfunc
 .Lfunc_end8:
 	.size	t9, .Lfunc_end8-t9
@@ -1426,11 +1417,11 @@ t10:                                    # @t10
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push70=, $0
-	br_if   	0, $pop70       # 0: down to label18
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push68=, $0
+	br_if   	0, $pop68       # 0: down to label18
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push6=, 0
 	i64.load	$push4=, gull($pop6)
 	i32.const	$push5=, -1
@@ -1442,137 +1433,136 @@ t10:                                    # @t10
 .LBB9_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label19:
-	i32.const	$push69=, 0
-	i32.load	$3=, gvol+4($pop69)
-	i32.const	$push68=, 0
-	i32.load	$4=, gvol+8($pop68)
 	i32.const	$push67=, 0
-	i32.load	$5=, gvol+12($pop67)
+	i32.load	$3=, gvol+4($pop67)
 	i32.const	$push66=, 0
-	i32.load	$6=, gvol+16($pop66)
+	i32.load	$4=, gvol+8($pop66)
 	i32.const	$push65=, 0
-	i32.load	$7=, gvol+20($pop65)
+	i32.load	$5=, gvol+12($pop65)
 	i32.const	$push64=, 0
-	i32.load	$8=, gvol+24($pop64)
+	i32.load	$6=, gvol+16($pop64)
 	i32.const	$push63=, 0
-	i32.load	$9=, gvol+28($pop63)
+	i32.load	$7=, gvol+20($pop63)
 	i32.const	$push62=, 0
-	i32.load	$10=, gvol+32($pop62)
+	i32.load	$8=, gvol+24($pop62)
 	i32.const	$push61=, 0
-	i32.load	$11=, gvol+36($pop61)
+	i32.load	$9=, gvol+28($pop61)
 	i32.const	$push60=, 0
-	i32.load	$12=, gvol+40($pop60)
+	i32.load	$10=, gvol+32($pop60)
 	i32.const	$push59=, 0
-	i32.load	$13=, gvol+44($pop59)
+	i32.load	$11=, gvol+36($pop59)
 	i32.const	$push58=, 0
-	i32.load	$14=, gvol+48($pop58)
+	i32.load	$12=, gvol+40($pop58)
 	i32.const	$push57=, 0
-	i32.load	$15=, gvol+52($pop57)
+	i32.load	$13=, gvol+44($pop57)
 	i32.const	$push56=, 0
-	i32.load	$16=, gvol+56($pop56)
+	i32.load	$14=, gvol+48($pop56)
 	i32.const	$push55=, 0
-	i32.load	$17=, gvol+60($pop55)
+	i32.load	$15=, gvol+52($pop55)
 	i32.const	$push54=, 0
-	i32.load	$18=, gvol+64($pop54)
+	i32.load	$16=, gvol+56($pop54)
 	i32.const	$push53=, 0
-	i32.load	$19=, gvol+68($pop53)
+	i32.load	$17=, gvol+60($pop53)
 	i32.const	$push52=, 0
-	i32.load	$20=, gvol+72($pop52)
+	i32.load	$18=, gvol+64($pop52)
 	i32.const	$push51=, 0
-	i32.load	$21=, gvol+76($pop51)
+	i32.load	$19=, gvol+68($pop51)
 	i32.const	$push50=, 0
-	i32.load	$22=, gvol+80($pop50)
+	i32.load	$20=, gvol+72($pop50)
 	i32.const	$push49=, 0
-	i32.load	$23=, gvol+84($pop49)
+	i32.load	$21=, gvol+76($pop49)
 	i32.const	$push48=, 0
-	i32.load	$24=, gvol+88($pop48)
+	i32.load	$22=, gvol+80($pop48)
 	i32.const	$push47=, 0
-	i32.load	$25=, gvol+92($pop47)
+	i32.load	$23=, gvol+84($pop47)
 	i32.const	$push46=, 0
-	i32.load	$26=, gvol+96($pop46)
+	i32.load	$24=, gvol+88($pop46)
 	i32.const	$push45=, 0
-	i32.load	$27=, gvol+100($pop45)
+	i32.load	$25=, gvol+92($pop45)
 	i32.const	$push44=, 0
-	i32.load	$28=, gvol+104($pop44)
+	i32.load	$26=, gvol+96($pop44)
 	i32.const	$push43=, 0
-	i32.load	$29=, gvol+108($pop43)
+	i32.load	$27=, gvol+100($pop43)
 	i32.const	$push42=, 0
-	i32.load	$30=, gvol+112($pop42)
+	i32.load	$28=, gvol+104($pop42)
 	i32.const	$push41=, 0
-	i32.load	$31=, gvol+116($pop41)
+	i32.load	$29=, gvol+108($pop41)
 	i32.const	$push40=, 0
-	i32.load	$32=, gvol+120($pop40)
+	i32.load	$30=, gvol+112($pop40)
 	i32.const	$push39=, 0
-	i32.store	gvol+4($pop39), $3
+	i32.load	$31=, gvol+116($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+8($pop38), $4
+	i32.load	$32=, gvol+120($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+12($pop37), $5
+	i32.store	gvol+4($pop37), $3
 	i32.const	$push36=, 0
-	i32.store	gvol+16($pop36), $6
+	i32.store	gvol+8($pop36), $4
 	i32.const	$push35=, 0
-	i32.store	gvol+20($pop35), $7
+	i32.store	gvol+12($pop35), $5
 	i32.const	$push34=, 0
-	i32.store	gvol+24($pop34), $8
+	i32.store	gvol+16($pop34), $6
 	i32.const	$push33=, 0
-	i32.store	gvol+28($pop33), $9
+	i32.store	gvol+20($pop33), $7
 	i32.const	$push32=, 0
-	i32.store	gvol+32($pop32), $10
+	i32.store	gvol+24($pop32), $8
 	i32.const	$push31=, 0
-	i32.store	gvol+36($pop31), $11
+	i32.store	gvol+28($pop31), $9
 	i32.const	$push30=, 0
-	i32.store	gvol+40($pop30), $12
+	i32.store	gvol+32($pop30), $10
 	i32.const	$push29=, 0
-	i32.store	gvol+44($pop29), $13
+	i32.store	gvol+36($pop29), $11
 	i32.const	$push28=, 0
-	i32.store	gvol+48($pop28), $14
+	i32.store	gvol+40($pop28), $12
 	i32.const	$push27=, 0
-	i32.store	gvol+52($pop27), $15
+	i32.store	gvol+44($pop27), $13
 	i32.const	$push26=, 0
-	i32.store	gvol+56($pop26), $16
+	i32.store	gvol+48($pop26), $14
 	i32.const	$push25=, 0
-	i32.store	gvol+60($pop25), $17
+	i32.store	gvol+52($pop25), $15
 	i32.const	$push24=, 0
-	i32.store	gvol+64($pop24), $18
+	i32.store	gvol+56($pop24), $16
 	i32.const	$push23=, 0
-	i32.store	gvol+68($pop23), $19
+	i32.store	gvol+60($pop23), $17
 	i32.const	$push22=, 0
-	i32.store	gvol+72($pop22), $20
+	i32.store	gvol+64($pop22), $18
 	i32.const	$push21=, 0
-	i32.store	gvol+76($pop21), $21
+	i32.store	gvol+68($pop21), $19
 	i32.const	$push20=, 0
-	i32.store	gvol+80($pop20), $22
+	i32.store	gvol+72($pop20), $20
 	i32.const	$push19=, 0
-	i32.store	gvol+84($pop19), $23
+	i32.store	gvol+76($pop19), $21
 	i32.const	$push18=, 0
-	i32.store	gvol+88($pop18), $24
+	i32.store	gvol+80($pop18), $22
 	i32.const	$push17=, 0
-	i32.store	gvol+92($pop17), $25
+	i32.store	gvol+84($pop17), $23
 	i32.const	$push16=, 0
-	i32.store	gvol+96($pop16), $26
+	i32.store	gvol+88($pop16), $24
 	i32.const	$push15=, 0
-	i32.store	gvol+100($pop15), $27
+	i32.store	gvol+92($pop15), $25
 	i32.const	$push14=, 0
-	i32.store	gvol+104($pop14), $28
+	i32.store	gvol+96($pop14), $26
 	i32.const	$push13=, 0
-	i32.store	gvol+108($pop13), $29
+	i32.store	gvol+100($pop13), $27
 	i32.const	$push12=, 0
-	i32.store	gvol+112($pop12), $30
+	i32.store	gvol+104($pop12), $28
 	i32.const	$push11=, 0
-	i32.store	gvol+116($pop11), $31
+	i32.store	gvol+108($pop11), $29
 	i32.const	$push10=, 0
-	i32.store	gvol+120($pop10), $32
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $0=, $pop8
-	br_if   	0, $pop7        # 0: up to label19
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop10), $30
+	i32.const	$push9=, 0
+	i32.store	gvol+116($pop9), $31
+	i32.const	$push8=, 0
+	i32.store	gvol+120($pop8), $32
+	i32.const	$push7=, -1
+	i32.add 	$0=, $0, $pop7
+	br_if   	0, $0           # 0: up to label19
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.add 	$1=, $2, $1
 .LBB9_4:                                # %while.end
 	end_block                       # label18:
-	copy_local	$push71=, $1
-                                        # fallthrough-return: $pop71
+	copy_local	$push69=, $1
+                                        # fallthrough-return: $pop69
 	.endfunc
 .Lfunc_end9:
 	.size	t10, .Lfunc_end9-t10
@@ -1585,11 +1575,11 @@ t11:                                    # @t11
 	.param  	i32, i64
 	.result 	i64
 	.local  	i64, 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
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push70=, $0
-	br_if   	0, $pop70       # 0: down to label20
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push68=, $0
+	br_if   	0, $pop68       # 0: down to label20
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push6=, 0
 	i64.load	$push4=, gull($pop6)
 	i32.const	$push5=, -1
@@ -1601,137 +1591,136 @@ t11:                                    # @t11
 .LBB10_2:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label21:
-	i32.const	$push69=, 0
-	i32.load	$3=, gvol+4($pop69)
-	i32.const	$push68=, 0
-	i32.load	$4=, gvol+8($pop68)
 	i32.const	$push67=, 0
-	i32.load	$5=, gvol+12($pop67)
+	i32.load	$3=, gvol+4($pop67)
 	i32.const	$push66=, 0
-	i32.load	$6=, gvol+16($pop66)
+	i32.load	$4=, gvol+8($pop66)
 	i32.const	$push65=, 0
-	i32.load	$7=, gvol+20($pop65)
+	i32.load	$5=, gvol+12($pop65)
 	i32.const	$push64=, 0
-	i32.load	$8=, gvol+24($pop64)
+	i32.load	$6=, gvol+16($pop64)
 	i32.const	$push63=, 0
-	i32.load	$9=, gvol+28($pop63)
+	i32.load	$7=, gvol+20($pop63)
 	i32.const	$push62=, 0
-	i32.load	$10=, gvol+32($pop62)
+	i32.load	$8=, gvol+24($pop62)
 	i32.const	$push61=, 0
-	i32.load	$11=, gvol+36($pop61)
+	i32.load	$9=, gvol+28($pop61)
 	i32.const	$push60=, 0
-	i32.load	$12=, gvol+40($pop60)
+	i32.load	$10=, gvol+32($pop60)
 	i32.const	$push59=, 0
-	i32.load	$13=, gvol+44($pop59)
+	i32.load	$11=, gvol+36($pop59)
 	i32.const	$push58=, 0
-	i32.load	$14=, gvol+48($pop58)
+	i32.load	$12=, gvol+40($pop58)
 	i32.const	$push57=, 0
-	i32.load	$15=, gvol+52($pop57)
+	i32.load	$13=, gvol+44($pop57)
 	i32.const	$push56=, 0
-	i32.load	$16=, gvol+56($pop56)
+	i32.load	$14=, gvol+48($pop56)
 	i32.const	$push55=, 0
-	i32.load	$17=, gvol+60($pop55)
+	i32.load	$15=, gvol+52($pop55)
 	i32.const	$push54=, 0
-	i32.load	$18=, gvol+64($pop54)
+	i32.load	$16=, gvol+56($pop54)
 	i32.const	$push53=, 0
-	i32.load	$19=, gvol+68($pop53)
+	i32.load	$17=, gvol+60($pop53)
 	i32.const	$push52=, 0
-	i32.load	$20=, gvol+72($pop52)
+	i32.load	$18=, gvol+64($pop52)
 	i32.const	$push51=, 0
-	i32.load	$21=, gvol+76($pop51)
+	i32.load	$19=, gvol+68($pop51)
 	i32.const	$push50=, 0
-	i32.load	$22=, gvol+80($pop50)
+	i32.load	$20=, gvol+72($pop50)
 	i32.const	$push49=, 0
-	i32.load	$23=, gvol+84($pop49)
+	i32.load	$21=, gvol+76($pop49)
 	i32.const	$push48=, 0
-	i32.load	$24=, gvol+88($pop48)
+	i32.load	$22=, gvol+80($pop48)
 	i32.const	$push47=, 0
-	i32.load	$25=, gvol+92($pop47)
+	i32.load	$23=, gvol+84($pop47)
 	i32.const	$push46=, 0
-	i32.load	$26=, gvol+96($pop46)
+	i32.load	$24=, gvol+88($pop46)
 	i32.const	$push45=, 0
-	i32.load	$27=, gvol+100($pop45)
+	i32.load	$25=, gvol+92($pop45)
 	i32.const	$push44=, 0
-	i32.load	$28=, gvol+104($pop44)
+	i32.load	$26=, gvol+96($pop44)
 	i32.const	$push43=, 0
-	i32.load	$29=, gvol+108($pop43)
+	i32.load	$27=, gvol+100($pop43)
 	i32.const	$push42=, 0
-	i32.load	$30=, gvol+112($pop42)
+	i32.load	$28=, gvol+104($pop42)
 	i32.const	$push41=, 0
-	i32.load	$31=, gvol+116($pop41)
+	i32.load	$29=, gvol+108($pop41)
 	i32.const	$push40=, 0
-	i32.load	$32=, gvol+120($pop40)
+	i32.load	$30=, gvol+112($pop40)
 	i32.const	$push39=, 0
-	i32.store	gvol+4($pop39), $3
+	i32.load	$31=, gvol+116($pop39)
 	i32.const	$push38=, 0
-	i32.store	gvol+8($pop38), $4
+	i32.load	$32=, gvol+120($pop38)
 	i32.const	$push37=, 0
-	i32.store	gvol+12($pop37), $5
+	i32.store	gvol+4($pop37), $3
 	i32.const	$push36=, 0
-	i32.store	gvol+16($pop36), $6
+	i32.store	gvol+8($pop36), $4
 	i32.const	$push35=, 0
-	i32.store	gvol+20($pop35), $7
+	i32.store	gvol+12($pop35), $5
 	i32.const	$push34=, 0
-	i32.store	gvol+24($pop34), $8
+	i32.store	gvol+16($pop34), $6
 	i32.const	$push33=, 0
-	i32.store	gvol+28($pop33), $9
+	i32.store	gvol+20($pop33), $7
 	i32.const	$push32=, 0
-	i32.store	gvol+32($pop32), $10
+	i32.store	gvol+24($pop32), $8
 	i32.const	$push31=, 0
-	i32.store	gvol+36($pop31), $11
+	i32.store	gvol+28($pop31), $9
 	i32.const	$push30=, 0
-	i32.store	gvol+40($pop30), $12
+	i32.store	gvol+32($pop30), $10
 	i32.const	$push29=, 0
-	i32.store	gvol+44($pop29), $13
+	i32.store	gvol+36($pop29), $11
 	i32.const	$push28=, 0
-	i32.store	gvol+48($pop28), $14
+	i32.store	gvol+40($pop28), $12
 	i32.const	$push27=, 0
-	i32.store	gvol+52($pop27), $15
+	i32.store	gvol+44($pop27), $13
 	i32.const	$push26=, 0
-	i32.store	gvol+56($pop26), $16
+	i32.store	gvol+48($pop26), $14
 	i32.const	$push25=, 0
-	i32.store	gvol+60($pop25), $17
+	i32.store	gvol+52($pop25), $15
 	i32.const	$push24=, 0
-	i32.store	gvol+64($pop24), $18
+	i32.store	gvol+56($pop24), $16
 	i32.const	$push23=, 0
-	i32.store	gvol+68($pop23), $19
+	i32.store	gvol+60($pop23), $17
 	i32.const	$push22=, 0
-	i32.store	gvol+72($pop22), $20
+	i32.store	gvol+64($pop22), $18
 	i32.const	$push21=, 0
-	i32.store	gvol+76($pop21), $21
+	i32.store	gvol+68($pop21), $19
 	i32.const	$push20=, 0
-	i32.store	gvol+80($pop20), $22
+	i32.store	gvol+72($pop20), $20
 	i32.const	$push19=, 0
-	i32.store	gvol+84($pop19), $23
+	i32.store	gvol+76($pop19), $21
 	i32.const	$push18=, 0
-	i32.store	gvol+88($pop18), $24
+	i32.store	gvol+80($pop18), $22
 	i32.const	$push17=, 0
-	i32.store	gvol+92($pop17), $25
+	i32.store	gvol+84($pop17), $23
 	i32.const	$push16=, 0
-	i32.store	gvol+96($pop16), $26
+	i32.store	gvol+88($pop16), $24
 	i32.const	$push15=, 0
-	i32.store	gvol+100($pop15), $27
+	i32.store	gvol+92($pop15), $25
 	i32.const	$push14=, 0
-	i32.store	gvol+104($pop14), $28
+	i32.store	gvol+96($pop14), $26
 	i32.const	$push13=, 0
-	i32.store	gvol+108($pop13), $29
+	i32.store	gvol+100($pop13), $27
 	i32.const	$push12=, 0
-	i32.store	gvol+112($pop12), $30
+	i32.store	gvol+104($pop12), $28
 	i32.const	$push11=, 0
-	i32.store	gvol+116($pop11), $31
+	i32.store	gvol+108($pop11), $29
 	i32.const	$push10=, 0
-	i32.store	gvol+120($pop10), $32
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $0=, $pop8
-	br_if   	0, $pop7        # 0: up to label21
-# BB#3:                                 # %while.end.loopexit
+	i32.store	gvol+112($pop10), $30
+	i32.const	$push9=, 0
+	i32.store	gvol+116($pop9), $31
+	i32.const	$push8=, 0
+	i32.store	gvol+120($pop8), $32
+	i32.const	$push7=, -1
+	i32.add 	$0=, $0, $pop7
+	br_if   	0, $0           # 0: up to label21
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i64.add 	$1=, $2, $1
 .LBB10_4:                               # %while.end
 	end_block                       # label20:
-	copy_local	$push71=, $1
-                                        # fallthrough-return: $pop71
+	copy_local	$push69=, $1
+                                        # fallthrough-return: $pop69
 	.endfunc
 .Lfunc_end10:
 	.size	t11, .Lfunc_end10-t11
@@ -1743,7 +1732,7 @@ t11:                                    # @t11
 neg:                                    # @neg
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.sub 	$push1=, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -1757,193 +1746,192 @@ neg:                                    # @neg
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64
-# BB#0:                                 # %entry
+	.local  	i64, i64
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 100
 	i64.store	gull($pop1), $pop0
 	block   	
-	i32.const	$push100=, 3
+	i32.const	$push99=, 3
 	i64.const	$push2=, -1
-	i64.call	$push3=, t1@FUNCTION, $pop100, $pop2
+	i64.call	$push3=, t1@FUNCTION, $pop99, $pop2
 	i64.const	$push4=, -6145
 	i64.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label22
-# BB#1:                                 # %if.end
-	i32.const	$push101=, 3
+# %bb.1:                                # %if.end
+	i32.const	$push100=, 3
 	i64.const	$push6=, 4294967295
-	i64.call	$push7=, t1@FUNCTION, $pop101, $pop6
+	i64.call	$push7=, t1@FUNCTION, $pop100, $pop6
 	i64.const	$push8=, 4294961151
 	i64.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label22
-# BB#2:                                 # %if.end4
-	i32.const	$push102=, 3
+# %bb.2:                                # %if.end4
+	i32.const	$push101=, 3
 	i64.const	$push10=, -1
-	i64.call	$push11=, t2@FUNCTION, $pop102, $pop10
+	i64.call	$push11=, t2@FUNCTION, $pop101, $pop10
 	i64.const	$push12=, -1540
 	i64.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label22
-# BB#3:                                 # %if.end8
-	i32.const	$push103=, 3
+# %bb.3:                                # %if.end8
+	i32.const	$push102=, 3
 	i64.const	$push14=, 4294967295
-	i64.call	$push15=, t2@FUNCTION, $pop103, $pop14
+	i64.call	$push15=, t2@FUNCTION, $pop102, $pop14
 	i64.const	$push16=, 4294965756
 	i64.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label22
-# BB#4:                                 # %if.end12
-	i32.const	$push104=, 3
+# %bb.4:                                # %if.end12
+	i32.const	$push103=, 3
 	i64.const	$push18=, -1
-	i64.call	$push19=, t3@FUNCTION, $pop104, $pop18
+	i64.call	$push19=, t3@FUNCTION, $pop103, $pop18
 	i64.const	$push20=, -1537
 	i64.ne  	$push21=, $pop19, $pop20
 	br_if   	0, $pop21       # 0: down to label22
-# BB#5:                                 # %if.end16
-	i32.const	$push105=, 3
+# %bb.5:                                # %if.end16
+	i32.const	$push104=, 3
 	i64.const	$push22=, 4294967295
-	i64.call	$push23=, t3@FUNCTION, $pop105, $pop22
+	i64.call	$push23=, t3@FUNCTION, $pop104, $pop22
 	i64.const	$push24=, 4294965759
 	i64.ne  	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label22
-# BB#6:                                 # %if.end20
-	i32.const	$push106=, 3
+# %bb.6:                                # %if.end20
+	i32.const	$push105=, 3
 	i64.const	$push26=, -1
-	i64.call	$push27=, t4@FUNCTION, $pop106, $pop26
+	i64.call	$push27=, t4@FUNCTION, $pop105, $pop26
 	i64.const	$push28=, -1534
 	i64.ne  	$push29=, $pop27, $pop28
 	br_if   	0, $pop29       # 0: down to label22
-# BB#7:                                 # %if.end24
-	i32.const	$push107=, 3
+# %bb.7:                                # %if.end24
+	i32.const	$push106=, 3
 	i64.const	$push30=, 4294967295
-	i64.call	$push31=, t4@FUNCTION, $pop107, $pop30
+	i64.call	$push31=, t4@FUNCTION, $pop106, $pop30
 	i64.const	$push32=, 4294965762
 	i64.ne  	$push33=, $pop31, $pop32
 	br_if   	0, $pop33       # 0: down to label22
-# BB#8:                                 # %if.end28
-	i32.const	$push108=, 3
+# %bb.8:                                # %if.end28
+	i32.const	$push107=, 3
 	i64.const	$push34=, -1
-	i64.call	$push35=, t5@FUNCTION, $pop108, $pop34
+	i64.call	$push35=, t5@FUNCTION, $pop107, $pop34
 	i64.const	$push36=, -4
 	i64.ne  	$push37=, $pop35, $pop36
 	br_if   	0, $pop37       # 0: down to label22
-# BB#9:                                 # %if.end32
-	i32.const	$push109=, 3
+# %bb.9:                                # %if.end32
+	i32.const	$push108=, 3
 	i64.const	$push38=, 4294967295
-	i64.call	$push39=, t5@FUNCTION, $pop109, $pop38
+	i64.call	$push39=, t5@FUNCTION, $pop108, $pop38
 	i64.const	$push40=, 4294967292
 	i64.ne  	$push41=, $pop39, $pop40
 	br_if   	0, $pop41       # 0: down to label22
-# BB#10:                                # %if.end36
-	i32.const	$push110=, 3
+# %bb.10:                               # %if.end36
+	i32.const	$push109=, 3
 	i64.const	$push42=, -1
-	i64.call	$push43=, t6@FUNCTION, $pop110, $pop42
+	i64.call	$push43=, t6@FUNCTION, $pop109, $pop42
 	i64.const	$push44=, 2
 	i64.ne  	$push45=, $pop43, $pop44
 	br_if   	0, $pop45       # 0: down to label22
-# BB#11:                                # %if.end40
-	i32.const	$push111=, 3
+# %bb.11:                               # %if.end40
+	i32.const	$push110=, 3
 	i64.const	$push46=, 4294967295
-	i64.call	$push47=, t6@FUNCTION, $pop111, $pop46
+	i64.call	$push47=, t6@FUNCTION, $pop110, $pop46
 	i64.const	$push48=, 4294967298
 	i64.ne  	$push49=, $pop47, $pop48
 	br_if   	0, $pop49       # 0: down to label22
-# BB#12:                                # %if.end44
-	i32.const	$push112=, 3
+# %bb.12:                               # %if.end44
+	i32.const	$push111=, 3
 	i64.const	$push50=, -1
-	i64.call	$push51=, t7@FUNCTION, $pop112, $pop50
+	i64.call	$push51=, t7@FUNCTION, $pop111, $pop50
 	i64.const	$push52=, 1532
 	i64.ne  	$push53=, $pop51, $pop52
 	br_if   	0, $pop53       # 0: down to label22
-# BB#13:                                # %if.end48
-	i32.const	$push113=, 3
+# %bb.13:                               # %if.end48
+	i32.const	$push112=, 3
 	i64.const	$push54=, 4294967295
-	i64.call	$push55=, t7@FUNCTION, $pop113, $pop54
+	i64.call	$push55=, t7@FUNCTION, $pop112, $pop54
 	i64.const	$push56=, 4294968828
 	i64.ne  	$push57=, $pop55, $pop56
 	br_if   	0, $pop57       # 0: down to label22
-# BB#14:                                # %if.end52
-	i32.const	$push114=, 3
+# %bb.14:                               # %if.end52
+	i32.const	$push113=, 3
 	i64.const	$push58=, -1
-	i64.call	$push59=, t8@FUNCTION, $pop114, $pop58
+	i64.call	$push59=, t8@FUNCTION, $pop113, $pop58
 	i64.const	$push60=, 1535
 	i64.ne  	$push61=, $pop59, $pop60
 	br_if   	0, $pop61       # 0: down to label22
-# BB#15:                                # %if.end56
-	i32.const	$push115=, 3
+# %bb.15:                               # %if.end56
+	i32.const	$push114=, 3
 	i64.const	$push62=, 4294967295
-	i64.call	$push63=, t8@FUNCTION, $pop115, $pop62
+	i64.call	$push63=, t8@FUNCTION, $pop114, $pop62
 	i64.const	$push64=, 4294968831
 	i64.ne  	$push65=, $pop63, $pop64
 	br_if   	0, $pop65       # 0: down to label22
-# BB#16:                                # %if.end60
-	i32.const	$push116=, 3
+# %bb.16:                               # %if.end60
+	i32.const	$push115=, 3
 	i64.const	$push66=, -1
-	i64.call	$push67=, t9@FUNCTION, $pop116, $pop66
+	i64.call	$push67=, t9@FUNCTION, $pop115, $pop66
 	i64.const	$push68=, 1538
 	i64.ne  	$push69=, $pop67, $pop68
 	br_if   	0, $pop69       # 0: down to label22
-# BB#17:                                # %if.end64
-	i32.const	$push117=, 3
+# %bb.17:                               # %if.end64
+	i32.const	$push116=, 3
 	i64.const	$push70=, 4294967295
-	i64.call	$push71=, t9@FUNCTION, $pop117, $pop70
+	i64.call	$push71=, t9@FUNCTION, $pop116, $pop70
 	i64.const	$push72=, 4294968834
 	i64.ne  	$push73=, $pop71, $pop72
 	br_if   	0, $pop73       # 0: down to label22
-# BB#18:                                # %if.end68
-	i32.const	$push121=, 3
+# %bb.18:                               # %if.end68
+	i32.const	$push120=, 3
 	i64.const	$push74=, -1
-	i64.call	$push75=, t10@FUNCTION, $pop121, $pop74
-	i32.const	$push120=, 0
-	i64.load	$push76=, gull($pop120)
-	i64.const	$push119=, 3
-	i64.mul 	$push77=, $pop76, $pop119
-	i64.const	$push118=, -1
-	i64.add 	$push78=, $pop77, $pop118
+	i64.call	$push75=, t10@FUNCTION, $pop120, $pop74
+	i32.const	$push119=, 0
+	i64.load	$push76=, gull($pop119)
+	i64.const	$push118=, 3
+	i64.mul 	$push77=, $pop76, $pop118
+	i64.const	$push117=, -1
+	i64.add 	$push78=, $pop77, $pop117
 	i64.ne  	$push79=, $pop75, $pop78
 	br_if   	0, $pop79       # 0: down to label22
-# BB#19:                                # %if.end72
-	i32.const	$push125=, 3
+# %bb.19:                               # %if.end72
+	i32.const	$push124=, 3
 	i64.const	$push80=, 4294967295
-	i64.call	$push81=, t10@FUNCTION, $pop125, $pop80
-	i32.const	$push124=, 0
-	i64.load	$push82=, gull($pop124)
-	i64.const	$push123=, 3
-	i64.mul 	$push83=, $pop82, $pop123
-	i64.const	$push122=, 4294967295
-	i64.add 	$push84=, $pop83, $pop122
+	i64.call	$push81=, t10@FUNCTION, $pop124, $pop80
+	i32.const	$push123=, 0
+	i64.load	$push82=, gull($pop123)
+	i64.const	$push122=, 3
+	i64.mul 	$push83=, $pop82, $pop122
+	i64.const	$push121=, 4294967295
+	i64.add 	$push84=, $pop83, $pop121
 	i64.ne  	$push85=, $pop81, $pop84
 	br_if   	0, $pop85       # 0: down to label22
-# BB#20:                                # %if.end77
-	i32.const	$push129=, 3
+# %bb.20:                               # %if.end77
+	i32.const	$push128=, 3
 	i64.const	$push86=, -1
-	i64.call	$push87=, t11@FUNCTION, $pop129, $pop86
-	i32.const	$push128=, 0
-	i64.load	$push88=, gull($pop128)
-	i64.const	$push127=, -3
-	i64.mul 	$push89=, $pop88, $pop127
-	i64.const	$push126=, -1
-	i64.add 	$push90=, $pop89, $pop126
+	i64.call	$push87=, t11@FUNCTION, $pop128, $pop86
+	i32.const	$push127=, 0
+	i64.load	$push88=, gull($pop127)
+	i64.const	$push126=, -3
+	i64.mul 	$push89=, $pop88, $pop126
+	i64.const	$push125=, -1
+	i64.add 	$push90=, $pop89, $pop125
 	i64.ne  	$push91=, $pop87, $pop90
 	br_if   	0, $pop91       # 0: down to label22
-# BB#21:                                # %if.end84
-	i32.const	$push135=, 3
+# %bb.21:                               # %if.end84
+	i32.const	$push132=, 3
 	i64.const	$push92=, 4294967295
-	i64.call	$push93=, t11@FUNCTION, $pop135, $pop92
-	i32.const	$push134=, 0
-	i64.load	$push133=, gull($pop134)
-	tee_local	$push132=, $0=, $pop133
-	i64.const	$push131=, -3
-	i64.mul 	$push94=, $pop132, $pop131
-	i64.const	$push130=, 4294967295
-	i64.add 	$push95=, $pop94, $pop130
-	i64.ne  	$push96=, $pop93, $pop95
-	br_if   	0, $pop96       # 0: down to label22
-# BB#22:                                # %if.end91
-	i64.const	$push97=, 100
-	i64.ne  	$push98=, $0, $pop97
-	br_if   	0, $pop98       # 0: down to label22
-# BB#23:                                # %if.end95
-	i32.const	$push99=, 0
-	call    	exit@FUNCTION, $pop99
+	i64.call	$1=, t11@FUNCTION, $pop132, $pop92
+	i32.const	$push131=, 0
+	i64.load	$0=, gull($pop131)
+	i64.const	$push130=, -3
+	i64.mul 	$push93=, $0, $pop130
+	i64.const	$push129=, 4294967295
+	i64.add 	$push94=, $pop93, $pop129
+	i64.ne  	$push95=, $1, $pop94
+	br_if   	0, $pop95       # 0: down to label22
+# %bb.22:                               # %if.end91
+	i64.const	$push96=, 100
+	i64.ne  	$push97=, $0, $pop96
+	br_if   	0, $pop97       # 0: down to label22
+# %bb.23:                               # %if.end95
+	i32.const	$push98=, 0
+	call    	exit@FUNCTION, $pop98
 	unreachable
 .LBB12_24:                              # %if.then
 	end_block                       # label22:
@@ -1972,6 +1960,6 @@ gull:
 	.size	gull, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d1a8edc5e..51d92cb1f 100644
--- a/test/torture-s/20041019-1.c.s
+++ b/test/torture-s/20041019-1.c.s
@@ -8,14 +8,13 @@ test_store_ccp:                         # @test_store_ccp
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push22=, $pop10, $pop12
-	tee_local	$push21=, $1=, $pop22
+	i32.sub 	$1=, $pop10, $pop12
 	i32.const	$push17=, 12
-	i32.add 	$push18=, $pop21, $pop17
+	i32.add 	$push18=, $1, $pop17
 	i32.const	$push13=, 8
 	i32.add 	$push14=, $1, $pop13
 	i32.const	$push15=, 4
@@ -25,10 +24,9 @@ test_store_ccp:                         # @test_store_ccp
 	i32.select	$push4=, $pop14, $pop16, $pop3
 	i32.const	$push0=, 5
 	i32.lt_s	$push1=, $0, $pop0
-	i32.select	$push20=, $pop18, $pop4, $pop1
-	tee_local	$push19=, $0=, $pop20
+	i32.select	$0=, $pop18, $pop4, $pop1
 	i32.const	$push5=, 10
-	i32.store	0($pop19), $pop5
+	i32.store	0($0), $pop5
 	i32.const	$push6=, 3
 	i32.store	8($1), $pop6
 	i32.load	$push7=, 0($0)
@@ -47,14 +45,13 @@ test_store_copy_prop:                   # @test_store_copy_prop
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push20=, $pop8, $pop10
-	tee_local	$push19=, $2=, $pop20
+	i32.sub 	$2=, $pop8, $pop10
 	i32.const	$push15=, 12
-	i32.add 	$push16=, $pop19, $pop15
+	i32.add 	$push16=, $2, $pop15
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $2, $pop11
 	i32.const	$push13=, 4
@@ -64,9 +61,8 @@ test_store_copy_prop:                   # @test_store_copy_prop
 	i32.select	$push4=, $pop12, $pop14, $pop3
 	i32.const	$push0=, 5
 	i32.lt_s	$push1=, $0, $pop0
-	i32.select	$push18=, $pop16, $pop4, $pop1
-	tee_local	$push17=, $1=, $pop18
-	i32.store	0($pop17), $0
+	i32.select	$1=, $pop16, $pop4, $pop1
+	i32.store	0($1), $0
 	i32.const	$push5=, 1
 	i32.add 	$push6=, $0, $pop5
 	i32.store	8($2), $pop6
@@ -82,7 +78,7 @@ test_store_copy_prop:                   # @test_store_copy_prop
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -90,4 +86,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20041112-1.c.s b/test/torture-s/20041112-1.c.s
index 8177d70f2..2b466ffbe 100644
--- a/test/torture-s/20041112-1.c.s
+++ b/test/torture-s/20041112-1.c.s
@@ -7,23 +7,21 @@
 bar:                                    # @bar
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push19=, 0
-	i32.load	$push18=, global($pop19)
-	tee_local	$push17=, $0=, $pop18
+	i32.load	$0=, global($pop0)
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop17, $pop1
+	i32.add 	$push2=, $0, $pop1
 	i32.const	$push3=, 2
-	i32.select	$push16=, $pop2, $pop3, $0
-	tee_local	$push15=, $1=, $pop16
+	i32.select	$1=, $pop2, $pop3, $0
+	i32.const	$push15=, 0
 	i32.const	$push14=, 1
 	i32.const	$push5=, global
 	i32.const	$push4=, -1
 	i32.eq  	$push6=, $pop5, $pop4
 	i32.select	$push7=, $1, $pop14, $pop6
-	i32.select	$push8=, $pop15, $pop7, $0
-	i32.store	global($pop0), $pop8
+	i32.select	$push8=, $1, $pop7, $0
+	i32.store	global($pop15), $pop8
 	i32.eqz 	$push10=, $0
 	i32.const	$push13=, global
 	i32.const	$push12=, -1
@@ -40,7 +38,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 2
 	i32.store	global($pop1), $pop0
@@ -60,4 +58,4 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20041113-1.c.s b/test/torture-s/20041113-1.c.s
index a84909e47..69b5315a2 100644
--- a/test/torture-s/20041113-1.c.s
+++ b/test/torture-s/20041113-1.c.s
@@ -7,42 +7,38 @@
 test:                                   # @test
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	i32.const	$push18=, 0
 	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push27=, $pop17, $pop19
-	tee_local	$push26=, $4=, $pop27
-	i32.store	__stack_pointer($pop20), $pop26
+	i32.sub 	$4=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $4
 	i32.const	$push0=, 4
-	i32.add 	$push25=, $1, $pop0
-	tee_local	$push24=, $2=, $pop25
-	i32.store	12($4), $pop24
+	i32.add 	$2=, $1, $pop0
+	i32.store	12($4), $2
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 8
-	i32.add 	$push29=, $1, $pop4
-	tee_local	$push28=, $3=, $pop29
-	i32.store	12($4), $pop28
+	i32.add 	$3=, $1, $pop4
+	i32.store	12($4), $3
 	i32.load	$push5=, 0($2)
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push8=, 12
-	i32.add 	$push31=, $1, $pop8
-	tee_local	$push30=, $2=, $pop31
-	i32.store	12($4), $pop30
+	i32.add 	$2=, $1, $pop8
+	i32.store	12($4), $2
 	i32.load	$push9=, 0($3)
 	i32.const	$push10=, 3
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push12=, 16
 	i32.add 	$push13=, $1, $pop12
 	i32.store	12($4), $pop13
@@ -50,7 +46,7 @@ test:                                   # @test
 	i32.const	$push15=, 4
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push23=, 0
 	i32.const	$push21=, 16
 	i32.add 	$push22=, $4, $pop21
@@ -71,28 +67,40 @@ test:                                   # @test
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+	.local  	f64, i32, i32
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	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
+	i32.sub 	$4=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $4
 	i64.const	$push0=, 12884901890
-	i64.store	4($2):p2align=2, $pop0
+	i64.store	4($4):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.store	0($4), $pop1
 	i32.const	$push11=, 0
-	call    	exit@FUNCTION, $pop11
+	f64.load	$push2=, a($pop11)
+	f64.const	$push3=, 0x1.4p3
+	f64.div 	$2=, $pop2, $pop3
+	block   	
+	block   	
+	f64.abs 	$push4=, $2
+	f64.const	$push5=, 0x1p31
+	f64.lt  	$push6=, $pop4, $pop5
+	br_if   	0, $pop6        # 0: down to label2
+# %bb.1:                                # %entry
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label1
+.LBB1_2:                                # %entry
+	end_block                       # label2:
+	i32.trunc_s/f64	$3=, $2
+.LBB1_3:                                # %entry
+	end_block                       # label1:
+	i32.store	12($4), $3
+	call    	test@FUNCTION, $4, $4
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
 	.endfunc
 .Lfunc_end1:
@@ -108,6 +116,6 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b8300cca3..2be73fbc0 100644
--- a/test/torture-s/20041114-1.c.s
+++ b/test/torture-s/20041114-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,7 +19,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$drop=, v($pop0)
 	i32.const	$push1=, 0
@@ -38,4 +38,4 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20041124-1.c.s b/test/torture-s/20041124-1.c.s
index ca807d733..39087a078 100644
--- a/test/torture-s/20041124-1.c.s
+++ b/test/torture-s/20041124-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, gs($pop0)
 	i32.store	0($0):p2align=1, $pop1
@@ -22,14 +22,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push18=, $pop10, $pop12
-	tee_local	$push17=, $0=, $pop18
-	i32.store	__stack_pointer($pop13), $pop17
+	i32.sub 	$0=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $0
 	i32.const	$push14=, 8
 	i32.add 	$push15=, $0, $pop14
 	call    	foo@FUNCTION, $pop15
@@ -39,17 +38,17 @@ main:                                   # @main
 	i32.load16_u	$push2=, gs($pop16)
 	i32.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load16_u	$push0=, 10($0)
 	i32.const	$push5=, 65535
 	i32.and 	$push7=, $pop0, $pop5
-	i32.const	$push20=, 0
-	i32.load16_u	$push1=, gs+2($pop20)
-	i32.const	$push19=, 65535
-	i32.and 	$push6=, $pop1, $pop19
+	i32.const	$push18=, 0
+	i32.load16_u	$push1=, gs+2($pop18)
+	i32.const	$push17=, 65535
+	i32.and 	$push6=, $pop1, $pop17
 	i32.ne  	$push8=, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -72,6 +71,6 @@ gs:
 	.size	gs, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1fe0ed4b2..a96e9435b 100644
--- a/test/torture-s/20041126-1.c.s
+++ b/test/torture-s/20041126-1.c.s
@@ -6,45 +6,42 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.inc
+# %bb.1:                                # %for.inc
 	i32.load	$push1=, 4($0)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %for.inc.1
+# %bb.2:                                # %for.inc.1
 	i32.load	$push2=, 8($0)
 	br_if   	0, $pop2        # 0: down to label0
-# BB#3:                                 # %for.inc.2
+# %bb.3:                                # %for.inc.2
 	i32.load	$push3=, 12($0)
 	br_if   	0, $pop3        # 0: down to label0
-# BB#4:                                 # %for.inc.3
+# %bb.4:                                # %for.inc.3
 	i32.load	$push4=, 16($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#5:                                 # %for.body3.preheader
-	i32.const	$3=, 5
+# %bb.5:                                # %for.body3.preheader
+	i32.const	$2=, 5
 .LBB0_6:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	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
+	i32.const	$push10=, 1
+	i32.add 	$1=, $2, $pop10
+	i32.const	$push9=, 2
+	i32.shl 	$push5=, $2, $pop9
+	i32.add 	$push6=, $0, $pop5
+	i32.load	$2=, 0($pop6)
+	i32.ne  	$push7=, $2, $1
+	br_if   	1, $pop7        # 1: down to label0
+# %bb.7:                                # %for.cond1
                                         #   in Loop: Header=BB0_6 Depth=1
-	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
+	i32.const	$push11=, 9
+	i32.le_u	$push8=, $2, $pop11
+	br_if   	0, $pop8        # 0: up to label1
+# %bb.8:                                # %for.end10
 	end_loop
 	return
 .LBB0_9:                                # %if.then
@@ -61,63 +58,58 @@ check:                                  # @check
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %for.body3.lr.ph.i
-	i32.const	$push18=, 0
+	.local  	i32, i32, i32
+# %bb.0:                                # %for.body3.lr.ph.i
 	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.sub 	$2=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $2
 	i32.const	$push2=, 16
-	i32.add 	$push27=, $3, $pop2
-	tee_local	$push26=, $2=, $pop27
+	i32.add 	$1=, $2, $pop2
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.a+16($pop0)
-	i64.store	0($pop26), $pop1
+	i64.store	0($1), $pop1
 	i32.const	$push4=, 32
-	i32.add 	$push5=, $3, $pop4
+	i32.add 	$push5=, $2, $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.add 	$push8=, $2, $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
+	i32.store	0($1), $pop23
 	i64.const	$push9=, 0
-	i64.store	8($3), $pop9
+	i64.store	8($2), $pop9
 	i64.const	$push22=, 0
-	i64.store	0($3), $pop22
-	i32.const	$2=, 5
+	i64.store	0($2), $pop22
+	i32.const	$1=, 5
 .LBB1_1:                                # %for.body3.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	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
+	i32.const	$push27=, 1
+	i32.add 	$0=, $1, $pop27
+	i32.const	$push26=, 2
+	i32.shl 	$push10=, $1, $pop26
+	i32.add 	$push11=, $2, $pop10
+	i32.load	$1=, 0($pop11)
+	i32.ne  	$push12=, $1, $0
+	br_if   	1, $pop12       # 1: down to label2
+# %bb.2:                                # %for.cond1.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	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
+	i32.const	$push28=, 9
+	i32.le_u	$push13=, $1, $pop28
+	br_if   	0, $pop13       # 0: up to label3
+# %bb.3:                                # %check.exit
 	end_loop
 	i32.const	$push21=, 0
 	i32.const	$push19=, 48
-	i32.add 	$push20=, $3, $pop19
+	i32.add 	$push20=, $2, $pop19
 	i32.store	__stack_pointer($pop21), $pop20
 	i32.const	$push14=, 0
 	return  	$pop14
@@ -146,5 +138,5 @@ main:                                   # @main
 	.size	.Lmain.a, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20041201-1.c.s b/test/torture-s/20041201-1.c.s
index c2b793747..925a4c5ae 100644
--- a/test/torture-s/20041201-1.c.s
+++ b/test/torture-s/20041201-1.c.s
@@ -8,21 +8,21 @@ checkScc2:                              # @checkScc2
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 1
 	block   	
 	i32.load8_u	$push1=, 0($0)
 	i32.const	$push14=, 1
 	i32.ne  	$push2=, $pop1, $pop14
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load8_u	$push0=, 1($0)
 	i32.const	$push3=, 255
 	i32.and 	$push4=, $pop0, $pop3
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %lor.rhs
+# %bb.2:                                # %lor.rhs
 	i32.load8_u	$push7=, 2($0)
 	i32.const	$push8=, 3
 	i32.ne  	$push9=, $pop7, $pop8
@@ -47,7 +47,7 @@ checkScc2:                              # @checkScc2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 1
 	block   	
 	i32.const	$push15=, 0
@@ -55,7 +55,7 @@ main:                                   # @main
 	i32.const	$push14=, 1
 	i32.ne  	$push2=, $pop1, $pop14
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push16=, 0
 	i32.load8_u	$push0=, s+1($pop16)
 	i32.const	$push3=, 255
@@ -63,7 +63,7 @@ main:                                   # @main
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %lor.rhs.i
+# %bb.2:                                # %lor.rhs.i
 	i32.const	$push7=, 0
 	i32.load8_u	$push11=, s+2($pop7)
 	i32.const	$push12=, 3
@@ -93,4 +93,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20041210-1.c.s b/test/torture-s/20041210-1.c.s
index 55bd20b21..3cb0301e8 100644
--- a/test/torture-s/20041210-1.c.s
+++ b/test/torture-s/20041210-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push9=, 0
 	i32.load	$push1=, x($pop9)
@@ -14,7 +14,7 @@ main:                                   # @main
 	i32.load	$push0=, x+4($pop8)
 	i32.ge_s	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push11=, 0
 	i32.load	$push4=, x+12($pop11)
 	i32.const	$push10=, 0
@@ -23,7 +23,7 @@ main:                                   # @main
 	i32.const	$push6=, -1
 	i32.gt_s	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.then2
+# %bb.2:                                # %if.then2
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_3:                                # %if.end3
@@ -48,6 +48,6 @@ x:
 	.size	x, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b64ee7d4b..9b5d6e1cb 100644
--- a/test/torture-s/20041212-1.c.s
+++ b/test/torture-s/20041212-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, f@FUNCTION
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20041213-2.c.s b/test/torture-s/20041213-2.c.s
index dafd96d5e..ab284bcc2 100644
--- a/test/torture-s/20041213-2.c.s
+++ b/test/torture-s/20041213-2.c.s
@@ -7,27 +7,26 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.eqz 	$push9=, $0
-	br_if   	0, $pop9        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push5=, $0
+	br_if   	0, $pop5        # 0: down to label1
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 0
 	i32.const	$3=, 1
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
+	copy_local	$1=, $3
 	block   	
 	block   	
-	copy_local	$push4=, $3
-	tee_local	$push3=, $1=, $pop4
-	i32.ge_s	$push0=, $2, $pop3
+	i32.ge_s	$push0=, $2, $1
 	br_if   	0, $pop0        # 0: down to label4
-# BB#3:                                 # %for.end.thread
+# %bb.3:                                # %for.end.thread
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push5=, 1
-	i32.shl 	$push2=, $1, $pop5
+	i32.const	$push3=, 1
+	i32.shl 	$push2=, $1, $pop3
 	i32.sub 	$3=, $pop2, $2
 	br      	1               # 1: down to label3
 .LBB0_4:                                # %for.end
@@ -39,11 +38,10 @@ foo:                                    # @foo
 .LBB0_5:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
+	i32.const	$push4=, -1
+	i32.add 	$0=, $0, $pop4
 	copy_local	$2=, $1
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label2
+	br_if   	0, $0           # 0: up to label2
 .LBB0_6:                                # %for.end7
 	end_loop
 	end_block                       # label1:
@@ -62,7 +60,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -73,6 +71,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 cec0adc08..806f3a062 100644
--- a/test/torture-s/20041214-1.c.s
+++ b/test/torture-s/20041214-1.c.s
@@ -8,15 +8,15 @@ g:                                      # @g
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push1=, 0($1)
 	i32.eqz 	$push7=, $pop1
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %do.body.preheader
+# %bb.1:                                # %do_form_string.preheader
 	i32.const	$push4=, 2
 	i32.add 	$1=, $1, $pop4
-.LBB0_2:                                # %do.body
+.LBB0_2:                                # %do_form_string
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.load	$push2=, 0($2)
@@ -44,33 +44,32 @@ g:                                      # @g
 f:                                      # @f
 	.param  	i32, i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop3, $pop5
-	tee_local	$push10=, $4=, $pop11
-	i32.store	__stack_pointer($pop6), $pop10
+	i32.sub 	$4=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $4
 	i32.store	12($4), $2
 	block   	
 	i32.load8_u	$push1=, 0($1)
-	i32.eqz 	$push15=, $pop1
-	br_if   	0, $pop15       # 0: down to label2
-# BB#1:                                 # %if.end.i
-	i32.const	$push12=, 2
-	i32.add 	$1=, $1, $pop12
+	i32.eqz 	$push13=, $pop1
+	br_if   	0, $pop13       # 0: down to label2
+# %bb.1:                                # %if.end.i
+	i32.const	$push10=, 2
+	i32.add 	$1=, $1, $pop10
 	i32.load	$2=, 12($4)
-.LBB1_2:                                # %do.body.i
+.LBB1_2:                                # %do_form_string.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
 	i32.load	$push2=, 0($2)
 	i32.call	$drop=, strcpy@FUNCTION, $0, $pop2
-	i32.const	$push14=, 4
-	i32.add 	$2=, $2, $pop14
+	i32.const	$push12=, 4
+	i32.add 	$2=, $2, $pop12
 	i32.load8_u	$3=, 0($1)
-	i32.const	$push13=, 2
-	i32.add 	$push0=, $1, $pop13
+	i32.const	$push11=, 2
+	i32.add 	$push0=, $1, $pop11
 	copy_local	$1=, $pop0
 	br_if   	0, $3           # 0: up to label3
 .LBB1_3:                                # %g.exit
@@ -92,14 +91,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 32
-	i32.sub 	$push17=, $pop3, $pop5
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop6), $pop16
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push15=, 0
 	i32.store	4($0), $pop15
 	i32.const	$push0=, .L.str.1
@@ -114,13 +112,13 @@ main:                                   # @main
 	i32.const	$push14=, .L.str.1
 	i32.call	$push2=, strcmp@FUNCTION, $pop13, $pop14
 	br_if   	0, $pop2        # 0: down to label4
-# BB#1:                                 # %if.end
+# %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	$push18=, 0
-	return  	$pop18
+	i32.const	$push16=, 0
+	return  	$pop16
 .LBB2_2:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
@@ -141,7 +139,7 @@ main:                                   # @main
 	.size	.L.str.1, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5df6eef95..cd4799478 100644
--- a/test/torture-s/20041218-1.c.s
+++ b/test/torture-s/20041218-1.c.s
@@ -7,7 +7,7 @@
 dummy1:                                 # @dummy1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ dummy1:                                 # @dummy1
 dummy2:                                 # @dummy2
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -36,7 +36,7 @@ dummy2:                                 # @dummy2
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1431655765
 	i32.store	baz.v+40($pop1), $pop0
@@ -68,29 +68,29 @@ baz:                                    # @baz
 check:                                  # @check
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($1)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push1=, 4($1)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $1, $pop2
 	i32.load	$push4=, 0($pop3)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false5
+# %bb.3:                                # %lor.lhs.false5
 	i32.const	$push5=, 12
 	i32.add 	$push6=, $1, $pop5
 	i32.load	$push7=, 0($pop6)
 	br_if   	0, $pop7        # 0: down to label0
-# BB#4:                                 # %lor.lhs.false8
+# %bb.4:                                # %lor.lhs.false8
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $1, $pop8
 	i32.load8_u	$push10=, 0($pop9)
 	br_if   	0, $pop10       # 0: down to label0
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	i32.const	$push11=, 1
 	return  	$pop11
 .LBB3_6:                                # %if.then
@@ -108,19 +108,19 @@ check:                                  # @check
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %for.cond
+# %bb.0:                                # %for.cond
 	i32.const	$push5=, 0
 	i32.store	0($2), $pop5
 	block   	
 	block   	
 	i32.eqz 	$push20=, $1
 	br_if   	0, $pop20       # 0: down to label2
-# BB#1:                                 # %for.body
+# %bb.1:                                # %for.body
 	i32.load	$push0=, 0($0)
 	i32.const	$push6=, 1
 	i32.eq  	$push1=, $pop0, $pop6
 	br_if   	1, $pop1        # 1: down to label1
-# BB#2:                                 # %cleanup2
+# %bb.2:                                # %cleanup2
 	i32.const	$push7=, 1
 	return  	$pop7
 .LBB4_3:                                # %for.end
@@ -163,14 +163,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push11=, $pop1, $pop3
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop4), $pop10
+	i32.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push0=, 1
 	i32.store	12($0), $pop0
 	i32.const	$push5=, 12
@@ -199,6 +198,6 @@ baz.v:
 	.size	baz.v, 44
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9b48b5341..b840067a2 100644
--- a/test/torture-s/20050104-1.c.s
+++ b/test/torture-s/20050104-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 10
 	i64.gt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,5 +35,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050106-1.c.s b/test/torture-s/20050106-1.c.s
index 7a7795bd3..6e8c28609 100644
--- a/test/torture-s/20050106-1.c.s
+++ b/test/torture-s/20050106-1.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load16_s	$push0=, u($pop3)
 	i32.const	$push1=, -1
 	i32.le_s	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -34,5 +34,5 @@ u:
 	.size	u, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050107-1.c.s b/test/torture-s/20050107-1.c.s
index a718c46e0..01582d9f7 100644
--- a/test/torture-s/20050107-1.c.s
+++ b/test/torture-s/20050107-1.c.s
@@ -6,18 +6,18 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load8_u	$push3=, 1($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -33,7 +33,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %foo.exit
+# %bb.0:                                # %foo.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -41,5 +41,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050111-1.c.s b/test/torture-s/20050111-1.c.s
index 384bcca9c..bd0924175 100644
--- a/test/torture-s/20050111-1.c.s
+++ b/test/torture-s/20050111-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i64.const	$push0=, 32
 	i64.shr_u	$push1=, $0, $pop0
@@ -26,7 +26,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.extend_u/i32	$push0=, $0
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
@@ -41,7 +41,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end16
+# %bb.0:                                # %if.end16
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,4 +49,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050119-1.c.s b/test/torture-s/20050119-1.c.s
index a2f6d1e34..8357875a9 100644
--- a/test/torture-s/20050119-1.c.s
+++ b/test/torture-s/20050119-1.c.s
@@ -6,18 +6,18 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push1=, 0($0)
 	i32.load8_u	$push0=, 1($0)
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load8_u	$push3=, 2($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end7
+# %bb.2:                                # %if.end7
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -34,14 +34,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	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
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i64.const	$push0=, 283686935331073
 	i64.store	8($0), $pop0
 	i32.const	$push6=, 8
@@ -55,6 +54,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a1cf75931..6f7b229d7 100644
--- a/test/torture-s/20050119-2.c.s
+++ b/test/torture-s/20050119-2.c.s
@@ -7,18 +7,18 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push1=, 0($0)
 	i32.load8_u	$push0=, 1($0)
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load8_u	$push3=, 2($0)
 	i32.const	$push4=, 2
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end7
+# %bb.2:                                # %if.end7
 	i32.load8_u	$push6=, 3($0)
 	return  	$pop6
 .LBB0_3:                                # %if.then
@@ -35,7 +35,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -44,6 +44,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3e12f4970..3dec4dbdf 100644
--- a/test/torture-s/20050121-1.c.s
+++ b/test/torture-s/20050121-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo_float,@function
 foo_float:                              # @foo_float
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	f32.convert_s/i32	$push2=, $pop1
@@ -26,7 +26,7 @@ foo_float:                              # @foo_float
 	.type	bar_float,@function
 bar_float:                              # @bar_float
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1086324736
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -40,7 +40,7 @@ bar_float:                              # @bar_float
 	.type	baz_float,@function
 baz_float:                              # @baz_float
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1082130432
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -54,7 +54,7 @@ baz_float:                              # @baz_float
 	.type	foo_double,@function
 foo_double:                             # @foo_double
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	f64.convert_s/i32	$push2=, $pop1
@@ -74,7 +74,7 @@ foo_double:                             # @foo_double
 	.type	bar_double,@function
 bar_double:                             # @bar_double
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4618441417868443648
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -88,7 +88,7 @@ bar_double:                             # @bar_double
 	.type	baz_double,@function
 baz_double:                             # @baz_double
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4616189618054758400
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -103,14 +103,13 @@ baz_double:                             # @baz_double
 foo_ldouble_t:                          # @foo_ldouble_t
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push17=, 0
-	i32.const	$push15=, 0
-	i32.load	$push14=, __stack_pointer($pop15)
-	i32.const	$push16=, 32
-	i32.sub 	$push28=, $pop14, $pop16
-	tee_local	$push27=, $2=, $pop28
-	i32.store	__stack_pointer($pop17), $pop27
+# %bb.0:                                # %entry
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
+	i32.const	$push15=, 32
+	i32.sub 	$2=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $2
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	call    	__floatsitf@FUNCTION, $2, $pop1
@@ -122,25 +121,23 @@ foo_ldouble_t:                          # @foo_ldouble_t
 	i64.store	0($pop3), $pop6
 	i64.load	$push7=, 0($2)
 	i64.store	16($0), $pop7
-	i32.const	$push21=, 16
-	i32.add 	$push22=, $2, $pop21
+	i32.const	$push20=, 16
+	i32.add 	$push21=, $2, $pop20
 	i32.const	$push8=, 1
 	i32.add 	$push9=, $1, $pop8
-	call    	__floatsitf@FUNCTION, $pop22, $pop9
-	i32.const	$push26=, 8
-	i32.add 	$push10=, $0, $pop26
-	i32.const	$push23=, 16
-	i32.add 	$push24=, $2, $pop23
-	i32.const	$push25=, 8
-	i32.add 	$push11=, $pop24, $pop25
-	i64.load	$push12=, 0($pop11)
-	i64.store	0($pop10), $pop12
-	i64.load	$push13=, 16($2)
-	i64.store	0($0), $pop13
-	i32.const	$push20=, 0
-	i32.const	$push18=, 32
-	i32.add 	$push19=, $2, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
+	call    	__floatsitf@FUNCTION, $pop21, $pop9
+	i32.const	$push22=, 16
+	i32.add 	$push23=, $2, $pop22
+	i32.const	$push24=, 8
+	i32.add 	$push10=, $pop23, $pop24
+	i64.load	$push11=, 0($pop10)
+	i64.store	8($0), $pop11
+	i64.load	$push12=, 16($2)
+	i64.store	0($0), $pop12
+	i32.const	$push19=, 0
+	i32.const	$push17=, 32
+	i32.add 	$push18=, $2, $pop17
+	i32.store	__stack_pointer($pop19), $pop18
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -152,13 +149,11 @@ foo_ldouble_t:                          # @foo_ldouble_t
 	.type	bar_ldouble_t,@function
 bar_ldouble_t:                          # @bar_ldouble_t
 	.param  	i32
-# BB#0:                                 # %entry
-	i64.const	$push0=, 0
-	i64.store	0($0), $pop0
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $0, $pop1
-	i64.const	$push3=, 4612108230892453888
-	i64.store	0($pop2), $pop3
+# %bb.0:                                # %entry
+	i64.const	$push0=, 4612108230892453888
+	i64.store	8($0), $pop0
+	i64.const	$push1=, 0
+	i64.store	0($0), $pop1
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end7:
@@ -170,13 +165,11 @@ bar_ldouble_t:                          # @bar_ldouble_t
 	.type	baz_ldouble_t,@function
 baz_ldouble_t:                          # @baz_ldouble_t
 	.param  	i32
-# BB#0:                                 # %entry
-	i64.const	$push0=, 0
-	i64.store	0($0), $pop0
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $0, $pop1
-	i64.const	$push3=, 4611967493404098560
-	i64.store	0($pop2), $pop3
+# %bb.0:                                # %entry
+	i64.const	$push0=, 4611967493404098560
+	i64.store	8($0), $pop0
+	i64.const	$push1=, 0
+	i64.store	0($0), $pop1
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end8:
@@ -188,7 +181,7 @@ baz_ldouble_t:                          # @baz_ldouble_t
 	.type	foo_char,@function
 foo_char:                               # @foo_char
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 255
 	i32.add 	$push1=, $1, $pop0
 	i32.store8	1($0), $pop1
@@ -206,7 +199,7 @@ foo_char:                               # @foo_char
 	.type	bar_char,@function
 bar_char:                               # @bar_char
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.store8	0($0), $pop0
                                         # fallthrough-return
@@ -220,7 +213,7 @@ bar_char:                               # @bar_char
 	.type	baz_char,@function
 baz_char:                               # @baz_char
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.store8	0($0), $pop0
                                         # fallthrough-return
@@ -234,7 +227,7 @@ baz_char:                               # @baz_char
 	.type	foo_short,@function
 foo_short:                              # @foo_short
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
 	i32.add 	$push1=, $1, $pop0
 	i32.store16	2($0), $pop1
@@ -252,7 +245,7 @@ foo_short:                              # @foo_short
 	.type	bar_short,@function
 bar_short:                              # @bar_short
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.store16	0($0), $pop0
                                         # fallthrough-return
@@ -266,7 +259,7 @@ bar_short:                              # @bar_short
 	.type	baz_short,@function
 baz_short:                              # @baz_short
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.store16	0($0), $pop0
                                         # fallthrough-return
@@ -280,7 +273,7 @@ baz_short:                              # @baz_short
 	.type	foo_int,@function
 foo_int:                                # @foo_int
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	i32.store	4($0), $pop1
@@ -298,7 +291,7 @@ foo_int:                                # @foo_int
 	.type	bar_int,@function
 bar_int:                                # @bar_int
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -312,7 +305,7 @@ bar_int:                                # @bar_int
 	.type	baz_int,@function
 baz_int:                                # @baz_int
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -326,7 +319,7 @@ baz_int:                                # @baz_int
 	.type	foo_long,@function
 foo_long:                               # @foo_long
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	i32.store	4($0), $pop1
@@ -344,7 +337,7 @@ foo_long:                               # @foo_long
 	.type	bar_long,@function
 bar_long:                               # @bar_long
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -358,7 +351,7 @@ bar_long:                               # @bar_long
 	.type	baz_long,@function
 baz_long:                               # @baz_long
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -372,7 +365,7 @@ baz_long:                               # @baz_long
 	.type	foo_llong,@function
 foo_llong:                              # @foo_llong
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	i64.extend_s/i32	$push2=, $pop1
@@ -392,7 +385,7 @@ foo_llong:                              # @foo_llong
 	.type	bar_llong,@function
 bar_llong:                              # @bar_llong
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 6
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -406,7 +399,7 @@ bar_llong:                              # @bar_llong
 	.type	baz_llong,@function
 baz_llong:                              # @baz_llong
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 4
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -420,7 +413,7 @@ baz_llong:                              # @baz_llong
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end65
+# %bb.0:                                # %if.end65
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -428,4 +421,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end24-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050124-1.c.s b/test/torture-s/20050124-1.c.s
index 9142a27ea..4cf593735 100644
--- a/test/torture-s/20050124-1.c.s
+++ b/test/torture-s/20050124-1.c.s
@@ -8,18 +8,18 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.add 	$2=, $0, $pop0
 	block   	
 	block   	
 	i32.eqz 	$push7=, $1
 	br_if   	0, $pop7        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push1=, 0
 	i32.lt_s	$push2=, $0, $pop1
 	br_if   	1, $pop2        # 1: down to label0
-# BB#2:                                 # %if.then1
+# %bb.2:                                # %if.then1
 	i32.const	$push6=, 2
 	i32.add 	$2=, $0, $pop6
 .LBB0_3:                                # %if.end5
@@ -41,7 +41,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end28
+# %bb.0:                                # %if.end28
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,4 +49,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050125-1.c.s b/test/torture-s/20050125-1.c.s
index a116e417f..3a6e4385c 100644
--- a/test/torture-s/20050125-1.c.s
+++ b/test/torture-s/20050125-1.c.s
@@ -7,7 +7,7 @@
 seterr:                                 # @seterr
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.store	8($0), $1
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
@@ -22,15 +22,14 @@ seterr:                                 # @seterr
 bracket_empty:                          # @bracket_empty
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($0)
 	block   	
 	block   	
-	i32.load	$push9=, 0($0)
-	tee_local	$push8=, $1=, $pop9
 	i32.load	$push0=, 4($0)
-	i32.ge_u	$push1=, $pop8, $pop0
+	i32.ge_u	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %land.lhs.true
+# %bb.1:                                # %land.lhs.true
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $1, $pop2
 	i32.store	0($0), $pop3
@@ -56,7 +55,7 @@ bracket_empty:                          # @bracket_empty
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -64,4 +63,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050131-1.c.s b/test/torture-s/20050131-1.c.s
index effe27a1c..903a5482f 100644
--- a/test/torture-s/20050131-1.c.s
+++ b/test/torture-s/20050131-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20050203-1.c.s b/test/torture-s/20050203-1.c.s
index a027df480..23ac49856 100644
--- a/test/torture-s/20050203-1.c.s
+++ b/test/torture-s/20050203-1.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push10=, $pop3, $pop5
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop6), $pop9
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push7=, 15
 	i32.add 	$push8=, $0, $pop7
 	call    	foo@FUNCTION, $pop8
@@ -24,7 +23,7 @@ main:                                   # @main
 	i32.const	$push0=, -1
 	i32.gt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -40,7 +39,7 @@ main:                                   # @main
 	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 129
 	i32.store8	0($0), $pop0
                                         # fallthrough-return
@@ -51,7 +50,7 @@ foo:                                    # @foo
 	.section	.text.bar,"ax",@progbits
 	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -60,6 +59,6 @@ bar:                                    # @bar
 	.size	bar, .Lfunc_end2-bar
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 939ddad3c..22af6cfec 100644
--- a/test/torture-s/20050215-1.c.s
+++ b/test/torture-s/20050215-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -15,7 +15,7 @@ main:                                   # @main
 	i32.and 	$push1=, $pop13, $pop0
 	i32.eqz 	$push17=, $pop1
 	br_if   	0, $pop17       # 0: down to label2
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push14=, v
 	i32.const	$push10=, 7
 	i32.and 	$push11=, $pop14, $pop10
@@ -56,5 +56,5 @@ v:
 	.size	v, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050218-1.c.s b/test/torture-s/20050218-1.c.s
index 88e221871..86da02426 100644
--- a/test/torture-s/20050218-1.c.s
+++ b/test/torture-s/20050218-1.c.s
@@ -7,45 +7,42 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.eqz 	$push14=, $2
-	br_if   	0, $pop14       # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
-	i32.const	$5=, 0
-	i32.const	$4=, a
+	i32.eqz 	$push8=, $2
+	br_if   	0, $pop8        # 0: down to label1
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$6=, 0
+	i32.const	$5=, a
+	i32.const	$7=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.add 	$push0=, $0, $5
-	i32.load	$push9=, 0($4)
-	tee_local	$push8=, $3=, $pop9
-	i32.call	$push7=, strlen@FUNCTION, $3
-	tee_local	$push6=, $3=, $pop7
-	i32.call	$push1=, strncmp@FUNCTION, $pop0, $pop8, $pop6
+	i32.load	$4=, 0($5)
+	i32.call	$3=, strlen@FUNCTION, $4
+	i32.add 	$push0=, $0, $6
+	i32.call	$push1=, strncmp@FUNCTION, $pop0, $4, $3
 	br_if   	2, $pop1        # 2: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.add 	$5=, $3, $5
+	i32.add 	$6=, $3, $6
 	block   	
-	i32.eqz 	$push15=, $1
-	br_if   	0, $pop15       # 0: down to label3
-# BB#4:                                 # %if.then6
+	i32.eqz 	$push9=, $1
+	br_if   	0, $pop9        # 0: down to label3
+# %bb.4:                                # %if.then6
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.call	$push2=, strlen@FUNCTION, $1
-	i32.add 	$5=, $pop2, $5
+	i32.add 	$6=, $pop2, $6
 .LBB0_5:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
-	i32.const	$push13=, 4
-	i32.add 	$4=, $4, $pop13
-	i32.const	$push12=, 1
-	i32.add 	$push11=, $6, $pop12
-	tee_local	$push10=, $6=, $pop11
-	i32.lt_u	$push3=, $pop10, $2
+	i32.const	$push7=, 4
+	i32.add 	$5=, $5, $pop7
+	i32.const	$push6=, 1
+	i32.add 	$7=, $7, $pop6
+	i32.lt_u	$push3=, $7, $2
 	br_if   	0, $pop3        # 0: up to label2
 .LBB0_6:
 	end_loop
@@ -66,40 +63,35 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push9=, 0
+	i32.load	$2=, a($pop9)
+	i32.call	$0=, strlen@FUNCTION, $2
 	block   	
-	i32.const	$push13=, .L.str.4
-	i32.const	$push12=, 0
-	i32.load	$push11=, a($pop12)
-	tee_local	$push10=, $0=, $pop11
-	i32.call	$push9=, strlen@FUNCTION, $0
-	tee_local	$push8=, $0=, $pop9
-	i32.call	$push0=, strncmp@FUNCTION, $pop13, $pop10, $pop8
+	i32.const	$push8=, .L.str.4
+	i32.call	$push0=, strncmp@FUNCTION, $pop8, $2, $0
 	br_if   	0, $pop0        # 0: down to label4
-# BB#1:                                 # %if.end.i
-	i32.const	$push19=, .L.str.4
-	i32.add 	$push1=, $0, $pop19
-	i32.const	$push18=, 0
-	i32.load	$push17=, a+4($pop18)
-	tee_local	$push16=, $1=, $pop17
-	i32.call	$push15=, strlen@FUNCTION, $1
-	tee_local	$push14=, $1=, $pop15
-	i32.call	$push2=, strncmp@FUNCTION, $pop1, $pop16, $pop14
+# %bb.1:                                # %if.end.i
+	i32.const	$push11=, 0
+	i32.load	$2=, a+4($pop11)
+	i32.call	$1=, strlen@FUNCTION, $2
+	i32.const	$push10=, .L.str.4
+	i32.add 	$push1=, $0, $pop10
+	i32.call	$push2=, strncmp@FUNCTION, $pop1, $2, $1
 	br_if   	0, $pop2        # 0: down to label4
-# BB#2:                                 # %if.end.i.1
+# %bb.2:                                # %if.end.i.1
+	i32.const	$push12=, 0
+	i32.load	$2=, a+8($pop12)
 	i32.add 	$push3=, $1, $0
 	i32.const	$push4=, .L.str.4
 	i32.add 	$push5=, $pop3, $pop4
-	i32.const	$push22=, 0
-	i32.load	$push21=, a+8($pop22)
-	tee_local	$push20=, $0=, $pop21
-	i32.call	$push6=, strlen@FUNCTION, $0
-	i32.call	$push7=, strncmp@FUNCTION, $pop5, $pop20, $pop6
+	i32.call	$push6=, strlen@FUNCTION, $2
+	i32.call	$push7=, strncmp@FUNCTION, $pop5, $2, $pop6
 	br_if   	0, $pop7        # 0: down to label4
-# BB#3:                                 # %if.end.i.2
-	i32.const	$push23=, 0
-	return  	$pop23
+# %bb.3:                                # %if.end.i.2
+	i32.const	$push13=, 0
+	return  	$pop13
 .LBB1_4:                                # %if.then
 	end_block                       # label4:
 	call    	abort@FUNCTION
@@ -160,7 +152,7 @@ a:
 	.size	.L.str.4, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8e6791858..f1e74beac 100644
--- a/test/torture-s/20050224-1.c.s
+++ b/test/torture-s/20050224-1.c.s
@@ -6,20 +6,20 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 245
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 36
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 444
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -36,26 +36,24 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$8=, 0
+	i32.const	$push14=, 0
+	i32.load	$0=, b($pop14)
+	i32.const	$push13=, 0
+	i32.load	$5=, a($pop13)
 	block   	
+	i32.ge_u	$push0=, $5, $0
+	br_if   	0, $pop0        # 0: down to label1
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push18=, 0
-	i32.load	$push17=, a($pop18)
-	tee_local	$push16=, $5=, $pop17
+	i32.load	$4=, f($pop18)
+	i32.const	$push17=, 0
+	i32.load	$3=, e($pop17)
+	i32.const	$push16=, 0
+	i32.load	$2=, d($pop16)
 	i32.const	$push15=, 0
-	i32.load	$push14=, b($pop15)
-	tee_local	$push13=, $0=, $pop14
-	i32.ge_u	$push0=, $pop16, $pop13
-	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
-	i32.const	$push22=, 0
-	i32.load	$4=, f($pop22)
-	i32.const	$push21=, 0
-	i32.load	$3=, e($pop21)
-	i32.const	$push20=, 0
-	i32.load	$2=, d($pop20)
-	i32.const	$push19=, 0
-	i32.load	$1=, c($pop19)
+	i32.load	$1=, c($pop15)
 	i32.const	$7=, 0
 	i32.const	$6=, 0
 .LBB1_2:                                # %for.body
@@ -65,10 +63,10 @@ main:                                   # @main
 	block   	
 	i32.ge_u	$push1=, $5, $1
 	br_if   	0, $pop1        # 0: down to label4
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
                                         #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push23=, 1
-	i32.add 	$6=, $6, $pop23
+	i32.const	$push19=, 1
+	i32.add 	$6=, $6, $pop19
 	br      	1               # 1: down to label3
 .LBB1_4:                                # %if.else
                                         #   in Loop: Header=BB1_2 Depth=1
@@ -76,14 +74,14 @@ main:                                   # @main
 	block   	
 	i32.lt_u	$push2=, $5, $2
 	br_if   	0, $pop2        # 0: down to label5
-# BB#5:                                 # %if.else
+# %bb.5:                                # %if.else
                                         #   in Loop: Header=BB1_2 Depth=1
 	i32.ge_u	$push3=, $5, $3
 	br_if   	0, $pop3        # 0: down to label5
-# BB#6:                                 # %if.then4
+# %bb.6:                                # %if.then4
                                         #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push24=, 1
-	i32.add 	$8=, $8, $pop24
+	i32.const	$push20=, 1
+	i32.add 	$8=, $8, $pop20
 	br      	1               # 1: down to label3
 .LBB1_7:                                # %if.else6
                                         #   in Loop: Header=BB1_2 Depth=1
@@ -93,25 +91,24 @@ main:                                   # @main
 .LBB1_8:                                # %for.inc
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label3:
-	i32.const	$push27=, 4096
-	i32.add 	$push26=, $5, $pop27
-	tee_local	$push25=, $5=, $pop26
-	i32.lt_u	$push5=, $pop25, $0
+	i32.const	$push21=, 4096
+	i32.add 	$5=, $5, $pop21
+	i32.lt_u	$push5=, $5, $0
 	br_if   	0, $pop5        # 0: up to label2
-# BB#9:                                 # %for.end
+# %bb.9:                                # %for.end
 	end_loop
 	i32.const	$push6=, 444
 	i32.ne  	$push7=, $6, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#10:                                # %for.end
+# %bb.10:                               # %for.end
 	i32.const	$push8=, 245
 	i32.ne  	$push9=, $7, $pop8
 	br_if   	0, $pop9        # 0: down to label1
-# BB#11:                                # %for.end
+# %bb.11:                               # %for.end
 	i32.const	$push10=, 36
 	i32.ne  	$push11=, $8, $pop10
 	br_if   	0, $pop11       # 0: down to label1
-# BB#12:                                # %foo.exit
+# %bb.12:                               # %foo.exit
 	i32.const	$push12=, 0
 	return  	$pop12
 .LBB1_13:                               # %if.then.i
@@ -177,5 +174,5 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050316-1.c.s b/test/torture-s/20050316-1.c.s
index c900f563c..af4fdd229 100644
--- a/test/torture-s/20050316-1.c.s
+++ b/test/torture-s/20050316-1.c.s
@@ -6,7 +6,7 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,13 +33,9 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.param  	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 4
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, 0
-	i32.store	0($pop1), $pop2
-	i32.const	$push3=, 0
-	i32.store	0($0), $pop3
+# %bb.0:                                # %entry
+	i64.const	$push0=, 0
+	i64.store	0($0), $pop0
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -51,7 +47,7 @@ test3:                                  # @test3
 	.type	test4,@function
 test4:                                  # @test4
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 65535
 	i32.and 	$push3=, $1, $pop2
 	i32.const	$push0=, 16
@@ -70,10 +66,8 @@ test4:                                  # @test4
 	.type	test5,@function
 test5:                                  # @test5
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 4
-	i32.add 	$push1=, $0, $pop0
-	i32.store	0($pop1), $2
+# %bb.0:                                # %entry
+	i32.store	4($0), $2
 	i32.store	0($0), $1
                                         # fallthrough-return
 	.endfunc
@@ -86,7 +80,7 @@ test5:                                  # @test5
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end30
+# %bb.0:                                # %if.end30
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -94,4 +88,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end5-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050316-2.c.s b/test/torture-s/20050316-2.c.s
index 614abc3f6..3a8777b58 100644
--- a/test/torture-s/20050316-2.c.s
+++ b/test/torture-s/20050316-2.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	f32, f32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.reinterpret/f32	$push4=, $0
 	i64.extend_u/i32	$push5=, $pop4
 	i32.reinterpret/f32	$push0=, $1
@@ -27,7 +27,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	f32, f32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.reinterpret/f32	$push4=, $0
 	i64.extend_u/i32	$push5=, $pop4
 	i32.reinterpret/f32	$push0=, $1
@@ -47,7 +47,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.extend_u/i32	$push3=, $0
 	i64.extend_u/i32	$push0=, $1
 	i64.const	$push1=, 32
@@ -64,7 +64,7 @@ test3:                                  # @test3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end33
+# %bb.0:                                # %if.end33
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -72,4 +72,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050316-3.c.s b/test/torture-s/20050316-3.c.s
index dea6387ed..fbc1904e0 100644
--- a/test/torture-s/20050316-3.c.s
+++ b/test/torture-s/20050316-3.c.s
@@ -6,10 +6,8 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 4
-	i32.add 	$push1=, $0, $pop0
-	i32.store	0($pop1), $2
+# %bb.0:                                # %entry
+	i32.store	4($0), $2
 	i32.store	0($0), $1
                                         # fallthrough-return
 	.endfunc
@@ -23,7 +21,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.extend_u/i32	$push3=, $0
 	i64.extend_u/i32	$push0=, $1
 	i64.const	$push1=, 32
@@ -40,7 +38,7 @@ test2:                                  # @test2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end13
+# %bb.0:                                # %if.end13
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -48,4 +46,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050410-1.c.s b/test/torture-s/20050410-1.c.s
index c1e6327f3..69b50478a 100644
--- a/test/torture-s/20050410-1.c.s
+++ b/test/torture-s/20050410-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, s($pop0)
 	i32.const	$push2=, 24
@@ -28,13 +28,13 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push1=, foo@FUNCTION
 	i32.const	$push0=, 95
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	call    	exit@FUNCTION, $pop3
 	unreachable
@@ -56,6 +56,6 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 11d1c0b49..305d34dc7 100644
--- a/test/torture-s/20050502-1.c.s
+++ b/test/torture-s/20050502-1.c.s
@@ -8,11 +8,10 @@ bar:                                    # @bar
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.load	$push4=, 0($0)
-	tee_local	$push3=, $1=, $pop4
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($0)
 	i32.const	$push0=, 1
-	i32.add 	$push1=, $pop3, $pop0
+	i32.add 	$push1=, $1, $pop0
 	i32.store	0($0), $pop1
 	i32.load8_s	$push2=, 0($1)
                                         # fallthrough-return: $pop2
@@ -27,7 +26,7 @@ bar:                                    # @bar
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 64
 	i32.ne  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -42,26 +41,24 @@ baz:                                    # @baz
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$push1=, bar@FUNCTION, $0
 	i32.store8	0($1), $pop1
+	i32.call	$6=, bar@FUNCTION, $0
+	i32.const	$push2=, 255
+	i32.and 	$5=, $6, $pop2
 	i32.const	$7=, 1
 	block   	
-	i32.call	$push21=, bar@FUNCTION, $0
-	tee_local	$push20=, $6=, $pop21
-	i32.const	$push2=, 255
-	i32.and 	$push19=, $pop20, $pop2
-	tee_local	$push18=, $5=, $pop19
 	i32.const	$push5=, 39
-	i32.eq  	$push6=, $pop18, $pop5
+	i32.eq  	$push6=, $5, $pop5
 	i32.and 	$push7=, $pop6, $2
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push3=, 34
 	i32.eq  	$push4=, $5, $pop3
 	i32.and 	$push0=, $pop4, $3
 	br_if   	0, $pop0        # 0: down to label0
-# BB#2:                                 # %if.end14.lr.ph
+# %bb.2:                                # %if.end14.lr.ph
 	i32.or  	$4=, $2, $3
 	i32.const	$7=, 1
 .LBB2_3:                                # %if.end14
@@ -69,38 +66,36 @@ foo:                                    # @foo
 	loop    	                # label1:
 	block   	
 	br_if   	0, $4           # 0: down to label2
-# BB#4:                                 # %land.lhs.true18
+# %bb.4:                                # %land.lhs.true18
                                         #   in Loop: Header=BB2_3 Depth=1
-	i32.const	$push23=, 24
-	i32.shl 	$push8=, $6, $pop23
-	i32.const	$push22=, 24
-	i32.shr_s	$push9=, $pop8, $pop22
+	i32.const	$push19=, 24
+	i32.shl 	$push8=, $6, $pop19
+	i32.const	$push18=, 24
+	i32.shr_s	$push9=, $pop8, $pop18
 	i32.call	$push10=, baz@FUNCTION, $pop9
-	i32.eqz 	$push32=, $pop10
-	br_if   	2, $pop32       # 2: down to label0
+	i32.eqz 	$push24=, $pop10
+	br_if   	2, $pop24       # 2: down to label0
 .LBB2_5:                                # %if.end23
                                         #   in Loop: Header=BB2_3 Depth=1
 	end_block                       # label2:
 	i32.add 	$push12=, $1, $7
 	i32.store8	0($pop12), $6
-	i32.const	$push30=, 1
-	i32.add 	$7=, $7, $pop30
-	i32.call	$push29=, bar@FUNCTION, $0
-	tee_local	$push28=, $6=, $pop29
-	i32.const	$push27=, 255
-	i32.and 	$push26=, $pop28, $pop27
-	tee_local	$push25=, $5=, $pop26
-	i32.const	$push24=, 39
-	i32.eq  	$push14=, $pop25, $pop24
+	i32.const	$push22=, 1
+	i32.add 	$7=, $7, $pop22
+	i32.call	$6=, bar@FUNCTION, $0
+	i32.const	$push21=, 255
+	i32.and 	$5=, $6, $pop21
+	i32.const	$push20=, 39
+	i32.eq  	$push14=, $5, $pop20
 	i32.and 	$push15=, $pop14, $2
 	br_if   	1, $pop15       # 1: down to label0
-# BB#6:                                 # %if.end23
+# %bb.6:                                # %if.end23
                                         #   in Loop: Header=BB2_3 Depth=1
-	i32.const	$push31=, 34
-	i32.eq  	$push13=, $5, $pop31
+	i32.const	$push23=, 34
+	i32.eq  	$push13=, $5, $pop23
 	i32.and 	$push11=, $pop13, $3
-	i32.eqz 	$push33=, $pop11
-	br_if   	0, $pop33       # 0: up to label1
+	i32.eqz 	$push25=, $pop11
+	br_if   	0, $pop25       # 0: up to label1
 .LBB2_7:                                # %while.end
 	end_loop
 	end_block                       # label0:
@@ -119,14 +114,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push41=, 0
+# %bb.0:                                # %entry
 	i32.const	$push39=, 0
 	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 80
-	i32.sub 	$push76=, $pop38, $pop40
-	tee_local	$push75=, $0=, $pop76
-	i32.store	__stack_pointer($pop41), $pop75
+	i32.sub 	$0=, $pop38, $pop40
+	i32.const	$push41=, 0
+	i32.store	__stack_pointer($pop41), $0
 	i32.const	$push0=, .L.str
 	i32.store	12($0), $pop0
 	i32.const	$push45=, 12
@@ -141,13 +135,13 @@ main:                                   # @main
 	i32.const	$push3=, .L.str.1
 	i32.call	$push5=, strcmp@FUNCTION, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label3
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push49=, 16
 	i32.add 	$push50=, $0, $pop49
 	i32.const	$push6=, .L.str.2
 	i32.call	$push7=, strcmp@FUNCTION, $pop50, $pop6
 	br_if   	0, $pop7        # 0: down to label3
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push8=, .L.str.3
 	i32.store	12($0), $pop8
 	i32.const	$push51=, 12
@@ -161,13 +155,13 @@ main:                                   # @main
 	i32.const	$push11=, .L.str.4
 	i32.call	$push13=, strcmp@FUNCTION, $pop12, $pop11
 	br_if   	0, $pop13       # 0: down to label3
-# BB#3:                                 # %lor.lhs.false7
+# %bb.3:                                # %lor.lhs.false7
 	i32.const	$push55=, 16
 	i32.add 	$push56=, $0, $pop55
 	i32.const	$push14=, .L.str.5
 	i32.call	$push15=, strcmp@FUNCTION, $pop56, $pop14
 	br_if   	0, $pop15       # 0: down to label3
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	i32.const	$push16=, .L.str.6
 	i32.store	12($0), $pop16
 	i32.const	$push57=, 12
@@ -175,19 +169,19 @@ main:                                   # @main
 	i32.const	$push59=, 16
 	i32.add 	$push60=, $0, $pop59
 	i32.const	$push17=, 1
-	i32.const	$push77=, 1
-	call    	foo@FUNCTION, $pop58, $pop60, $pop17, $pop77
+	i32.const	$push75=, 1
+	call    	foo@FUNCTION, $pop58, $pop60, $pop17, $pop75
 	i32.load	$push19=, 12($0)
 	i32.const	$push18=, .L.str.7
 	i32.call	$push20=, strcmp@FUNCTION, $pop19, $pop18
 	br_if   	0, $pop20       # 0: down to label3
-# BB#5:                                 # %lor.lhs.false16
+# %bb.5:                                # %lor.lhs.false16
 	i32.const	$push61=, 16
 	i32.add 	$push62=, $0, $pop61
 	i32.const	$push21=, .L.str.8
 	i32.call	$push22=, strcmp@FUNCTION, $pop62, $pop21
 	br_if   	0, $pop22       # 0: down to label3
-# BB#6:                                 # %if.end21
+# %bb.6:                                # %if.end21
 	i32.const	$push23=, .L.str.9
 	i32.store	12($0), $pop23
 	i32.const	$push63=, 12
@@ -195,19 +189,19 @@ main:                                   # @main
 	i32.const	$push65=, 16
 	i32.add 	$push66=, $0, $pop65
 	i32.const	$push24=, 1
-	i32.const	$push78=, 1
-	call    	foo@FUNCTION, $pop64, $pop66, $pop24, $pop78
+	i32.const	$push76=, 1
+	call    	foo@FUNCTION, $pop64, $pop66, $pop24, $pop76
 	i32.load	$push26=, 12($0)
 	i32.const	$push25=, .L.str.10
 	i32.call	$push27=, strcmp@FUNCTION, $pop26, $pop25
 	br_if   	0, $pop27       # 0: down to label3
-# BB#7:                                 # %lor.lhs.false25
+# %bb.7:                                # %lor.lhs.false25
 	i32.const	$push67=, 16
 	i32.add 	$push68=, $0, $pop67
 	i32.const	$push28=, .L.str.11
 	i32.call	$push29=, strcmp@FUNCTION, $pop68, $pop28
 	br_if   	0, $pop29       # 0: down to label3
-# BB#8:                                 # %if.end30
+# %bb.8:                                # %if.end30
 	i32.const	$push30=, .L.str.12
 	i32.store	12($0), $pop30
 	i32.const	$push69=, 12
@@ -215,19 +209,19 @@ main:                                   # @main
 	i32.const	$push71=, 16
 	i32.add 	$push72=, $0, $pop71
 	i32.const	$push31=, 0
-	i32.const	$push79=, 0
-	call    	foo@FUNCTION, $pop70, $pop72, $pop31, $pop79
+	i32.const	$push77=, 0
+	call    	foo@FUNCTION, $pop70, $pop72, $pop31, $pop77
 	i32.load	$push33=, 12($0)
 	i32.const	$push32=, .L.str.13
 	i32.call	$push34=, strcmp@FUNCTION, $pop33, $pop32
 	br_if   	0, $pop34       # 0: down to label3
-# BB#9:                                 # %lor.lhs.false34
+# %bb.9:                                # %lor.lhs.false34
 	i32.const	$push73=, 16
 	i32.add 	$push74=, $0, $pop73
 	i32.const	$push35=, .L.str.14
 	i32.call	$push36=, strcmp@FUNCTION, $pop74, $pop35
 	br_if   	0, $pop36       # 0: down to label3
-# BB#10:                                # %if.end39
+# %bb.10:                               # %if.end39
 	i32.const	$push44=, 0
 	i32.const	$push42=, 80
 	i32.add 	$push43=, $0, $pop42
@@ -319,6 +313,6 @@ main:                                   # @main
 	.size	.L.str.14, 7
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9e726d5c2..5f3b6b0fc 100644
--- a/test/torture-s/20050502-2.c.s
+++ b/test/torture-s/20050502-2.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store8	4($0), $pop0
                                         # fallthrough-return
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store8	8($0), $pop0
                                         # fallthrough-return
@@ -35,14 +35,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	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.sub 	$0=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $0
 	i32.const	$push1=, 10
 	i32.add 	$push2=, $0, $pop1
 	i32.const	$push24=, 0
@@ -63,16 +62,16 @@ main:                                   # @main
 	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	$push28=, 0
-	i32.store8	8($0), $pop28
+# %bb.1:                                # %if.end
+	i32.const	$push26=, 0
+	i32.store8	8($0), $pop26
 	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
+	i32.const	$push25=, 11
+	i32.call	$push11=, memcmp@FUNCTION, $0, $pop10, $pop25
 	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %if.end7
+# %bb.2:                                # %if.end7
 	i32.const	$push19=, 0
 	i32.const	$push17=, 16
 	i32.add 	$push18=, $0, $pop17
@@ -106,6 +105,6 @@ main:                                   # @main
 	.size	.L.str.1, 11
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 42a6da133..a66a527a8 100644
--- a/test/torture-s/20050604-1.c.s
+++ b/test/torture-s/20050604-1.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push37=, 0
 	i32.load16_u	$push1=, u+2($pop37)
@@ -62,95 +62,89 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	f32, f32, f32, f32, i32, i32
-# BB#0:                                 # %entry
-	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)
+# %bb.0:                                # %entry
+	i32.const	$push51=, 0
+	i32.load16_u	$push1=, u+2($pop51)
+	i32.const	$push50=, 28
+	i32.add 	$4=, $pop1, $pop50
+	i32.const	$push49=, 0
+	i32.store16	u+2($pop49), $4
+	i32.const	$push48=, 0
+	i32.load16_u	$push2=, u($pop48)
 	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)
+	i32.add 	$5=, $pop2, $pop3
+	i32.const	$push47=, 0
+	i32.store16	u($pop47), $5
+	i32.const	$push46=, 0
+	f32.load	$push4=, v+12($pop46)
 	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
-	i32.const	$push48=, 0
-	f32.load	$push7=, v+8($pop48)
-	f32.const	$push8=, 0x1.6p4
-	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
+	f32.const	$push45=, 0x0p0
+	f32.add 	$3=, $pop6, $pop45
 	i32.const	$push44=, 0
+	f32.store	v+12($pop44), $3
 	i32.const	$push43=, 0
-	f32.load	$push10=, v+4($pop43)
+	f32.load	$push7=, v+8($pop43)
+	f32.const	$push8=, 0x1.6p4
+	f32.add 	$push9=, $pop7, $pop8
+	f32.const	$push42=, 0x1.6p4
+	f32.add 	$2=, $pop9, $pop42
+	i32.const	$push41=, 0
+	f32.store	v+8($pop41), $2
+	i32.const	$push40=, 0
+	f32.load	$push10=, v+4($pop40)
 	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
+	f32.const	$push39=, 0x1.4p4
+	f32.add 	$1=, $pop12, $pop39
 	i32.const	$push38=, 0
-	f32.load	$push13=, v($pop38)
+	f32.store	v+4($pop38), $1
+	i32.const	$push37=, 0
+	f32.load	$push13=, v($pop37)
 	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
+	f32.const	$push36=, 0x1.2p4
+	f32.add 	$0=, $pop15, $pop36
+	i32.const	$push35=, 0
+	f32.store	v($pop35), $0
 	block   	
 	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	$push65=, 65535
-	i32.and 	$push20=, $4, $pop65
-	i32.const	$push64=, 28
-	i32.ne  	$push21=, $pop20, $pop64
+# %bb.1:                                # %entry
+	i32.const	$push53=, 65535
+	i32.and 	$push20=, $4, $pop53
+	i32.const	$push52=, 28
+	i32.ne  	$push21=, $pop20, $pop52
 	br_if   	0, $pop21       # 0: down to label0
-# BB#2:                                 # %entry
-	i32.const	$push67=, 0
-	i32.load16_u	$push17=, u+6($pop67)
-	i32.const	$push66=, 0
-	i32.load16_u	$push16=, u+4($pop66)
+# %bb.2:                                # %entry
+	i32.const	$push55=, 0
+	i32.load16_u	$push17=, u+6($pop55)
+	i32.const	$push54=, 0
+	i32.load16_u	$push16=, u+4($pop54)
 	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
+# %bb.3:                                # %if.end
 	f32.const	$push24=, 0x1.2p5
 	f32.ne  	$push25=, $0, $pop24
 	br_if   	0, $pop25       # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	f32.const	$push26=, 0x1.4p5
 	f32.ne  	$push27=, $1, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	f32.const	$push28=, 0x1.6p5
 	f32.ne  	$push29=, $2, $pop28
 	br_if   	0, $pop29       # 0: down to label0
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	f32.const	$push30=, 0x0p0
 	f32.ne  	$push31=, $3, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#7:                                 # %if.end26
+# %bb.7:                                # %if.end26
 	i32.const	$push32=, 0
 	return  	$pop32
 .LBB1_8:                                # %if.then
@@ -180,5 +174,5 @@ v:
 	.size	v, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050607-1.c.s b/test/torture-s/20050607-1.c.s
index 494930d2d..e1dd6b803 100644
--- a/test/torture-s/20050607-1.c.s
+++ b/test/torture-s/20050607-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20050613-1.c.s b/test/torture-s/20050613-1.c.s
index e4607a488..221be1607 100644
--- a/test/torture-s/20050613-1.c.s
+++ b/test/torture-s/20050613-1.c.s
@@ -6,22 +6,22 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push1=, 4($0)
 	i32.const	$push2=, 5
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push4=, 8($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false4
+# %bb.3:                                # %lor.lhs.false4
 	i32.load	$push5=, 12($0)
 	br_if   	0, $pop5        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -37,7 +37,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %foo.exit28
+# %bb.0:                                # %foo.exit28
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050713-1.c.s b/test/torture-s/20050713-1.c.s
index 15f9b6f9e..a4d494eab 100644
--- a/test/torture-s/20050713-1.c.s
+++ b/test/torture-s/20050713-1.c.s
@@ -7,38 +7,38 @@
 foo2:                                   # @foo2
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 3
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push3=, 4($0)
 	i32.const	$push4=, 4
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push6=, 8($0)
 	i32.const	$push7=, 5
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.load	$push9=, 0($1)
 	i32.const	$push10=, 6
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false6
+# %bb.4:                                # %lor.lhs.false6
 	i32.load	$push12=, 4($1)
 	i32.const	$push13=, 7
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false9
+# %bb.5:                                # %lor.lhs.false9
 	i32.load	$push15=, 8($1)
 	i32.const	$push16=, 8
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %if.end13
+# %bb.6:                                # %if.end13
 	i32.const	$push18=, 0
 	return  	$pop18
 .LBB0_7:                                # %if.then
@@ -56,53 +56,53 @@ foo2:                                   # @foo2
 foo3:                                   # @foo3
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push2=, 0($0)
 	i32.const	$push3=, 3
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 4($0)
 	i32.const	$push5=, 4
 	i32.ne  	$push6=, $pop0, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.load	$push1=, 8($0)
 	i32.const	$push7=, 5
 	i32.ne  	$push8=, $pop1, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %if.end.i
+# %bb.3:                                # %if.end.i
 	i32.load	$push11=, 8($1)
 	i32.const	$push12=, 8
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label1
-# BB#4:                                 # %if.end.i
+# %bb.4:                                # %if.end.i
 	i32.load	$push9=, 4($1)
 	i32.const	$push14=, 7
 	i32.ne  	$push15=, $pop9, $pop14
 	br_if   	0, $pop15       # 0: down to label1
-# BB#5:                                 # %if.end.i
+# %bb.5:                                # %if.end.i
 	i32.load	$push10=, 0($1)
 	i32.const	$push16=, 6
 	i32.ne  	$push17=, $pop10, $pop16
 	br_if   	0, $pop17       # 0: down to label1
-# BB#6:                                 # %foo2.exit
+# %bb.6:                                # %foo2.exit
 	i32.load	$push18=, 0($2)
 	i32.const	$push19=, 9
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label1
-# BB#7:                                 # %lor.lhs.false
+# %bb.7:                                # %lor.lhs.false
 	i32.load	$push21=, 4($2)
 	i32.const	$push22=, 10
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label1
-# BB#8:                                 # %lor.lhs.false2
+# %bb.8:                                # %lor.lhs.false2
 	i32.load	$push24=, 8($2)
 	i32.const	$push25=, 11
 	i32.ne  	$push26=, $pop24, $pop25
 	br_if   	0, $pop26       # 0: down to label1
-# BB#9:                                 # %if.end
+# %bb.9:                                # %if.end
 	i32.const	$push27=, 0
 	return  	$pop27
 .LBB1_10:                               # %if.then.i
@@ -120,38 +120,38 @@ foo3:                                   # @foo3
 bar2:                                   # @bar2
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push2=, 0($1)
 	i32.const	$push3=, 3
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 4($1)
 	i32.const	$push5=, 4
 	i32.ne  	$push6=, $pop0, $pop5
 	br_if   	0, $pop6        # 0: down to label2
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.load	$push1=, 8($1)
 	i32.const	$push7=, 5
 	i32.ne  	$push8=, $pop1, $pop7
 	br_if   	0, $pop8        # 0: down to label2
-# BB#3:                                 # %if.end.i
+# %bb.3:                                # %if.end.i
 	i32.load	$push11=, 8($0)
 	i32.const	$push12=, 8
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label2
-# BB#4:                                 # %if.end.i
+# %bb.4:                                # %if.end.i
 	i32.load	$push9=, 4($0)
 	i32.const	$push14=, 7
 	i32.ne  	$push15=, $pop9, $pop14
 	br_if   	0, $pop15       # 0: down to label2
-# BB#5:                                 # %if.end.i
+# %bb.5:                                # %if.end.i
 	i32.load	$push10=, 0($0)
 	i32.const	$push16=, 6
 	i32.ne  	$push17=, $pop10, $pop16
 	br_if   	0, $pop17       # 0: down to label2
-# BB#6:                                 # %foo2.exit
+# %bb.6:                                # %foo2.exit
 	i32.const	$push18=, 0
 	return  	$pop18
 .LBB2_7:                                # %if.then.i
@@ -169,53 +169,53 @@ bar2:                                   # @bar2
 bar3:                                   # @bar3
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push5=, 0($1)
 	i32.const	$push6=, 3
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label3
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push3=, 4($1)
 	i32.const	$push8=, 4
 	i32.ne  	$push9=, $pop3, $pop8
 	br_if   	0, $pop9        # 0: down to label3
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.load	$push4=, 8($1)
 	i32.const	$push10=, 5
 	i32.ne  	$push11=, $pop4, $pop10
 	br_if   	0, $pop11       # 0: down to label3
-# BB#3:                                 # %if.end.i.i
+# %bb.3:                                # %if.end.i.i
 	i32.load	$push14=, 8($0)
 	i32.const	$push15=, 8
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label3
-# BB#4:                                 # %if.end.i.i
+# %bb.4:                                # %if.end.i.i
 	i32.load	$push12=, 4($0)
 	i32.const	$push17=, 7
 	i32.ne  	$push18=, $pop12, $pop17
 	br_if   	0, $pop18       # 0: down to label3
-# BB#5:                                 # %if.end.i.i
+# %bb.5:                                # %if.end.i.i
 	i32.load	$push13=, 0($0)
 	i32.const	$push19=, 6
 	i32.ne  	$push20=, $pop13, $pop19
 	br_if   	0, $pop20       # 0: down to label3
-# BB#6:                                 # %foo2.exit.i
+# %bb.6:                                # %foo2.exit.i
 	i32.load	$push0=, 0($2)
 	i32.const	$push21=, 9
 	i32.ne  	$push22=, $pop0, $pop21
 	br_if   	0, $pop22       # 0: down to label3
-# BB#7:                                 # %foo2.exit.i
+# %bb.7:                                # %foo2.exit.i
 	i32.load	$push1=, 4($2)
 	i32.const	$push23=, 10
 	i32.ne  	$push24=, $pop1, $pop23
 	br_if   	0, $pop24       # 0: down to label3
-# BB#8:                                 # %foo2.exit.i
+# %bb.8:                                # %foo2.exit.i
 	i32.load	$push2=, 8($2)
 	i32.const	$push25=, 11
 	i32.ne  	$push26=, $pop2, $pop25
 	br_if   	0, $pop26       # 0: down to label3
-# BB#9:                                 # %foo3.exit
+# %bb.9:                                # %foo3.exit
 	i32.const	$push27=, 0
 	return  	$pop27
 .LBB3_10:                               # %if.then.i.i
@@ -233,53 +233,53 @@ bar3:                                   # @bar3
 baz3:                                   # @baz3
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push5=, 0($1)
 	i32.const	$push6=, 3
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label4
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push3=, 4($1)
 	i32.const	$push8=, 4
 	i32.ne  	$push9=, $pop3, $pop8
 	br_if   	0, $pop9        # 0: down to label4
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.load	$push4=, 8($1)
 	i32.const	$push10=, 5
 	i32.ne  	$push11=, $pop4, $pop10
 	br_if   	0, $pop11       # 0: down to label4
-# BB#3:                                 # %if.end.i.i
+# %bb.3:                                # %if.end.i.i
 	i32.load	$push14=, 8($2)
 	i32.const	$push15=, 8
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label4
-# BB#4:                                 # %if.end.i.i
+# %bb.4:                                # %if.end.i.i
 	i32.load	$push12=, 4($2)
 	i32.const	$push17=, 7
 	i32.ne  	$push18=, $pop12, $pop17
 	br_if   	0, $pop18       # 0: down to label4
-# BB#5:                                 # %if.end.i.i
+# %bb.5:                                # %if.end.i.i
 	i32.load	$push13=, 0($2)
 	i32.const	$push19=, 6
 	i32.ne  	$push20=, $pop13, $pop19
 	br_if   	0, $pop20       # 0: down to label4
-# BB#6:                                 # %foo2.exit.i
+# %bb.6:                                # %foo2.exit.i
 	i32.load	$push0=, 0($0)
 	i32.const	$push21=, 9
 	i32.ne  	$push22=, $pop0, $pop21
 	br_if   	0, $pop22       # 0: down to label4
-# BB#7:                                 # %foo2.exit.i
+# %bb.7:                                # %foo2.exit.i
 	i32.load	$push1=, 4($0)
 	i32.const	$push23=, 10
 	i32.ne  	$push24=, $pop1, $pop23
 	br_if   	0, $pop24       # 0: down to label4
-# BB#8:                                 # %foo2.exit.i
+# %bb.8:                                # %foo2.exit.i
 	i32.load	$push2=, 8($0)
 	i32.const	$push25=, 11
 	i32.ne  	$push26=, $pop2, $pop25
 	br_if   	0, $pop26       # 0: down to label4
-# BB#9:                                 # %foo3.exit
+# %bb.9:                                # %foo3.exit
 	i32.const	$push27=, 0
 	return  	$pop27
 .LBB4_10:                               # %if.then.i.i
@@ -296,7 +296,7 @@ baz3:                                   # @baz3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %baz3.exit
+# %bb.0:                                # %baz3.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -304,5 +304,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end5-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050826-1.c.s b/test/torture-s/20050826-1.c.s
index 74df6f0d6..ff2fbe101 100644
--- a/test/torture-s/20050826-1.c.s
+++ b/test/torture-s/20050826-1.c.s
@@ -7,13 +7,13 @@
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.load	$push0=, 0($0):p2align=0
 	i64.const	$push1=, 368664092428289
 	i64.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push3=, 7
 	i32.add 	$1=, $0, $pop3
 	i32.const	$0=, 0
@@ -23,15 +23,14 @@ bar:                                    # @bar
 	i32.add 	$push4=, $1, $0
 	i32.load8_u	$push5=, 0($pop4)
 	br_if   	1, $pop5        # 1: down to label0
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push10=, 1
-	i32.add 	$push9=, $0, $pop10
-	tee_local	$push8=, $0=, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$0=, $0, $pop8
 	i32.const	$push7=, 2040
-	i32.le_u	$push6=, $pop8, $pop7
+	i32.le_u	$push6=, $0, $pop7
 	br_if   	0, $pop6        # 0: up to label1
-# BB#4:                                 # %for.end
+# %bb.4:                                # %for.end
 	end_loop
 	return
 .LBB0_5:                                # %if.then
@@ -49,7 +48,7 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, a+7
 	i32.const	$push2=, 0
 	i32.const	$push1=, 2041
@@ -75,7 +74,7 @@ foo:                                    # @foo
 	i64.const	$push7=, 368664092428289
 	i64.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label3
-# BB#1:                                 # %for.cond.i.preheader
+# %bb.1:                                # %for.cond.i.preheader
 	i32.const	$1=, 8
 .LBB1_2:                                # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
@@ -85,7 +84,7 @@ foo:                                    # @foo
 	i32.const	$push22=, 2040
 	i32.gt_u	$push10=, $pop9, $pop22
 	br_if   	2, $pop10       # 2: down to label2
-# BB#3:                                 # %for.cond.i.for.body.i_crit_edge
+# %bb.3:                                # %for.cond.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB1_2 Depth=1
 	i32.const	$push25=, a
 	i32.add 	$0=, $1, $pop25
@@ -115,7 +114,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, a+7
 	i32.const	$push2=, 0
 	i32.const	$push1=, 2041
@@ -141,7 +140,7 @@ main:                                   # @main
 	i64.const	$push7=, 368664092428289
 	i64.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label6
-# BB#1:                                 # %for.cond.i.i.preheader
+# %bb.1:                                # %for.cond.i.i.preheader
 	i32.const	$1=, 8
 .LBB2_2:                                # %for.cond.i.i
                                         # =>This Inner Loop Header: Depth=1
@@ -151,7 +150,7 @@ main:                                   # @main
 	i32.const	$push22=, 2040
 	i32.gt_u	$push10=, $pop9, $pop22
 	br_if   	2, $pop10       # 2: down to label5
-# BB#3:                                 # %for.cond.i.for.body.i_crit_edge.i
+# %bb.3:                                # %for.cond.i.for.body.i_crit_edge.i
                                         #   in Loop: Header=BB2_2 Depth=1
 	i32.const	$push25=, a
 	i32.add 	$0=, $1, $pop25
@@ -195,6 +194,6 @@ a:
 	.size	.L.str.1, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e208536a2..df4757355 100644
--- a/test/torture-s/20050826-2.c.s
+++ b/test/torture-s/20050826-2.c.s
@@ -8,48 +8,47 @@ inet_check_attr:                        # @inet_check_attr
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$3=, 0
+# %bb.0:                                # %entry
+	i32.const	$3=, 1
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push11=, 1
-	i32.add 	$3=, $3, $pop11
+	i32.load	$2=, 0($1)
 	block   	
-	i32.load	$push10=, 0($1)
-	tee_local	$push9=, $2=, $pop10
-	i32.eqz 	$push19=, $pop9
-	br_if   	0, $pop19       # 0: down to label2
-# BB#2:                                 # %if.then
+	i32.eqz 	$push17=, $2
+	br_if   	0, $pop17       # 0: down to label2
+# %bb.2:                                # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.load16_u	$push0=, 0($2)
-	i32.const	$push13=, 65532
-	i32.and 	$push1=, $pop0, $pop13
-	i32.const	$push12=, 4
-	i32.eq  	$push2=, $pop1, $pop12
+	i32.const	$push10=, 65532
+	i32.and 	$push1=, $pop0, $pop10
+	i32.const	$push9=, 4
+	i32.eq  	$push2=, $pop1, $pop9
 	br_if   	2, $pop2        # 2: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push15=, 1
-	i32.or  	$push3=, $3, $pop15
-	i32.const	$push14=, 9
-	i32.eq  	$push4=, $pop3, $pop14
+	i32.const	$push12=, 1
+	i32.or  	$push3=, $3, $pop12
+	i32.const	$push11=, 9
+	i32.eq  	$push4=, $pop3, $pop11
 	br_if   	0, $pop4        # 0: down to label2
-# BB#4:                                 # %if.then9
+# %bb.4:                                # %if.then9
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push16=, 4
-	i32.add 	$push5=, $2, $pop16
+	i32.const	$push13=, 4
+	i32.add 	$push5=, $2, $pop13
 	i32.store	0($1), $pop5
 .LBB0_5:                                # %for.inc
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	i32.const	$push18=, 4
-	i32.add 	$1=, $1, $pop18
-	i32.const	$push17=, 14
-	i32.lt_u	$push6=, $3, $pop17
+	i32.const	$push16=, 4
+	i32.add 	$1=, $1, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$3=, $3, $pop15
+	i32.const	$push14=, 15
+	i32.lt_u	$push6=, $3, $pop14
 	br_if   	0, $pop6        # 0: up to label1
-# BB#6:
+# %bb.6:
 	end_loop
 	i32.const	$push7=, 0
 	return  	$pop7
@@ -67,442 +66,275 @@ inet_check_attr:                        # @inet_check_attr
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push87=, 0
-	i32.const	$push85=, 0
-	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
+	.local  	i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push84=, 0
+	i32.load	$push83=, __stack_pointer($pop84)
+	i32.const	$push85=, 64
+	i32.sub 	$5=, $pop83, $pop85
+	i32.const	$push86=, 0
+	i32.store	__stack_pointer($pop86), $5
 	i64.const	$push0=, 51539607564
 	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   	
+	i32.const	$push90=, 56
+	i32.add 	$push91=, $5, $pop90
+	i32.store	0($5), $pop91
+	i32.const	$push92=, 56
+	i32.add 	$push93=, $5, $pop92
+	i32.store	4($5), $pop93
+	i32.const	$push94=, 56
+	i32.add 	$push95=, $5, $pop94
+	i32.store	8($5), $pop95
+	i32.const	$push96=, 56
+	i32.add 	$push97=, $5, $pop96
+	i32.store	12($5), $pop97
+	i32.const	$push98=, 56
+	i32.add 	$push99=, $5, $pop98
+	i32.store	16($5), $pop99
+	i32.const	$push100=, 56
+	i32.add 	$push101=, $5, $pop100
+	i32.store	20($5), $pop101
+	i32.const	$push102=, 56
+	i32.add 	$push103=, $5, $pop102
+	i32.store	24($5), $pop103
+	i32.const	$push104=, 56
+	i32.add 	$push105=, $5, $pop104
+	i32.store	28($5), $pop105
+	i32.const	$push106=, 56
+	i32.add 	$push107=, $5, $pop106
+	i32.store	32($5), $pop107
+	i32.const	$push108=, 56
+	i32.add 	$push109=, $5, $pop108
+	i32.store	36($5), $pop109
+	i32.const	$push110=, 56
+	i32.add 	$push111=, $5, $pop110
+	i32.store	40($5), $pop111
+	i32.const	$push112=, 56
+	i32.add 	$push113=, $5, $pop112
+	i32.store	44($5), $pop113
+	i32.const	$push114=, 56
+	i32.add 	$push115=, $5, $pop114
+	i32.store	48($5), $pop115
+	i32.const	$push116=, 56
+	i32.add 	$push117=, $5, $pop116
+	i32.store	52($5), $pop117
 	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
+	br_if   	0, $pop2        # 0: down to label3
+# %bb.1:                                # %if.end
+	i32.const	$push118=, 56
+	i32.add 	$push119=, $5, $pop118
 	i32.const	$push1=, 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.or  	$0=, $pop119, $pop1
+	i32.load	$push16=, 0($5)
+	i32.ne  	$push17=, $pop16, $0
+	br_if   	0, $pop17       # 0: down to label3
+# %bb.2:                                # %if.end
 	i32.load	$push3=, 4($5)
 	i32.ne  	$push38=, $pop3, $0
-	br_if   	2, $pop38       # 2: down to label17
-# BB#3:                                 # %if.end
+	br_if   	0, $pop38       # 0: down to label3
+# %bb.3:                                # %if.end
 	i32.load	$push4=, 8($5)
 	i32.ne  	$push39=, $pop4, $0
-	br_if   	3, $pop39       # 3: down to label16
-# BB#4:                                 # %if.end
+	br_if   	0, $pop39       # 0: down to label3
+# %bb.4:                                # %if.end
 	i32.load	$push5=, 12($5)
 	i32.ne  	$push40=, $pop5, $0
-	br_if   	4, $pop40       # 4: down to label15
-# BB#5:                                 # %if.end
+	br_if   	0, $pop40       # 0: down to label3
+# %bb.5:                                # %if.end
 	i32.const	$push36=, 16
 	i32.add 	$push37=, $5, $pop36
 	i32.load	$push6=, 0($pop37)
 	i32.ne  	$push41=, $pop6, $0
-	br_if   	5, $pop41       # 5: down to label14
-# BB#6:                                 # %if.end
+	br_if   	0, $pop41       # 0: down to label3
+# %bb.6:                                # %if.end
 	i32.const	$push34=, 20
 	i32.add 	$push35=, $5, $pop34
 	i32.load	$push7=, 0($pop35)
 	i32.ne  	$push42=, $pop7, $0
-	br_if   	6, $pop42       # 6: down to label13
-# BB#7:                                 # %if.end
+	br_if   	0, $pop42       # 0: down to label3
+# %bb.7:                                # %if.end
 	i32.const	$push32=, 24
 	i32.add 	$push33=, $5, $pop32
 	i32.load	$push8=, 0($pop33)
 	i32.ne  	$push43=, $pop8, $0
-	br_if   	7, $pop43       # 7: down to label12
-# BB#8:                                 # %if.end
+	br_if   	0, $pop43       # 0: down to label3
+# %bb.8:                                # %if.end
+	i32.const	$push120=, 56
+	i32.add 	$push121=, $5, $pop120
+	copy_local	$3=, $pop121
 	i32.const	$push30=, 28
 	i32.add 	$push31=, $5, $pop30
 	i32.load	$push9=, 0($pop31)
-	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.ne  	$push44=, $pop9, $3
+	br_if   	0, $pop44       # 0: down to label3
+# %bb.9:                                # %if.end
 	i32.const	$push28=, 32
 	i32.add 	$push29=, $5, $pop28
 	i32.load	$push10=, 0($pop29)
 	i32.ne  	$push45=, $pop10, $3
-	br_if   	9, $pop45       # 9: down to label10
-# BB#10:                                # %if.end
+	br_if   	0, $pop45       # 0: down to label3
+# %bb.10:                               # %if.end
 	i32.const	$push26=, 36
 	i32.add 	$push27=, $5, $pop26
 	i32.load	$push11=, 0($pop27)
 	i32.ne  	$push46=, $pop11, $0
-	br_if   	10, $pop46      # 10: down to label9
-# BB#11:                                # %if.end
+	br_if   	0, $pop46       # 0: down to label3
+# %bb.11:                               # %if.end
 	i32.const	$push24=, 40
 	i32.add 	$push25=, $5, $pop24
 	i32.load	$push12=, 0($pop25)
 	i32.ne  	$push47=, $pop12, $0
-	br_if   	11, $pop47      # 11: down to label8
-# BB#12:                                # %if.end
+	br_if   	0, $pop47       # 0: down to label3
+# %bb.12:                               # %if.end
 	i32.const	$push22=, 44
 	i32.add 	$push23=, $5, $pop22
 	i32.load	$push13=, 0($pop23)
 	i32.ne  	$push48=, $pop13, $0
-	br_if   	12, $pop48      # 12: down to label7
-# BB#13:                                # %if.end
+	br_if   	0, $pop48       # 0: down to label3
+# %bb.13:                               # %if.end
 	i32.const	$push20=, 48
 	i32.add 	$push21=, $5, $pop20
 	i32.load	$push14=, 0($pop21)
 	i32.ne  	$push49=, $pop14, $0
-	br_if   	13, $pop49      # 13: down to label6
-# BB#14:                                # %if.end
+	br_if   	0, $pop49       # 0: down to label3
+# %bb.14:                               # %if.end
 	i32.const	$push18=, 52
 	i32.add 	$push19=, $5, $pop18
 	i32.load	$push15=, 0($pop19)
 	i32.ne  	$push50=, $pop15, $0
-	br_if   	14, $pop50      # 14: down to label5
-# BB#15:                                # %for.cond7.13
+	br_if   	0, $pop50       # 0: down to label3
+# %bb.15:                               # %for.cond7.13
 	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	$push148=, 0
+	i32.store	4($5), $pop148
 	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	$push122=, 56
+	i32.add 	$push123=, $5, $pop122
+	i32.store	0($pop54), $pop123
 	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	$push124=, 56
+	i32.add 	$push125=, $5, $pop124
+	i32.store	0($pop56), $pop125
 	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	$push126=, 56
+	i32.add 	$push127=, $5, $pop126
+	i32.store	0($pop58), $pop127
 	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	$push128=, 56
+	i32.add 	$push129=, $5, $pop128
+	i32.store	0($pop60), $pop129
 	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	$push130=, 56
+	i32.add 	$push131=, $5, $pop130
+	i32.store	0($pop62), $pop131
 	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	$push132=, 56
+	i32.add 	$push133=, $5, $pop132
+	i32.store	0($pop64), $pop133
 	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	$push134=, 56
+	i32.add 	$push135=, $5, $pop134
+	i32.store	0($pop66), $pop135
 	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	$push136=, 56
+	i32.add 	$push137=, $5, $pop136
+	i32.store	0($pop68), $pop137
 	i32.const	$push69=, 52
 	i32.add 	$push70=, $5, $pop69
-	i32.const	$push139=, 56
-	i32.add 	$push140=, $5, $pop139
-	i32.store	0($pop70), $pop140
+	i32.const	$push138=, 56
+	i32.add 	$push139=, $5, $pop138
+	i32.store	0($pop70), $pop139
 	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.const	$push140=, 56
+	i32.add 	$push141=, $5, $pop140
+	i32.store	8($5), $pop141
+	i32.const	$push142=, 56
+	i32.add 	$push143=, $5, $pop142
+	i32.store	0($5), $pop143
+	i32.const	$push144=, 56
+	i32.add 	$push145=, $5, $pop144
+	i32.store	12($5), $pop145
 	i32.call	$push74=, inet_check_attr@FUNCTION, $3, $5
 	i32.const	$push75=, -22
 	i32.ne  	$push76=, $pop74, $pop75
-	br_if   	15, $pop76      # 15: down to label4
-# BB#16:                                # %if.end39
+	br_if   	0, $pop76       # 0: down to label3
+# %bb.16:                               # %if.end39
 	copy_local	$2=, $5
 	i32.load	$1=, 4($5)
+.LBB1_17:                               # %for.body43
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label4:
 	block   	
-	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	$6=, 5
-	br      	6               # 6: down to label3
-.LBB1_29:
-	end_block                       # label9:
-	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
+	block   	
+	i32.const	$push149=, 1
+	i32.ne  	$push77=, $3, $pop149
+	br_if   	0, $pop77       # 0: down to label6
+# %bb.18:                               # %land.lhs.true
+                                        #   in Loop: Header=BB1_17 Depth=1
+	i32.eqz 	$push154=, $1
+	br_if   	1, $pop154      # 1: down to label5
 	br      	3               # 3: down to label3
-.LBB1_32:
+.LBB1_19:                               # %if.else
+                                        #   in Loop: Header=BB1_17 Depth=1
 	end_block                       # label6:
-	i32.const	$6=, 5
-	br      	2               # 2: down to label3
-.LBB1_33:
-	end_block                       # label5:
-	i32.const	$6=, 5
-	br      	1               # 1: down to label3
-.LBB1_34:
-	end_block                       # label4:
-	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
+	block   	
+	i32.const	$push150=, 5
+	i32.gt_u	$push78=, $3, $pop150
+	br_if   	0, $pop78       # 0: down to label7
+# %bb.20:                               # %land.lhs.true55
+                                        #   in Loop: Header=BB1_17 Depth=1
+	i32.eq  	$push80=, $4, $0
+	br_if   	1, $pop80       # 1: down to label5
+	br      	3               # 3: down to label3
+.LBB1_21:                               # %land.lhs.true64
+                                        #   in Loop: Header=BB1_17 Depth=1
+	end_block                       # label7:
+	i32.const	$push146=, 56
+	i32.add 	$push147=, $5, $pop146
+	i32.ne  	$push79=, $4, $pop147
+	br_if   	2, $pop79       # 2: down to label3
+.LBB1_22:                               # %for.inc73
+                                        #   in Loop: Header=BB1_17 Depth=1
+	end_block                       # label5:
+	i32.const	$push153=, 4
+	i32.add 	$2=, $2, $pop153
+	i32.const	$push152=, 1
+	i32.add 	$3=, $3, $pop152
+	i32.const	$push151=, 14
+	i32.lt_u	$push81=, $3, $pop151
+	br_if   	0, $pop81       # 0: up to label4
+# %bb.23:                               # %for.end75
+	end_loop
+	i32.const	$push89=, 0
+	i32.const	$push87=, 64
+	i32.add 	$push88=, $5, $pop87
+	i32.store	__stack_pointer($pop89), $pop88
 	i32.const	$push82=, 0
 	return  	$pop82
-.LBB1_47:                               # %if.then
-	end_block                       # label30:
+.LBB1_24:                               # %if.then
+	end_block                       # label3:
 	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 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20050929-1.c.s b/test/torture-s/20050929-1.c.s
index bfa5f377b..323b87f05 100644
--- a/test/torture-s/20050929-1.c.s
+++ b/test/torture-s/20050929-1.c.s
@@ -7,48 +7,44 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push24=, e($pop0)
-	tee_local	$push23=, $0=, $pop24
-	i32.load	$push22=, 0($pop23)
-	tee_local	$push21=, $1=, $pop22
-	i32.load	$push1=, 0($pop21)
+	i32.load	$0=, e($pop0)
+	i32.load	$1=, 0($0)
+	block   	
+	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push4=, 4($1)
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end
-	i32.load	$push26=, 4($0)
-	tee_local	$push25=, $0=, $pop26
-	i32.load	$push7=, 0($pop25)
+# %bb.2:                                # %if.end
+	i32.load	$0=, 4($0)
+	i32.load	$push7=, 0($0)
 	i32.const	$push8=, 3
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false5
+# %bb.3:                                # %lor.lhs.false5
 	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
+# %bb.4:                                # %if.end10
 	i32.const	$push13=, 0
-	i32.load	$push28=, e+4($pop13)
-	tee_local	$push27=, $0=, $pop28
-	i32.load	$push14=, 0($pop27)
+	i32.load	$0=, e+4($pop13)
+	i32.load	$push14=, 0($0)
 	i32.const	$push15=, 5
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false13
+# %bb.5:                                # %lor.lhs.false13
 	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
+# %bb.6:                                # %if.end17
 	i32.const	$push20=, 0
 	return  	$pop20
 .LBB0_7:                                # %if.then
@@ -102,5 +98,5 @@ e:
 	.size	e, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20051012-1.c.s b/test/torture-s/20051012-1.c.s
index 4e941631c..0f2a8d910 100644
--- a/test/torture-s/20051012-1.c.s
+++ b/test/torture-s/20051012-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, t+6($pop0)
 	i32.const	$push2=, 511
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i32.load	$push1=, t+4($pop7)
@@ -47,4 +47,4 @@ t:
 	.size	t, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20051021-1.c.s b/test/torture-s/20051021-1.c.s
index 4c2279b8b..03b753b48 100644
--- a/test/torture-s/20051021-1.c.s
+++ b/test/torture-s/20051021-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo1,@function
 foo1:                                   # @foo1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, count($pop5)
@@ -25,7 +25,7 @@ foo1:                                   # @foo1
 	.type	foo2,@function
 foo2:                                   # @foo2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, count($pop5)
@@ -45,19 +45,18 @@ foo2:                                   # @foo2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, count($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, count($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 2
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	count($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	count($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end7
-	i32.const	$push6=, 0
-	return  	$pop6
+# %bb.1:                                # %if.end7
+	i32.const	$push4=, 0
+	return  	$pop4
 .LBB2_2:                                # %if.then6
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -76,5 +75,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20051104-1.c.s b/test/torture-s/20051104-1.c.s
index 1897c5eda..ec4dfcfea 100644
--- a/test/torture-s/20051104-1.c.s
+++ b/test/torture-s/20051104-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, .L.str
 	i32.store	s+4($pop1), $pop0
@@ -35,4 +35,4 @@ s:
 	.size	.L.str, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20051110-1.c.s b/test/torture-s/20051110-1.c.s
index 2ba8ab085..3b73d8130 100644
--- a/test/torture-s/20051110-1.c.s
+++ b/test/torture-s/20051110-1.c.s
@@ -7,31 +7,29 @@
 add_unwind_adjustsp:                    # @add_unwind_adjustsp
 	.param  	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, -516
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 2
-	i32.shr_s	$push7=, $pop1, $pop2
-	tee_local	$push6=, $0=, $pop7
-	i32.eqz 	$push14=, $pop6
-	br_if   	0, $pop14       # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+	i32.shr_s	$0=, $pop1, $pop2
+	block   	
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label0
+# %bb.1:                                # %while.body.preheader
 	i32.const	$2=, bytes
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push13=, 128
-	i32.or  	$push4=, $0, $pop13
-	i32.const	$push12=, 127
-	i32.and 	$push3=, $0, $pop12
-	i32.const	$push11=, 7
-	i32.shr_u	$push10=, $0, $pop11
-	tee_local	$push9=, $1=, $pop10
-	i32.select	$push5=, $pop4, $pop3, $pop9
+	i32.const	$push9=, 7
+	i32.shr_u	$1=, $0, $pop9
+	i32.const	$push8=, 128
+	i32.or  	$push4=, $0, $pop8
+	i32.const	$push7=, 127
+	i32.and 	$push3=, $0, $pop7
+	i32.select	$push5=, $pop4, $pop3, $1
 	i32.store8	0($2), $pop5
-	i32.const	$push8=, 1
-	i32.add 	$2=, $2, $pop8
+	i32.const	$push6=, 1
+	i32.add 	$2=, $2, $pop6
 	copy_local	$0=, $1
 	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %while.end
@@ -48,7 +46,7 @@ add_unwind_adjustsp:                    # @add_unwind_adjustsp
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1928
 	i32.store16	bytes($pop1):p2align=0, $pop0
@@ -67,4 +65,4 @@ bytes:
 	.size	bytes, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20051110-2.c.s b/test/torture-s/20051110-2.c.s
index 9762ca4bd..1da83da13 100644
--- a/test/torture-s/20051110-2.c.s
+++ b/test/torture-s/20051110-2.c.s
@@ -7,79 +7,73 @@
 add_unwind_adjustsp:                    # @add_unwind_adjustsp
 	.param  	i32
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$6=, 0
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push0=, -516
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 2
-	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
+	i32.shr_s	$5=, $pop1, $pop2
+	i32.const	$6=, 0
+	i32.const	$push10=, 0
+	i32.const	$push9=, 127
+	i32.and 	$push3=, $5, $pop9
+	i32.store8	bytes($pop10), $pop3
+	i32.const	$push8=, 7
+	i32.shr_u	$0=, $5, $pop8
+	block   	
 	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.eqz 	$push18=, $0
+	br_if   	0, $pop18       # 0: down to label1
+# %bb.1:                                # %if.then.lr.ph.preheader
+	i32.const	$push11=, 0
+	i32.load	$1=, flag($pop11)
 	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
-	copy_local	$0=, $pop16
+	loop    	                # label2:
+	copy_local	$2=, $0
+	copy_local	$0=, $2
 .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
+	i32.eqz 	$push19=, $1
+	br_if   	1, $pop19       # 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
+	i32.const	$push12=, 7
+	i32.shr_u	$0=, $3, $pop12
+	br_if   	0, $0           # 0: up to label4
+	br      	4               # 4: down to label0
+.LBB0_5:                                # %if.end7
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
 	end_block                       # label3:
-	i32.const	$push29=, 128
-	i32.or  	$push6=, $5, $pop29
+	i32.const	$push17=, 128
+	i32.or  	$push6=, $5, $pop17
 	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
+	i32.const	$push16=, bytes+1
+	i32.add 	$4=, $6, $pop16
+	i32.const	$push15=, 127
+	i32.and 	$push7=, $2, $pop15
+	i32.store8	0($4), $pop7
+	i32.const	$push14=, 7
+	i32.shr_u	$0=, $2, $pop14
+	i32.const	$push13=, 1
+	i32.add 	$6=, $6, $pop13
 	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:
+	br_if   	0, $0           # 0: up to label2
+.LBB0_6:                                # %do.end
 	end_loop
+	end_block                       # label1:
+	return
+.LBB0_7:                                # %a.if.end7_crit_edge
+	end_block                       # label0:
 	i32.const	$push4=, 127
 	i32.and 	$push5=, $3, $pop4
 	i32.store8	0($4), $pop5
-.LBB0_7:                                # %do.end
-	end_block                       # label0:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -91,7 +85,7 @@ add_unwind_adjustsp:                    # @add_unwind_adjustsp
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.const	$push0=, 8
 	i32.store8	bytes($pop5), $pop0
@@ -99,7 +93,7 @@ main:                                   # @main
 	i32.const	$push4=, 0
 	i32.load	$push1=, flag($pop4)
 	br_if   	0, $pop1        # 0: down to label5
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 0
 	i32.const	$push3=, 1928
 	i32.store16	bytes($pop7):p2align=0, $pop3
@@ -134,5 +128,5 @@ flag:
 	.size	flag, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20051113-1.c.s b/test/torture-s/20051113-1.c.s
index 7f3f1238c..65f8b51db 100644
--- a/test/torture-s/20051113-1.c.s
+++ b/test/torture-s/20051113-1.c.s
@@ -8,14 +8,13 @@ Sum:                                    # @Sum
 	.param  	i32
 	.result 	i64
 	.local  	i32, i32, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($0):p2align=0
 	block   	
-	i32.load	$push8=, 0($0):p2align=0
-	tee_local	$push7=, $1=, $pop8
 	i32.const	$push6=, 1
-	i32.lt_s	$push1=, $pop7, $pop6
+	i32.lt_s	$push1=, $1, $pop6
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push2=, 10
 	i32.add 	$0=, $0, $pop2
 	i64.const	$3=, 0
@@ -25,15 +24,14 @@ Sum:                                    # @Sum
 	loop    	                # label1:
 	i64.load	$push3=, 0($0):p2align=0
 	i64.add 	$3=, $pop3, $3
-	i32.const	$push12=, 30
-	i32.add 	$push0=, $0, $pop12
+	i32.const	$push8=, 1
+	i32.add 	$2=, $2, $pop8
+	i32.const	$push7=, 30
+	i32.add 	$push0=, $0, $pop7
 	copy_local	$0=, $pop0
-	i32.const	$push11=, 1
-	i32.add 	$push10=, $2, $pop11
-	tee_local	$push9=, $2=, $pop10
-	i32.lt_s	$push4=, $pop9, $1
+	i32.lt_s	$push4=, $2, $1
 	br_if   	0, $pop4        # 0: up to label1
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	return  	$3
 .LBB0_4:
@@ -52,14 +50,13 @@ Sum2:                                   # @Sum2
 	.param  	i32
 	.result 	i64
 	.local  	i32, i32, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($0):p2align=0
 	block   	
-	i32.load	$push8=, 0($0):p2align=0
-	tee_local	$push7=, $1=, $pop8
 	i32.const	$push6=, 1
-	i32.lt_s	$push1=, $pop7, $pop6
+	i32.lt_s	$push1=, $1, $pop6
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push2=, 18
 	i32.add 	$0=, $0, $pop2
 	i64.const	$3=, 0
@@ -69,15 +66,14 @@ Sum2:                                   # @Sum2
 	loop    	                # label3:
 	i64.load	$push3=, 0($0):p2align=0
 	i64.add 	$3=, $pop3, $3
-	i32.const	$push12=, 30
-	i32.add 	$push0=, $0, $pop12
+	i32.const	$push8=, 1
+	i32.add 	$2=, $2, $pop8
+	i32.const	$push7=, 30
+	i32.add 	$push0=, $0, $pop7
 	copy_local	$0=, $pop0
-	i32.const	$push11=, 1
-	i32.add 	$push10=, $2, $pop11
-	tee_local	$push9=, $2=, $pop10
-	i32.lt_s	$push4=, $pop9, $1
+	i32.lt_s	$push4=, $2, $1
 	br_if   	0, $pop4        # 0: up to label3
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	return  	$3
 .LBB1_4:
@@ -95,12 +91,11 @@ Sum2:                                   # @Sum2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 94
-	i32.call	$push19=, malloc@FUNCTION, $pop0
-	tee_local	$push18=, $0=, $pop19
+	i32.call	$0=, malloc@FUNCTION, $pop0
 	i32.const	$push1=, 4
-	i32.add 	$push2=, $pop18, $pop1
+	i32.add 	$push2=, $0, $pop1
 	i32.const	$push4=, 0
 	i32.const	$push3=, 90
 	i32.call	$drop=, memset@FUNCTION, $pop2, $pop4, $pop3
@@ -123,12 +118,12 @@ main:                                   # @main
 	i64.const	$push14=, 4311811859
 	i64.ne  	$push10=, $pop9, $pop14
 	br_if   	0, $pop10       # 0: down to label4
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.call	$push11=, Sum2@FUNCTION, $0
-	i64.const	$push20=, 4311811859
-	i64.ne  	$push12=, $pop11, $pop20
+	i64.const	$push18=, 4311811859
+	i64.ne  	$push12=, $pop11, $pop18
 	br_if   	0, $pop12       # 0: down to label4
-# BB#2:                                 # %if.end25
+# %bb.2:                                # %if.end25
 	i32.const	$push13=, 0
 	return  	$pop13
 .LBB2_3:                                # %if.then
@@ -140,6 +135,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 45e068a50..f3e802f80 100644
--- a/test/torture-s/20051215-1.c.s
+++ b/test/torture-s/20051215-1.c.s
@@ -8,12 +8,12 @@ foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push7=, 1
 	i32.lt_s	$push0=, $1, $pop7
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$3=, 0
 	i32.const	$4=, 0
 	i32.const	$5=, 0
@@ -21,9 +21,9 @@ foo:                                    # @foo
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	block   	
-	i32.eqz 	$push13=, $2
-	br_if   	0, $pop13       # 0: down to label2
-# BB#3:                                 # %if.then
+	i32.eqz 	$push11=, $2
+	br_if   	0, $pop11       # 0: down to label2
+# %bb.3:                                # %if.then
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.load	$push1=, 0($2)
 	i32.mul 	$4=, $pop1, $3
@@ -31,17 +31,16 @@ foo:                                    # @foo
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label2:
 	i32.mul 	$push3=, $4, $0
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.gt_s	$push2=, $0, $pop11
-	i32.select	$push4=, $pop3, $pop12, $pop2
+	i32.const	$push10=, 0
+	i32.const	$push9=, 0
+	i32.gt_s	$push2=, $0, $pop9
+	i32.select	$push4=, $pop3, $pop10, $pop2
 	i32.add 	$5=, $5, $pop4
-	i32.const	$push10=, 1
-	i32.add 	$push9=, $3, $pop10
-	tee_local	$push8=, $3=, $pop9
-	i32.ne  	$push5=, $1, $pop8
+	i32.const	$push8=, 1
+	i32.add 	$3=, $3, $pop8
+	i32.ne  	$push5=, $1, $3
 	br_if   	0, $pop5        # 0: up to label1
-# BB#5:                                 # %for.end6
+# %bb.5:                                # %for.end6
 	end_loop
 	return  	$5
 .LBB0_6:
@@ -58,14 +57,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 3
 	i32.const	$push0=, 2
 	i32.const	$push3=, 0
 	i32.call	$push2=, foo@FUNCTION, $pop1, $pop0, $pop3
 	br_if   	0, $pop2        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -77,5 +76,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060102-1.c.s b/test/torture-s/20060102-1.c.s
index d46ddfdde..871c19d74 100644
--- a/test/torture-s/20060102-1.c.s
+++ b/test/torture-s/20060102-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_s	$push1=, $0, $pop0
 	i32.const	$push2=, 1
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push14=, 0
 	i32.load	$push0=, one($pop14)
@@ -41,7 +41,7 @@ main:                                   # @main
 	i32.or  	$push8=, $pop7, $pop10
 	i32.eq  	$push9=, $pop4, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push15=, 0
 	return  	$pop15
 .LBB1_2:                                # %if.then
@@ -62,5 +62,5 @@ one:
 	.size	one, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060110-1.c.s b/test/torture-s/20060110-1.c.s
index 762cc3409..3fd10c7aa 100644
--- a/test/torture-s/20060110-1.c.s
+++ b/test/torture-s/20060110-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 32
 	i64.shl 	$push1=, $0, $pop0
 	i64.const	$push3=, 32
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 0
 	i64.load32_s	$push1=, a($pop4)
@@ -31,7 +31,7 @@ main:                                   # @main
 	i64.load	$push0=, b($pop3)
 	i64.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB1_2:                                # %if.then
@@ -61,5 +61,5 @@ b:
 	.size	b, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060110-2.c.s b/test/torture-s/20060110-2.c.s
index eda056099..bca6f15b1 100644
--- a/test/torture-s/20060110-2.c.s
+++ b/test/torture-s/20060110-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.add 	$push0=, $1, $0
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push11=, 0
 	i64.load	$push1=, b($pop11)
@@ -39,7 +39,7 @@ main:                                   # @main
 	i64.load	$push6=, c($pop8)
 	i64.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push12=, 0
 	return  	$pop12
 .LBB1_2:                                # %if.then
@@ -78,5 +78,5 @@ c:
 	.size	c, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060127-1.c.s b/test/torture-s/20060127-1.c.s
index 7efd8f86f..0e0b7d098 100644
--- a/test/torture-s/20060127-1.c.s
+++ b/test/torture-s/20060127-1.c.s
@@ -6,11 +6,11 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.wrap/i64	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,12 +26,12 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, a($pop1)
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %f.exit
+# %bb.1:                                # %f.exit
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB1_2:                                # %if.then.i
@@ -52,5 +52,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060412-1.c.s b/test/torture-s/20060412-1.c.s
index 92a34e8a6..56932b962 100644
--- a/test/torture-s/20060412-1.c.s
+++ b/test/torture-s/20060412-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end5
+# %bb.0:                                # %if.end5
 	i32.const	$push2=, t+8
 	i32.const	$push1=, 255
 	i32.const	$push0=, 324
@@ -30,4 +30,4 @@ t:
 	.size	t, 332
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20060420-1.c.s b/test/torture-s/20060420-1.c.s
index 024a1a83f..f198a77a0 100644
--- a/test/torture-s/20060420-1.c.s
+++ b/test/torture-s/20060420-1.c.s
@@ -7,68 +7,65 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.local  	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
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.const	$push85=, 1
-	i32.lt_s	$push3=, $3, $pop85
+	i32.const	$push79=, 1
+	i32.lt_s	$push3=, $3, $pop79
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %land.rhs.lr.ph
-	i32.const	$push87=, -1
-	i32.add 	$8=, $2, $pop87
-	i32.const	$push86=, 4
-	i32.add 	$4=, $1, $pop86
+# %bb.1:                                # %land.rhs.lr.ph
+	i32.const	$push81=, -1
+	i32.add 	$8=, $2, $pop81
+	i32.const	$push80=, 4
+	i32.add 	$4=, $1, $pop80
 	i32.const	$10=, 0
 .LBB0_2:                                # %land.rhs
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_5 Depth 2
 	loop    	                # label2:
 	i32.add 	$push4=, $10, $0
-	i32.const	$push88=, 15
-	i32.and 	$push5=, $pop4, $pop88
-	i32.eqz 	$push171=, $pop5
-	br_if   	2, $pop171      # 2: down to label0
-# BB#3:                                 # %for.body
+	i32.const	$push82=, 15
+	i32.and 	$push5=, $pop4, $pop82
+	i32.eqz 	$push133=, $pop5
+	br_if   	2, $pop133      # 2: down to label0
+# %bb.3:                                # %for.body
                                         #   in Loop: Header=BB0_2 Depth=1
+	i32.const	$push84=, 2
+	i32.shl 	$12=, $10, $pop84
 	i32.load	$push7=, 0($1)
-	i32.const	$push92=, 2
-	i32.shl 	$push91=, $10, $pop92
-	tee_local	$push90=, $11=, $pop91
-	i32.add 	$push8=, $pop7, $pop90
+	i32.add 	$push8=, $pop7, $12
 	f32.load	$25=, 0($pop8)
 	block   	
-	i32.const	$push89=, 2
-	i32.lt_s	$push6=, $2, $pop89
+	i32.const	$push83=, 2
+	i32.lt_s	$push6=, $2, $pop83
 	br_if   	0, $pop6        # 0: down to label3
-# BB#4:                                 # %for.body4.preheader
+# %bb.4:                                # %for.body4.preheader
                                         #   in Loop: Header=BB0_2 Depth=1
-	copy_local	$12=, $8
-	copy_local	$9=, $4
+	copy_local	$9=, $8
+	copy_local	$11=, $4
 .LBB0_5:                                # %for.body4
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label4:
-	i32.load	$push9=, 0($9)
-	i32.add 	$push10=, $pop9, $11
+	i32.const	$push86=, -1
+	i32.add 	$9=, $9, $pop86
+	i32.load	$push9=, 0($11)
+	i32.add 	$push10=, $pop9, $12
 	f32.load	$push11=, 0($pop10)
 	f32.add 	$25=, $25, $pop11
-	i32.const	$push96=, 4
-	i32.add 	$push0=, $9, $pop96
-	copy_local	$9=, $pop0
-	i32.const	$push95=, -1
-	i32.add 	$push94=, $12, $pop95
-	tee_local	$push93=, $12=, $pop94
-	br_if   	0, $pop93       # 0: up to label4
+	i32.const	$push85=, 4
+	i32.add 	$push0=, $11, $pop85
+	copy_local	$11=, $pop0
+	br_if   	0, $9           # 0: up to label4
 .LBB0_6:                                # %for.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
 	end_block                       # label3:
-	i32.add 	$push12=, $0, $11
+	i32.add 	$push12=, $0, $12
 	f32.store	0($pop12), $25
-	i32.const	$push99=, 1
-	i32.add 	$push98=, $10, $pop99
-	tee_local	$push97=, $10=, $pop98
-	i32.lt_s	$push13=, $pop97, $3
+	i32.const	$push87=, 1
+	i32.add 	$10=, $10, $pop87
+	i32.lt_s	$push13=, $10, $3
 	br_if   	0, $pop13       # 0: up to label2
 	br      	2               # 2: down to label0
 .LBB0_7:
@@ -77,78 +74,71 @@ foo:                                    # @foo
 	i32.const	$10=, 0
 .LBB0_8:                                # %for.end11
 	end_block                       # label0:
-	block   	
 	i32.const	$push14=, -15
-	i32.add 	$push101=, $3, $pop14
-	tee_local	$push100=, $4=, $pop101
-	i32.ge_s	$push15=, $10, $pop100
+	i32.add 	$4=, $3, $pop14
+	block   	
+	i32.ge_s	$push15=, $10, $4
 	br_if   	0, $pop15       # 0: down to label5
-# BB#9:                                 # %for.body15.lr.ph
-	i32.const	$push104=, -1
-	i32.add 	$7=, $2, $pop104
-	i32.const	$push103=, 4
-	i32.add 	$6=, $1, $pop103
+# %bb.9:                                # %for.body15.lr.ph
+	i32.const	$push90=, -1
+	i32.add 	$7=, $2, $pop90
+	i32.const	$push89=, 4
+	i32.add 	$6=, $1, $pop89
 	i32.const	$push16=, -16
 	i32.add 	$push17=, $3, $pop16
 	i32.sub 	$push18=, $pop17, $10
-	i32.const	$push102=, -16
-	i32.and 	$push19=, $pop18, $pop102
+	i32.const	$push88=, -16
+	i32.and 	$push19=, $pop18, $pop88
 	i32.add 	$5=, $10, $pop19
 .LBB0_10:                               # %for.body15
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_12 Depth 2
 	loop    	                # label6:
+	i32.const	$push102=, 2
+	i32.shl 	$8=, $10, $pop102
 	i32.load	$push21=, 0($1)
-	i32.const	$push122=, 2
-	i32.shl 	$push121=, $10, $pop122
-	tee_local	$push120=, $8=, $pop121
-	i32.add 	$push119=, $pop21, $pop120
-	tee_local	$push118=, $9=, $pop119
-	f32.load	$25=, 48($pop118)
+	i32.add 	$9=, $pop21, $8
+	f32.load	$25=, 48($9)
 	f32.load	$21=, 32($9)
 	f32.load	$17=, 16($9)
+	f32.load	$15=, 8($9)
+	f32.load	$14=, 4($9)
 	f32.load	$13=, 0($9)
-	i32.const	$push117=, 60
-	i32.add 	$push22=, $9, $pop117
+	i32.const	$push101=, 60
+	i32.add 	$push22=, $9, $pop101
 	f32.load	$28=, 0($pop22)
-	i32.const	$push116=, 56
-	i32.add 	$push23=, $9, $pop116
+	i32.const	$push100=, 56
+	i32.add 	$push23=, $9, $pop100
 	f32.load	$27=, 0($pop23)
-	i32.const	$push115=, 52
-	i32.add 	$push24=, $9, $pop115
+	i32.const	$push99=, 52
+	i32.add 	$push24=, $9, $pop99
 	f32.load	$26=, 0($pop24)
-	i32.const	$push114=, 44
-	i32.add 	$push25=, $9, $pop114
+	i32.const	$push98=, 44
+	i32.add 	$push25=, $9, $pop98
 	f32.load	$24=, 0($pop25)
-	i32.const	$push113=, 40
-	i32.add 	$push26=, $9, $pop113
+	i32.const	$push97=, 40
+	i32.add 	$push26=, $9, $pop97
 	f32.load	$23=, 0($pop26)
-	i32.const	$push112=, 36
-	i32.add 	$push27=, $9, $pop112
+	i32.const	$push96=, 36
+	i32.add 	$push27=, $9, $pop96
 	f32.load	$22=, 0($pop27)
-	i32.const	$push111=, 28
-	i32.add 	$push28=, $9, $pop111
+	i32.const	$push95=, 28
+	i32.add 	$push28=, $9, $pop95
 	f32.load	$20=, 0($pop28)
-	i32.const	$push110=, 24
-	i32.add 	$push29=, $9, $pop110
+	i32.const	$push94=, 24
+	i32.add 	$push29=, $9, $pop94
 	f32.load	$19=, 0($pop29)
-	i32.const	$push109=, 20
-	i32.add 	$push30=, $9, $pop109
+	i32.const	$push93=, 20
+	i32.add 	$push30=, $9, $pop93
 	f32.load	$18=, 0($pop30)
-	i32.const	$push108=, 12
-	i32.add 	$push31=, $9, $pop108
+	i32.const	$push92=, 12
+	i32.add 	$push31=, $9, $pop92
 	f32.load	$16=, 0($pop31)
-	i32.const	$push107=, 8
-	i32.add 	$push32=, $9, $pop107
-	f32.load	$15=, 0($pop32)
-	i32.const	$push106=, 4
-	i32.add 	$push33=, $9, $pop106
-	f32.load	$14=, 0($pop33)
 	block   	
-	i32.const	$push105=, 2
-	i32.lt_s	$push20=, $2, $pop105
+	i32.const	$push91=, 2
+	i32.lt_s	$push20=, $2, $pop91
 	br_if   	0, $pop20       # 0: down to label7
-# BB#11:                                # %for.body33.preheader
+# %bb.11:                               # %for.body33.preheader
                                         #   in Loop: Header=BB0_10 Depth=1
 	copy_local	$11=, $7
 	copy_local	$12=, $6
@@ -156,181 +146,166 @@ foo:                                    # @foo
                                         #   Parent Loop BB0_10 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label8:
-	i32.load	$push34=, 0($12)
-	i32.add 	$push140=, $pop34, $8
-	tee_local	$push139=, $9=, $pop140
-	f32.load	$push35=, 48($pop139)
-	f32.add 	$25=, $25, $pop35
-	f32.load	$push36=, 32($9)
-	f32.add 	$21=, $21, $pop36
-	f32.load	$push37=, 16($9)
-	f32.add 	$17=, $17, $pop37
+	i32.const	$push114=, -1
+	i32.add 	$11=, $11, $pop114
+	i32.load	$push32=, 0($12)
+	i32.add 	$9=, $pop32, $8
+	f32.load	$push33=, 48($9)
+	f32.add 	$25=, $25, $pop33
+	f32.load	$push34=, 32($9)
+	f32.add 	$21=, $21, $pop34
+	f32.load	$push35=, 16($9)
+	f32.add 	$17=, $17, $pop35
+	f32.load	$push36=, 8($9)
+	f32.add 	$15=, $15, $pop36
+	f32.load	$push37=, 4($9)
+	f32.add 	$14=, $14, $pop37
 	f32.load	$push38=, 0($9)
 	f32.add 	$13=, $13, $pop38
-	i32.const	$push138=, 60
-	i32.add 	$push39=, $9, $pop138
+	i32.const	$push113=, 60
+	i32.add 	$push39=, $9, $pop113
 	f32.load	$push40=, 0($pop39)
 	f32.add 	$28=, $28, $pop40
-	i32.const	$push137=, 56
-	i32.add 	$push41=, $9, $pop137
+	i32.const	$push112=, 56
+	i32.add 	$push41=, $9, $pop112
 	f32.load	$push42=, 0($pop41)
 	f32.add 	$27=, $27, $pop42
-	i32.const	$push136=, 52
-	i32.add 	$push43=, $9, $pop136
+	i32.const	$push111=, 52
+	i32.add 	$push43=, $9, $pop111
 	f32.load	$push44=, 0($pop43)
 	f32.add 	$26=, $26, $pop44
-	i32.const	$push135=, 44
-	i32.add 	$push45=, $9, $pop135
+	i32.const	$push110=, 44
+	i32.add 	$push45=, $9, $pop110
 	f32.load	$push46=, 0($pop45)
 	f32.add 	$24=, $24, $pop46
-	i32.const	$push134=, 40
-	i32.add 	$push47=, $9, $pop134
+	i32.const	$push109=, 40
+	i32.add 	$push47=, $9, $pop109
 	f32.load	$push48=, 0($pop47)
 	f32.add 	$23=, $23, $pop48
-	i32.const	$push133=, 36
-	i32.add 	$push49=, $9, $pop133
+	i32.const	$push108=, 36
+	i32.add 	$push49=, $9, $pop108
 	f32.load	$push50=, 0($pop49)
 	f32.add 	$22=, $22, $pop50
-	i32.const	$push132=, 28
-	i32.add 	$push51=, $9, $pop132
+	i32.const	$push107=, 28
+	i32.add 	$push51=, $9, $pop107
 	f32.load	$push52=, 0($pop51)
 	f32.add 	$20=, $20, $pop52
-	i32.const	$push131=, 24
-	i32.add 	$push53=, $9, $pop131
+	i32.const	$push106=, 24
+	i32.add 	$push53=, $9, $pop106
 	f32.load	$push54=, 0($pop53)
 	f32.add 	$19=, $19, $pop54
-	i32.const	$push130=, 20
-	i32.add 	$push55=, $9, $pop130
+	i32.const	$push105=, 20
+	i32.add 	$push55=, $9, $pop105
 	f32.load	$push56=, 0($pop55)
 	f32.add 	$18=, $18, $pop56
-	i32.const	$push129=, 12
-	i32.add 	$push57=, $9, $pop129
+	i32.const	$push104=, 12
+	i32.add 	$push57=, $9, $pop104
 	f32.load	$push58=, 0($pop57)
 	f32.add 	$16=, $16, $pop58
-	i32.const	$push128=, 8
-	i32.add 	$push59=, $9, $pop128
-	f32.load	$push60=, 0($pop59)
-	f32.add 	$15=, $15, $pop60
-	i32.const	$push127=, 4
-	i32.add 	$push61=, $9, $pop127
-	f32.load	$push62=, 0($pop61)
-	f32.add 	$14=, $14, $pop62
-	i32.const	$push126=, 4
-	i32.add 	$push1=, $12, $pop126
+	i32.const	$push103=, 4
+	i32.add 	$push1=, $12, $pop103
 	copy_local	$12=, $pop1
-	i32.const	$push125=, -1
-	i32.add 	$push124=, $11, $pop125
-	tee_local	$push123=, $11=, $pop124
-	br_if   	0, $pop123      # 0: up to label8
+	br_if   	0, $11          # 0: up to label8
 .LBB0_13:                               # %for.end56
                                         #   in Loop: Header=BB0_10 Depth=1
 	end_loop
 	end_block                       # label7:
-	i32.add 	$push157=, $0, $8
-	tee_local	$push156=, $9=, $pop157
-	f32.store	16($pop156), $17
+	i32.add 	$9=, $0, $8
+	f32.store	16($9), $17
+	f32.store	8($9), $15
+	f32.store	4($9), $14
 	f32.store	0($9), $13
 	f32.store	32($9), $21
 	f32.store	48($9), $25
-	i32.const	$push155=, 28
-	i32.add 	$push63=, $9, $pop155
-	f32.store	0($pop63), $20
-	i32.const	$push154=, 24
-	i32.add 	$push64=, $9, $pop154
-	f32.store	0($pop64), $19
-	i32.const	$push153=, 20
-	i32.add 	$push65=, $9, $pop153
-	f32.store	0($pop65), $18
-	i32.const	$push152=, 12
-	i32.add 	$push66=, $9, $pop152
-	f32.store	0($pop66), $16
-	i32.const	$push151=, 8
-	i32.add 	$push67=, $9, $pop151
-	f32.store	0($pop67), $15
-	i32.const	$push150=, 4
-	i32.add 	$push68=, $9, $pop150
-	f32.store	0($pop68), $14
-	i32.const	$push149=, 44
-	i32.add 	$push69=, $9, $pop149
-	f32.store	0($pop69), $24
-	i32.const	$push148=, 40
-	i32.add 	$push70=, $9, $pop148
-	f32.store	0($pop70), $23
-	i32.const	$push147=, 36
-	i32.add 	$push71=, $9, $pop147
-	f32.store	0($pop71), $22
-	i32.const	$push146=, 60
-	i32.add 	$push72=, $9, $pop146
-	f32.store	0($pop72), $28
-	i32.const	$push145=, 56
-	i32.add 	$push73=, $9, $pop145
-	f32.store	0($pop73), $27
-	i32.const	$push144=, 52
-	i32.add 	$push74=, $9, $pop144
-	f32.store	0($pop74), $26
-	i32.const	$push143=, 16
-	i32.add 	$push142=, $10, $pop143
-	tee_local	$push141=, $10=, $pop142
-	i32.lt_s	$push75=, $pop141, $4
-	br_if   	0, $pop75       # 0: up to label6
-# BB#14:                                # %for.end72.loopexit
+	i32.const	$push125=, 28
+	i32.add 	$push59=, $9, $pop125
+	f32.store	0($pop59), $20
+	i32.const	$push124=, 24
+	i32.add 	$push60=, $9, $pop124
+	f32.store	0($pop60), $19
+	i32.const	$push123=, 20
+	i32.add 	$push61=, $9, $pop123
+	f32.store	0($pop61), $18
+	i32.const	$push122=, 12
+	i32.add 	$push62=, $9, $pop122
+	f32.store	0($pop62), $16
+	i32.const	$push121=, 44
+	i32.add 	$push63=, $9, $pop121
+	f32.store	0($pop63), $24
+	i32.const	$push120=, 40
+	i32.add 	$push64=, $9, $pop120
+	f32.store	0($pop64), $23
+	i32.const	$push119=, 36
+	i32.add 	$push65=, $9, $pop119
+	f32.store	0($pop65), $22
+	i32.const	$push118=, 60
+	i32.add 	$push66=, $9, $pop118
+	f32.store	0($pop66), $28
+	i32.const	$push117=, 56
+	i32.add 	$push67=, $9, $pop117
+	f32.store	0($pop67), $27
+	i32.const	$push116=, 52
+	i32.add 	$push68=, $9, $pop116
+	f32.store	0($pop68), $26
+	i32.const	$push115=, 16
+	i32.add 	$10=, $10, $pop115
+	i32.lt_s	$push69=, $10, $4
+	br_if   	0, $pop69       # 0: up to label6
+# %bb.14:                               # %for.end72.loopexit
 	end_loop
-	i32.const	$push76=, 16
-	i32.add 	$10=, $5, $pop76
+	i32.const	$push70=, 16
+	i32.add 	$10=, $5, $pop70
 .LBB0_15:                               # %for.end72
 	end_block                       # label5:
 	block   	
-	i32.ge_s	$push77=, $10, $3
-	br_if   	0, $pop77       # 0: down to label9
-# BB#16:                                # %for.body75.lr.ph
-	i32.const	$push159=, -1
-	i32.add 	$4=, $2, $pop159
-	i32.const	$push158=, 4
-	i32.add 	$7=, $1, $pop158
+	i32.ge_s	$push71=, $10, $3
+	br_if   	0, $pop71       # 0: down to label9
+# %bb.16:                               # %for.body75.lr.ph
+	i32.const	$push127=, -1
+	i32.add 	$4=, $2, $pop127
+	i32.const	$push126=, 4
+	i32.add 	$7=, $1, $pop126
 	i32.load	$8=, 0($1)
 .LBB0_17:                               # %for.body75
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_19 Depth 2
 	loop    	                # label10:
-	i32.const	$push163=, 2
-	i32.shl 	$push162=, $10, $pop163
-	tee_local	$push161=, $11=, $pop162
-	i32.add 	$push79=, $8, $pop161
-	f32.load	$25=, 0($pop79)
+	i32.const	$push129=, 2
+	i32.shl 	$12=, $10, $pop129
+	i32.add 	$push73=, $8, $12
+	f32.load	$25=, 0($pop73)
 	block   	
-	i32.const	$push160=, 2
-	i32.lt_s	$push78=, $2, $pop160
-	br_if   	0, $pop78       # 0: down to label11
-# BB#18:                                # %for.body81.preheader
+	i32.const	$push128=, 2
+	i32.lt_s	$push72=, $2, $pop128
+	br_if   	0, $pop72       # 0: down to label11
+# %bb.18:                               # %for.body81.preheader
                                         #   in Loop: Header=BB0_17 Depth=1
-	copy_local	$12=, $4
-	copy_local	$9=, $7
+	copy_local	$9=, $4
+	copy_local	$11=, $7
 .LBB0_19:                               # %for.body81
                                         #   Parent Loop BB0_17 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label12:
-	i32.load	$push80=, 0($9)
-	i32.add 	$push81=, $pop80, $11
-	f32.load	$push82=, 0($pop81)
-	f32.add 	$25=, $25, $pop82
-	i32.const	$push167=, 4
-	i32.add 	$push2=, $9, $pop167
-	copy_local	$9=, $pop2
-	i32.const	$push166=, -1
-	i32.add 	$push165=, $12, $pop166
-	tee_local	$push164=, $12=, $pop165
-	br_if   	0, $pop164      # 0: up to label12
+	i32.const	$push131=, -1
+	i32.add 	$9=, $9, $pop131
+	i32.load	$push74=, 0($11)
+	i32.add 	$push75=, $pop74, $12
+	f32.load	$push76=, 0($pop75)
+	f32.add 	$25=, $25, $pop76
+	i32.const	$push130=, 4
+	i32.add 	$push2=, $11, $pop130
+	copy_local	$11=, $pop2
+	br_if   	0, $9           # 0: up to label12
 .LBB0_20:                               # %for.end87
                                         #   in Loop: Header=BB0_17 Depth=1
 	end_loop
 	end_block                       # label11:
-	i32.add 	$push83=, $0, $11
-	f32.store	0($pop83), $25
-	i32.const	$push170=, 1
-	i32.add 	$push169=, $10, $pop170
-	tee_local	$push168=, $10=, $pop169
-	i32.ne  	$push84=, $pop168, $3
-	br_if   	0, $pop84       # 0: up to label10
+	i32.add 	$push77=, $0, $12
+	f32.store	0($pop77), $25
+	i32.const	$push132=, 1
+	i32.add 	$10=, $10, $pop132
+	i32.ne  	$push78=, $10, $3
+	br_if   	0, $pop78       # 0: up to label10
 .LBB0_21:                               # %for.end91
 	end_loop
 	end_block                       # label9:
@@ -346,101 +321,93 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	f32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push28=, 0
+	i32.load	$push27=, __stack_pointer($pop28)
+	i32.const	$push29=, 16
+	i32.sub 	$3=, $pop27, $pop29
+	i32.const	$push30=, 0
+	i32.store	__stack_pointer($pop30), $3
 	i32.const	$2=, 0
-	i32.const	$push41=, 0
+	i32.const	$push36=, 0
 	i32.const	$push0=, buffer
-	i32.sub 	$push1=, $pop41, $pop0
+	i32.sub 	$push1=, $pop36, $pop0
 	i32.const	$push2=, 63
-	i32.and 	$push40=, $pop1, $pop2
-	tee_local	$push39=, $1=, $pop40
+	i32.and 	$1=, $pop1, $pop2
 	i32.const	$push3=, buffer+128
-	i32.add 	$push4=, $pop39, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.store	12($3), $pop4
 	i32.const	$push5=, buffer+64
-	i32.add 	$push38=, $1, $pop5
-	tee_local	$push37=, $1=, $pop38
-	i32.store	8($3), $pop37
+	i32.add 	$1=, $1, $pop5
+	i32.store	8($3), $1
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	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.convert_s/i32	$0=, $2
+	i32.const	$push42=, 64
+	i32.add 	$push6=, $1, $pop42
+	f32.const	$push41=, 0x1.8p3
+	f32.mul 	$push7=, $0, $pop41
 	f32.add 	$push8=, $pop7, $0
 	f32.store	0($pop6), $pop8
-	f32.const	$push49=, 0x1.6p3
-	f32.mul 	$push9=, $0, $pop49
+	f32.const	$push40=, 0x1.6p3
+	f32.mul 	$push9=, $0, $pop40
 	f32.add 	$push10=, $pop9, $0
 	f32.store	0($1), $pop10
-	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
+	i32.const	$push39=, 4
+	i32.add 	$1=, $1, $pop39
+	i32.const	$push38=, 1
+	i32.add 	$2=, $2, $pop38
+	i32.const	$push37=, 16
+	i32.ne  	$push11=, $2, $pop37
 	br_if   	0, $pop11       # 0: up to label13
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	i32.const	$push13=, 0
+	i32.const	$1=, 0
+	i32.const	$push44=, 0
 	i32.const	$push12=, buffer
-	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
+	i32.sub 	$push13=, $pop44, $pop12
+	i32.const	$push14=, 63
+	i32.and 	$push15=, $pop13, $pop14
+	i32.const	$push43=, buffer
+	i32.add 	$2=, $pop15, $pop43
+	i32.const	$push34=, 8
+	i32.add 	$push35=, $3, $pop34
+	i32.const	$push17=, 2
+	i32.const	$push16=, 16
+	call    	foo@FUNCTION, $2, $pop35, $pop17, $pop16
 .LBB1_3:                                # %for.body16
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label15:
-	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 	$push22=, $pop59, $pop58
-	f32.const	$push57=, 0x1.6p3
-	f32.mul 	$push19=, $0, $pop57
+	f32.convert_s/i32	$0=, $1
+	f32.load	$push23=, 0($2)
+	f32.const	$push46=, 0x1.8p3
+	f32.mul 	$push18=, $0, $pop46
+	f32.const	$push45=, 0x1.6p3
+	f32.mul 	$push19=, $0, $pop45
 	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
+	f32.add 	$push22=, $pop18, $pop21
+	f32.ne  	$push24=, $pop23, $pop22
+	br_if   	1, $pop24       # 1: down to label14
+# %bb.4:                                # %for.cond13
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push65=, 4
-	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
+	i32.const	$push49=, 1
+	i32.add 	$1=, $1, $pop49
+	i32.const	$push48=, 4
+	i32.add 	$2=, $2, $pop48
+	i32.const	$push47=, 15
+	i32.le_u	$push25=, $1, $pop47
+	br_if   	0, $pop25       # 0: up to label15
+# %bb.5:                                # %for.end31
 	end_loop
-	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
+	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
 .LBB1_6:                                # %if.then
 	end_block                       # label14:
 	call    	abort@FUNCTION
@@ -459,5 +426,5 @@ buffer:
 	.size	buffer, 256
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060905-1.c.s b/test/torture-s/20060905-1.c.s
index 327a3a665..56a2f59f5 100644
--- a/test/torture-s/20060905-1.c.s
+++ b/test/torture-s/20060905-1.c.s
@@ -6,42 +6,46 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$0=, 128
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$0=, s-384
 	i32.const	$1=, 0
-.LBB0_1:                                # %for.body.outer.i
+	i32.const	$2=, 0
+.LBB0_1:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	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
+	block   	
+	i32.const	$push6=, 128
+	i32.lt_u	$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	$push11=, 3
+	i32.add 	$0=, $0, $pop11
+	i32.const	$push10=, 1
+	i32.add 	$2=, $2, $pop10
+	i32.const	$push9=, 256
+	i32.ne  	$push2=, $2, $pop9
+	br_if   	0, $pop2        # 0: up to label0
+# %bb.4:                                # %foo.exit
 	end_loop
 	block   	
-	br_if   	0, $0           # 0: down to label1
-# BB#3:                                 # %if.end
+	i32.const	$push3=, 128
+	i32.ne  	$push4=, $1, $pop3
+	br_if   	0, $pop4        # 0: down to label2
+# %bb.5:                                # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
-.LBB0_4:                                # %if.then
-	end_block                       # label1:
+.LBB0_6:                                # %if.then
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -66,5 +70,5 @@ g:
 	.size	g, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060910-1.c.s b/test/torture-s/20060910-1.c.s
index 6a60d4352..58e0d4c47 100644
--- a/test/torture-s/20060910-1.c.s
+++ b/test/torture-s/20060910-1.c.s
@@ -7,7 +7,7 @@
 input_getc_complicated:                 # @input_getc_complicated
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -22,60 +22,49 @@ check_header:                           # @check_header
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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.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
+# %bb.0:                                # %entry
+	i32.load	$1=, 4($0)
+	i32.load	$2=, 0($0)
+	i32.lt_u	$3=, $2, $1
+	i32.const	$push15=, 1
+	i32.add 	$push0=, $2, $pop15
+	i32.select	$2=, $pop0, $2, $3
+	i32.lt_u	$4=, $2, $1
+	i32.const	$push14=, 1
+	i32.add 	$push1=, $2, $pop14
+	i32.select	$2=, $pop1, $2, $4
+	i32.lt_u	$5=, $2, $1
 	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
+	i32.add 	$push2=, $2, $pop13
+	i32.select	$2=, $pop2, $2, $5
+	i32.lt_u	$6=, $2, $1
+	i32.const	$push12=, 1
+	i32.add 	$push3=, $2, $pop12
+	i32.select	$2=, $pop3, $2, $6
+	i32.lt_u	$7=, $2, $1
+	i32.const	$push11=, 1
+	i32.add 	$push4=, $2, $pop11
+	i32.select	$2=, $pop4, $2, $7
 	block   	
 	br_if   	0, $3           # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	br_if   	0, $4           # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	br_if   	0, $5           # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	br_if   	0, $6           # 0: down to label0
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	br_if   	0, $7           # 0: down to label0
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.lt_u	$push5=, $2, $1
 	br_if   	0, $pop5        # 0: down to label0
-# BB#6:
+# %bb.6:
 	i32.const	$push10=, 1
 	return  	$pop10
 .LBB1_7:
 	end_block                       # label0:
-	i32.const	$push38=, 1
-	i32.add 	$push7=, $2, $pop38
+	i32.const	$push16=, 1
+	i32.add 	$push7=, $2, $pop16
 	i32.lt_u	$push6=, $2, $1
 	i32.select	$push8=, $pop7, $2, $pop6
 	i32.store	0($0), $pop8
@@ -91,7 +80,7 @@ check_header:                           # @check_header
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end2
+# %bb.0:                                # %if.end2
 	i32.const	$push1=, 0
 	i32.const	$push0=, b+6
 	i32.store	s($pop1), $pop0
@@ -122,4 +111,4 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20060929-1.c.s b/test/torture-s/20060929-1.c.s
index bc333efdb..f1aa8e43d 100644
--- a/test/torture-s/20060929-1.c.s
+++ b/test/torture-s/20060929-1.c.s
@@ -7,11 +7,10 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.load	$push4=, 0($0)
-	tee_local	$push3=, $2=, $pop4
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	i32.load	$push0=, 0($1)
-	i32.store	0($pop3), $pop0
+	i32.store	0($2), $pop0
 	i32.const	$push1=, 4
 	i32.add 	$push2=, $2, $pop1
 	i32.store	0($0), $pop2
@@ -27,11 +26,10 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.load	$push4=, 0($0)
-	tee_local	$push3=, $2=, $pop4
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	i32.load	$push0=, 0($1)
-	i32.store	0($pop3), $pop0
+	i32.store	0($2), $pop0
 	i32.const	$push1=, 4
 	i32.add 	$push2=, $2, $pop1
 	i32.store	0($0), $pop2
@@ -47,11 +45,10 @@ bar:                                    # @bar
 baz:                                    # @baz
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.load	$push4=, 0($0)
-	tee_local	$push3=, $2=, $pop4
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	i32.load	$push0=, 0($1)
-	i32.store	0($pop3), $pop0
+	i32.store	0($2), $pop0
 	i32.const	$push1=, 4
 	i32.add 	$push2=, $2, $pop1
 	i32.store	0($0), $pop2
@@ -66,7 +63,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end19
+# %bb.0:                                # %if.end19
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -74,4 +71,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20060930-1.c.s b/test/torture-s/20060930-1.c.s
index dade2ac24..6c9f2539c 100644
--- a/test/torture-s/20060930-1.c.s
+++ b/test/torture-s/20060930-1.c.s
@@ -7,12 +7,12 @@
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$1
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,32 +28,30 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 1
 	i32.lt_s	$push4=, $1, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push0=, 0
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.sub 	$push2=, $pop11, $0
+	i32.sub 	$push2=, $pop0, $0
 	i32.const	$push10=, 0
 	i32.gt_s	$push1=, $0, $pop10
-	i32.select	$push9=, $pop2, $0, $pop1
-	tee_local	$push8=, $0=, $pop9
-	i32.sub 	$push6=, $pop12, $pop8
+	i32.select	$0=, $pop2, $0, $pop1
+	i32.const	$push9=, 0
+	i32.const	$push8=, 0
+	i32.sub 	$push6=, $pop8, $0
 	i32.const	$push7=, -1
 	i32.gt_s	$push5=, $0, $pop7
-	i32.select	$0=, $pop0, $pop6, $pop5
+	i32.select	$0=, $pop9, $pop6, $pop5
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	i32.call	$drop=, bar@FUNCTION, $1, $0
-	i32.const	$push15=, -1
-	i32.add 	$push14=, $1, $pop15
-	tee_local	$push13=, $1=, $pop14
-	br_if   	0, $pop13       # 0: up to label2
+	i32.const	$push11=, -1
+	i32.add 	$1=, $1, $pop11
+	br_if   	0, $1           # 0: up to label2
 .LBB1_3:                                # %for.end
 	end_loop
 	end_block                       # label1:
@@ -68,7 +66,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.const	$push2=, 1
 	call    	foo@FUNCTION, $pop0, $pop2
@@ -79,5 +77,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20060930-2.c.s b/test/torture-s/20060930-2.c.s
index 2ce25e2fd..bca415e14 100644
--- a/test/torture-s/20060930-2.c.s
+++ b/test/torture-s/20060930-2.c.s
@@ -7,7 +7,7 @@
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, s
 	i32.store	0($1), $pop0
 	i32.const	$push1=, 0
@@ -25,7 +25,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.const	$push0=, t
 	i32.store	t($pop6), $pop0
@@ -36,7 +36,7 @@ main:                                   # @main
 	i32.const	$push4=, t
 	i32.ne  	$push3=, $pop2, $pop4
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB1_2:                                # %if.then
@@ -66,5 +66,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20061031-1.c.s b/test/torture-s/20061031-1.c.s
index ea5d72267..29b4c3cdd 100644
--- a/test/torture-s/20061031-1.c.s
+++ b/test/torture-s/20061031-1.c.s
@@ -6,7 +6,7 @@
 	.type	ff,@function
 ff:                                     # @ff
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -21,16 +21,15 @@ ff:                                     # @ff
 f:                                      # @f
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	ff@FUNCTION, $0
-	block   	
 	i32.const	$push0=, 2
-	i32.add 	$push6=, $0, $pop0
-	tee_local	$push5=, $1=, $pop6
+	i32.add 	$1=, $0, $pop0
+	block   	
 	i32.const	$push4=, 65535
-	i32.and 	$push1=, $pop5, $pop4
+	i32.and 	$push1=, $1, $pop4
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	#APP
 	#NO_APP
 .LBB1_2:                                # %for.inc
@@ -38,11 +37,11 @@ f:                                      # @f
 	call    	ff@FUNCTION, $0
 	block   	
 	i32.add 	$push2=, $1, $0
-	i32.const	$push7=, 65535
-	i32.and 	$push3=, $pop2, $pop7
-	i32.eqz 	$push8=, $pop3
-	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %for.inc.1
+	i32.const	$push5=, 65535
+	i32.and 	$push3=, $pop2, $pop5
+	i32.eqz 	$push6=, $pop3
+	br_if   	0, $pop6        # 0: down to label1
+# %bb.3:                                # %for.inc.1
 	return
 .LBB1_4:                                # %if.then.1
 	end_block                       # label1:
@@ -59,7 +58,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	call    	f@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -77,4 +76,4 @@ nunmap:
 	.size	nunmap, 3
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20061101-1.c.s b/test/torture-s/20061101-1.c.s
index f2d52d7b0..f177754f8 100644
--- a/test/torture-s/20061101-1.c.s
+++ b/test/torture-s/20061101-1.c.s
@@ -7,12 +7,12 @@
 tar:                                    # @tar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 36863
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, -1
 	return  	$pop2
 .LBB0_2:                                # %if.then
@@ -29,7 +29,7 @@ tar:                                    # @tar
 	.type	bug,@function
 bug:                                    # @bug
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.const	$push2=, -1
@@ -41,7 +41,7 @@ bug:                                    # @bug
 	i32.const	$push6=, 36863
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#1:                                 # %while.end
+# %bb.1:                                # %while.end
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -57,7 +57,7 @@ bug:                                    # @bug
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -65,5 +65,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20061101-2.c.s b/test/torture-s/20061101-2.c.s
index cfb25950c..cf0083e2c 100644
--- a/test/torture-s/20061101-2.c.s
+++ b/test/torture-s/20061101-2.c.s
@@ -7,12 +7,12 @@
 tar:                                    # @tar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 36863
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, -1
 	return  	$pop2
 .LBB0_2:                                # %if.then
@@ -29,7 +29,7 @@ tar:                                    # @tar
 	.type	bug,@function
 bug:                                    # @bug
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.const	$push2=, -1
@@ -41,7 +41,7 @@ bug:                                    # @bug
 	i32.const	$push6=, 36863
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#1:                                 # %while.end
+# %bb.1:                                # %while.end
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -57,7 +57,7 @@ bug:                                    # @bug
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -65,5 +65,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20070201-1.c.s b/test/torture-s/20070201-1.c.s
index 376ab5b7f..fd44f8d72 100644
--- a/test/torture-s/20070201-1.c.s
+++ b/test/torture-s/20070201-1.c.s
@@ -8,14 +8,13 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop3, $pop5
-	tee_local	$push10=, $2=, $pop11
-	i32.store	__stack_pointer($pop6), $pop10
+	i32.sub 	$2=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $2
 	i32.store	0($2), $1
 	i32.const	$push0=, .L.str
 	i32.call	$drop=, sprintf@FUNCTION, $0, $pop0, $2
@@ -37,14 +36,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
-	i32.const	$push7=, 0
+# %bb.0:                                # %if.end
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop4, $pop6
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop7), $pop13
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push0=, 12
 	i32.add 	$push1=, $0, $pop0
 	i32.store	0($0), $pop1
@@ -69,5 +67,5 @@ main:                                   # @main
 	.size	.L.str, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	sprintf, i32, i32, i32
diff --git a/test/torture-s/20070212-1.c.s b/test/torture-s/20070212-1.c.s
index f2be8e7bf..2dc154c29 100644
--- a/test/torture-s/20070212-1.c.s
+++ b/test/torture-s/20070212-1.c.s
@@ -8,18 +8,17 @@ g:                                      # @g
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$4=, __stack_pointer($pop3)
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
+	i32.const	$push5=, 16
+	i32.sub 	$4=, $pop3, $pop5
 	i32.const	$push0=, 0
 	i32.store	0($3), $pop0
-	i32.const	$push4=, 16
-	i32.sub 	$push8=, $4, $pop4
-	tee_local	$push7=, $3=, $pop8
-	i32.store	12($pop7), $0
-	i32.const	$push5=, 12
-	i32.add 	$push6=, $3, $pop5
-	i32.select	$push1=, $pop6, $2, $1
+	i32.store	12($4), $0
+	i32.const	$push6=, 12
+	i32.add 	$push7=, $4, $pop6
+	i32.select	$push1=, $pop7, $2, $1
 	i32.load	$push2=, 0($pop1)
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -32,7 +31,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -40,4 +39,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20070212-2.c.s b/test/torture-s/20070212-2.c.s
index abc22d8fc..145de2adb 100644
--- a/test/torture-s/20070212-2.c.s
+++ b/test/torture-s/20070212-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.select	$push1=, $pop0, $2, $0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20070212-3.c.s b/test/torture-s/20070212-3.c.s
index e5512c264..ade429f8e 100644
--- a/test/torture-s/20070212-3.c.s
+++ b/test/torture-s/20070212-3.c.s
@@ -8,22 +8,21 @@ bar:                                    # @bar
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $0, $pop0
-	i32.select	$push5=, $0, $pop1, $2
-	tee_local	$push4=, $4=, $pop5
-	i32.load	$2=, 0($pop4)
+	i32.select	$2=, $0, $pop1, $2
+	i32.load	$4=, 0($2)
 	i32.const	$push2=, 1
 	i32.store	0($0), $pop2
 	block   	
-	i32.eqz 	$push6=, $3
-	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.then3
-	i32.load	$1=, 0($4)
+	i32.eqz 	$push4=, $3
+	br_if   	0, $pop4        # 0: down to label0
+# %bb.1:                                # %if.then3
+	i32.load	$1=, 0($2)
 .LBB0_2:                                # %if.end5
 	end_block                       # label0:
-	i32.add 	$push3=, $1, $2
+	i32.add 	$push3=, $1, $4
                                         # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
@@ -35,7 +34,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -43,4 +42,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20070424-1.c.s b/test/torture-s/20070424-1.c.s
index 502de556e..f1ff4945a 100644
--- a/test/torture-s/20070424-1.c.s
+++ b/test/torture-s/20070424-1.c.s
@@ -5,7 +5,7 @@
 	.globl	do_exit
 	.type	do_exit,@function
 do_exit:                                # @do_exit
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -18,7 +18,7 @@ do_exit:                                # @do_exit
 	.globl	do_abort
 	.type	do_abort,@function
 do_abort:                               # @do_abort
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -31,11 +31,11 @@ do_abort:                               # @do_abort
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ge_s	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %doit
+# %bb.1:                                # %doit
 	call    	do_abort@FUNCTION
 	unreachable
 .LBB2_2:                                # %if.end
@@ -52,7 +52,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	do_exit@FUNCTION
 	unreachable
 	.endfunc
@@ -60,6 +60,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 30d653189..a7faf173b 100644
--- a/test/torture-s/20070517-1.c.s
+++ b/test/torture-s/20070517-1.c.s
@@ -7,22 +7,21 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.call	$0=, get_kind@FUNCTION
 	block   	
 	block   	
-	i32.call	$push12=, get_kind@FUNCTION
-	tee_local	$push11=, $0=, $pop12
 	i32.const	$push0=, 10
-	i32.gt_u	$push1=, $pop11, $pop0
+	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 1
 	i32.shl 	$push3=, $pop2, $0
 	i32.const	$push4=, 1568
 	i32.and 	$push5=, $pop3, $pop4
-	i32.eqz 	$push13=, $pop5
-	br_if   	0, $pop13       # 0: down to label1
-# BB#2:                                 # %if.then.i
+	i32.eqz 	$push11=, $pop5
+	br_if   	0, $pop11       # 0: down to label1
+# %bb.2:                                # %if.then.i
 	i32.const	$push6=, -9
 	i32.add 	$push7=, $0, $pop6
 	i32.const	$push8=, 2
@@ -45,14 +44,13 @@ main:                                   # @main
 get_kind:                               # @get_kind
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push6=, $pop2, $pop4
-	tee_local	$push5=, $0=, $pop6
+	i32.sub 	$0=, $pop2, $pop4
 	i32.const	$push0=, 10
-	i32.store	12($pop5), $pop0
+	i32.store	12($0), $pop0
 	i32.load	$push1=, 12($0)
                                         # fallthrough-return: $pop1
 	.endfunc
@@ -60,5 +58,5 @@ get_kind:                               # @get_kind
 	.size	get_kind, .Lfunc_end1-get_kind
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20070614-1.c.s b/test/torture-s/20070614-1.c.s
index 5c596b4a0..f8155544e 100644
--- a/test/torture-s/20070614-1.c.s
+++ b/test/torture-s/20070614-1.c.s
@@ -6,20 +6,20 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.load	$push3=, 0($0)
 	i32.const	$push6=, 0
 	f64.load	$push2=, v($pop6)
 	f64.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.load	$push0=, 8($0)
 	i32.const	$push7=, 0
 	f64.load	$push1=, v+8($pop7)
 	f64.ne  	$push5=, $pop0, $pop1
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -35,7 +35,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, v($pop0)
 	i64.store	0($0), $pop1
@@ -53,22 +53,20 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.result 	i32
-	.local  	f64
-# BB#0:                                 # %entry
+	.local  	f64, f64
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	f64.load	$0=, v+8($pop4)
+	i32.const	$push3=, 0
+	f64.load	$1=, v($pop3)
 	block   	
-	i32.const	$push8=, 0
-	f64.load	$push7=, v($pop8)
-	tee_local	$push6=, $0=, $pop7
-	f64.ne  	$push1=, $pop6, $0
-	i32.const	$push5=, 0
-	f64.load	$push4=, v+8($pop5)
-	tee_local	$push3=, $0=, $pop4
-	f64.ne  	$push0=, $pop3, $0
+	f64.ne  	$push1=, $1, $1
+	f64.ne  	$push0=, $0, $0
 	i32.or  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry.split
-	i32.const	$push9=, 0
-	return  	$pop9
+# %bb.1:                                # %entry.split
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB2_2:                                # %if.then.i.split
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -83,23 +81,21 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	f64
-# BB#0:                                 # %entry
+	.local  	f64, f64
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	f64.load	$0=, v+8($pop4)
+	i32.const	$push3=, 0
+	f64.load	$1=, v($pop3)
 	block   	
-	i32.const	$push8=, 0
-	f64.load	$push7=, v($pop8)
-	tee_local	$push6=, $0=, $pop7
-	f64.eq  	$push1=, $pop6, $0
-	i32.const	$push5=, 0
-	f64.load	$push4=, v+8($pop5)
-	tee_local	$push3=, $0=, $pop4
-	f64.eq  	$push0=, $pop3, $0
+	f64.eq  	$push1=, $1, $1
+	f64.eq  	$push0=, $0, $0
 	i32.and 	$push2=, $pop1, $pop0
-	i32.eqz 	$push10=, $pop2
-	br_if   	0, $pop10       # 0: down to label2
-# BB#1:                                 # %baz.exit
-	i32.const	$push9=, 0
-	return  	$pop9
+	i32.eqz 	$push6=, $pop2
+	br_if   	0, $pop6        # 0: down to label2
+# %bb.1:                                # %baz.exit
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB3_2:                                # %if.then.i.split.i
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -119,5 +115,5 @@ v:
 	.size	v, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20070623-1.c.s b/test/torture-s/20070623-1.c.s
index 9f27c10ba..4dab919e9 100644
--- a/test/torture-s/20070623-1.c.s
+++ b/test/torture-s/20070623-1.c.s
@@ -7,7 +7,7 @@
 nge:                                    # @nge
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.ge_s	$push0=, $0, $1
@@ -24,7 +24,7 @@ nge:                                    # @nge
 ngt:                                    # @ngt
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.gt_s	$push0=, $0, $1
@@ -41,7 +41,7 @@ ngt:                                    # @ngt
 nle:                                    # @nle
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.le_s	$push0=, $0, $1
@@ -58,7 +58,7 @@ nle:                                    # @nle
 nlt:                                    # @nlt
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.lt_s	$push0=, $0, $1
@@ -75,7 +75,7 @@ nlt:                                    # @nlt
 neq:                                    # @neq
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.eq  	$push0=, $0, $1
@@ -92,7 +92,7 @@ neq:                                    # @neq
 nne:                                    # @nne
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.ne  	$push0=, $0, $1
@@ -109,7 +109,7 @@ nne:                                    # @nne
 ngeu:                                   # @ngeu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.ge_u	$push0=, $0, $1
@@ -126,7 +126,7 @@ ngeu:                                   # @ngeu
 ngtu:                                   # @ngtu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.gt_u	$push0=, $0, $1
@@ -143,7 +143,7 @@ ngtu:                                   # @ngtu
 nleu:                                   # @nleu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.le_u	$push0=, $0, $1
@@ -160,7 +160,7 @@ nleu:                                   # @nleu
 nltu:                                   # @nltu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push1=, 0
 	i32.lt_u	$push0=, $0, $1
@@ -176,128 +176,128 @@ nltu:                                   # @nltu
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push34=, -2147483648
 	i32.const	$push33=, 2147483647
 	i32.call	$push0=, nge@FUNCTION, $pop34, $pop33
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push36=, 2147483647
 	i32.const	$push35=, -2147483648
 	i32.call	$push1=, nge@FUNCTION, $pop36, $pop35
 	i32.const	$push2=, -1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push38=, -2147483648
 	i32.const	$push37=, 2147483647
 	i32.call	$push4=, ngt@FUNCTION, $pop38, $pop37
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	i32.const	$push41=, 2147483647
 	i32.const	$push40=, -2147483648
 	i32.call	$push5=, ngt@FUNCTION, $pop41, $pop40
 	i32.const	$push39=, -1
 	i32.ne  	$push6=, $pop5, $pop39
 	br_if   	0, $pop6        # 0: down to label0
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	i32.const	$push44=, -2147483648
 	i32.const	$push43=, 2147483647
 	i32.call	$push7=, nle@FUNCTION, $pop44, $pop43
 	i32.const	$push42=, -1
 	i32.ne  	$push8=, $pop7, $pop42
 	br_if   	0, $pop8        # 0: down to label0
-# BB#5:                                 # %if.end16
+# %bb.5:                                # %if.end16
 	i32.const	$push46=, 2147483647
 	i32.const	$push45=, -2147483648
 	i32.call	$push9=, nle@FUNCTION, $pop46, $pop45
 	br_if   	0, $pop9        # 0: down to label0
-# BB#6:                                 # %if.end20
+# %bb.6:                                # %if.end20
 	i32.const	$push48=, -2147483648
 	i32.const	$push47=, 2147483647
 	i32.call	$push10=, nlt@FUNCTION, $pop48, $pop47
 	i32.const	$push11=, -1
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#7:                                 # %if.end24
+# %bb.7:                                # %if.end24
 	i32.const	$push50=, 2147483647
 	i32.const	$push49=, -2147483648
 	i32.call	$push13=, nlt@FUNCTION, $pop50, $pop49
 	br_if   	0, $pop13       # 0: down to label0
-# BB#8:                                 # %if.end28
+# %bb.8:                                # %if.end28
 	i32.const	$push52=, -2147483648
 	i32.const	$push51=, 2147483647
 	i32.call	$push14=, neq@FUNCTION, $pop52, $pop51
 	br_if   	0, $pop14       # 0: down to label0
-# BB#9:                                 # %if.end32
+# %bb.9:                                # %if.end32
 	i32.const	$push54=, 2147483647
 	i32.const	$push53=, -2147483648
 	i32.call	$push15=, neq@FUNCTION, $pop54, $pop53
 	br_if   	0, $pop15       # 0: down to label0
-# BB#10:                                # %if.end36
+# %bb.10:                               # %if.end36
 	i32.const	$push57=, -2147483648
 	i32.const	$push56=, 2147483647
 	i32.call	$push16=, nne@FUNCTION, $pop57, $pop56
 	i32.const	$push55=, -1
 	i32.ne  	$push17=, $pop16, $pop55
 	br_if   	0, $pop17       # 0: down to label0
-# BB#11:                                # %if.end40
+# %bb.11:                               # %if.end40
 	i32.const	$push60=, 2147483647
 	i32.const	$push59=, -2147483648
 	i32.call	$push18=, nne@FUNCTION, $pop60, $pop59
 	i32.const	$push58=, -1
 	i32.ne  	$push19=, $pop18, $pop58
 	br_if   	0, $pop19       # 0: down to label0
-# BB#12:                                # %if.end44
+# %bb.12:                               # %if.end44
 	i32.const	$push62=, 0
 	i32.const	$push61=, -1
 	i32.call	$push20=, ngeu@FUNCTION, $pop62, $pop61
 	br_if   	0, $pop20       # 0: down to label0
-# BB#13:                                # %if.end48
+# %bb.13:                               # %if.end48
 	i32.const	$push65=, -1
 	i32.const	$push64=, 0
 	i32.call	$push21=, ngeu@FUNCTION, $pop65, $pop64
 	i32.const	$push63=, -1
 	i32.ne  	$push22=, $pop21, $pop63
 	br_if   	0, $pop22       # 0: down to label0
-# BB#14:                                # %if.end52
+# %bb.14:                               # %if.end52
 	i32.const	$push67=, 0
 	i32.const	$push66=, -1
 	i32.call	$push23=, ngtu@FUNCTION, $pop67, $pop66
 	br_if   	0, $pop23       # 0: down to label0
-# BB#15:                                # %if.end56
+# %bb.15:                               # %if.end56
 	i32.const	$push70=, -1
 	i32.const	$push69=, 0
 	i32.call	$push24=, ngtu@FUNCTION, $pop70, $pop69
 	i32.const	$push68=, -1
 	i32.ne  	$push25=, $pop24, $pop68
 	br_if   	0, $pop25       # 0: down to label0
-# BB#16:                                # %if.end60
+# %bb.16:                               # %if.end60
 	i32.const	$push73=, 0
 	i32.const	$push72=, -1
 	i32.call	$push26=, nleu@FUNCTION, $pop73, $pop72
 	i32.const	$push71=, -1
 	i32.ne  	$push27=, $pop26, $pop71
 	br_if   	0, $pop27       # 0: down to label0
-# BB#17:                                # %if.end64
+# %bb.17:                               # %if.end64
 	i32.const	$push75=, -1
 	i32.const	$push74=, 0
 	i32.call	$push28=, nleu@FUNCTION, $pop75, $pop74
 	br_if   	0, $pop28       # 0: down to label0
-# BB#18:                                # %if.end68
+# %bb.18:                               # %if.end68
 	i32.const	$push78=, 0
 	i32.const	$push77=, -1
 	i32.call	$push29=, nltu@FUNCTION, $pop78, $pop77
 	i32.const	$push76=, -1
 	i32.ne  	$push30=, $pop29, $pop76
 	br_if   	0, $pop30       # 0: down to label0
-# BB#19:                                # %if.end72
+# %bb.19:                               # %if.end72
 	i32.const	$push80=, -1
 	i32.const	$push79=, 0
 	i32.call	$push31=, nltu@FUNCTION, $pop80, $pop79
 	br_if   	0, $pop31       # 0: down to label0
-# BB#20:                                # %if.end76
+# %bb.20:                               # %if.end76
 	i32.const	$push32=, 0
 	call    	exit@FUNCTION, $pop32
 	unreachable
@@ -310,6 +310,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end10-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 934614980..dd66a4547 100644
--- a/test/torture-s/20070724-1.c.s
+++ b/test/torture-s/20070724-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20070824-1.c.s b/test/torture-s/20070824-1.c.s
index 08b62d5b1..89a852263 100644
--- a/test/torture-s/20070824-1.c.s
+++ b/test/torture-s/20070824-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20071011-1.c.s b/test/torture-s/20071011-1.c.s
index b0abe6a1c..9b7242899 100644
--- a/test/torture-s/20071011-1.c.s
+++ b/test/torture-s/20071011-1.c.s
@@ -7,14 +7,14 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$1=, 0($0)
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
 	block   	
 	i32.eqz 	$push1=, $1
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	return
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
@@ -30,7 +30,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %foo.exit
+# %bb.0:                                # %foo.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -38,5 +38,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071018-1.c.s b/test/torture-s/20071018-1.c.s
index 87c7160ef..d71f38314 100644
--- a/test/torture-s/20071018-1.c.s
+++ b/test/torture-s/20071018-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.call	$push1=, __builtin_malloc@FUNCTION, $pop0
 	i32.store	0($0), $pop1
@@ -22,17 +22,16 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 16
 	i32.call	$push3=, __builtin_malloc@FUNCTION, $pop2
 	i32.const	$push0=, 5
 	i32.shl 	$push1=, $0, $pop0
 	i32.add 	$push4=, $pop3, $pop1
 	i32.const	$push5=, -20
-	i32.add 	$push9=, $pop4, $pop5
-	tee_local	$push8=, $0=, $pop9
+	i32.add 	$0=, $pop4, $pop5
 	i32.const	$push6=, 0
-	i32.store	0($pop8), $pop6
+	i32.store	0($0), $pop6
 	call    	bar@FUNCTION, $0
 	i32.load	$push7=, 0($0)
                                         # fallthrough-return: $pop7
@@ -46,13 +45,13 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	i32.eqz 	$push3=, $pop1
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB2_2:                                # %if.then
@@ -64,6 +63,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9c2f1d5b6..fe6e6f038 100644
--- a/test/torture-s/20071029-1.c.s
+++ b/test/torture-s/20071029-1.c.s
@@ -7,55 +7,53 @@
 test:                                   # @test
 	.param  	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.load	$3=, 0($0)
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push20=, 0
-	i32.load	$push19=, test.i($pop20)
-	tee_local	$push18=, $2=, $pop19
+	i32.load	$2=, test.i($pop0)
 	i32.const	$push1=, 1
-	i32.add 	$push17=, $pop18, $pop1
-	tee_local	$push16=, $1=, $pop17
-	i32.store	test.i($pop0), $pop16
+	i32.add 	$1=, $2, $pop1
+	i32.load	$3=, 0($0)
+	i32.const	$push16=, 0
+	i32.store	test.i($pop16), $1
 	block   	
 	block   	
 	i32.ne  	$push2=, $3, $2
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load	$push3=, 4($0)
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.load	$push4=, 8($0)
 	br_if   	0, $pop4        # 0: down to label1
-# BB#3:                                 # %lor.lhs.false6
+# %bb.3:                                # %lor.lhs.false6
 	i32.load	$push5=, 12($0)
 	br_if   	0, $pop5        # 0: down to label1
-# BB#4:                                 # %lor.lhs.false10
+# %bb.4:                                # %lor.lhs.false10
 	i32.load	$push6=, 16($0)
 	br_if   	0, $pop6        # 0: down to label1
-# BB#5:                                 # %lor.lhs.false13
+# %bb.5:                                # %lor.lhs.false13
 	i32.load	$push7=, 20($0)
 	br_if   	0, $pop7        # 0: down to label1
-# BB#6:                                 # %lor.lhs.false16
+# %bb.6:                                # %lor.lhs.false16
 	i32.load	$push8=, 24($0)
 	br_if   	0, $pop8        # 0: down to label1
-# BB#7:                                 # %lor.lhs.false20
+# %bb.7:                                # %lor.lhs.false20
 	i32.load	$push9=, 28($0)
 	br_if   	0, $pop9        # 0: down to label1
-# BB#8:                                 # %lor.lhs.false23
+# %bb.8:                                # %lor.lhs.false23
 	i32.load	$push10=, 32($0)
 	br_if   	0, $pop10       # 0: down to label1
-# BB#9:                                 # %lor.lhs.false26
+# %bb.9:                                # %lor.lhs.false26
 	i32.load	$push11=, 36($0)
 	br_if   	0, $pop11       # 0: down to label1
-# BB#10:                                # %lor.lhs.false29
+# %bb.10:                               # %lor.lhs.false29
 	i32.load	$push12=, 40($0)
 	br_if   	0, $pop12       # 0: down to label1
-# BB#11:                                # %if.end34
+# %bb.11:                               # %if.end34
 	i32.const	$push13=, 20
 	i32.eq  	$push14=, $1, $pop13
 	br_if   	1, $pop14       # 1: down to label0
-# BB#12:                                # %if.end37
+# %bb.12:                               # %if.end37
 	return
 .LBB0_13:                               # %if.then
 	end_block                       # label1:
@@ -77,23 +75,21 @@ test:                                   # @test
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	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.sub 	$8=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $8
+	i32.const	$push15=, 1
+	i32.add 	$0=, $0, $pop15
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $8, $pop11
 	i32.const	$push0=, 4
-	i32.or  	$push16=, $pop12, $pop0
-	tee_local	$push15=, $1=, $pop16
+	i32.or  	$1=, $pop12, $pop0
 	i32.const	$push1=, 48
-	i32.add 	$2=, $pop15, $pop1
+	i32.add 	$2=, $1, $pop1
 	i32.const	$push2=, 40
 	i32.add 	$3=, $1, $pop2
 	i32.const	$push3=, 32
@@ -107,23 +103,23 @@ foo:                                    # @foo
 .LBB1_1:                                # %again
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	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.store	0($1):p2align=2, $pop23
+	i32.const	$push22=, 0
+	i32.store	0($2), $pop22
 	i64.const	$push21=, 0
-	i64.store	0($7):p2align=2, $pop21
+	i64.store	0($3):p2align=2, $pop21
+	i64.const	$push20=, 0
+	i64.store	0($4):p2align=2, $pop20
+	i64.const	$push19=, 0
+	i64.store	0($5):p2align=2, $pop19
+	i64.const	$push18=, 0
+	i64.store	0($6):p2align=2, $pop18
+	i64.const	$push17=, 0
+	i64.store	0($7):p2align=2, $pop17
 	i32.store	8($8), $0
-	i32.const	$push20=, 1
-	i32.add 	$0=, $0, $pop20
+	i32.const	$push16=, 1
+	i32.add 	$0=, $0, $pop16
 	i32.const	$push13=, 8
 	i32.add 	$push14=, $8, $pop13
 	call    	test@FUNCTION, $pop14
@@ -140,7 +136,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# %bb.0:                                # %if.end6
 	i32.const	$push0=, 10
 	call    	foo@FUNCTION, $pop0
 	unreachable
@@ -156,6 +152,6 @@ test.i:
 	.size	test.i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ed02d31f3..4861e8d35 100644
--- a/test/torture-s/20071030-1.c.s
+++ b/test/torture-s/20071030-1.c.s
@@ -8,15 +8,15 @@ CalcPing:                               # @CalcPing
 	.param  	i32
 	.result 	i32
 	.local  	f32, i32, i32, i32, f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.load	$push12=, 4($0)
-	return  	$pop12
+# %bb.1:                                # %if.then
+	i32.load	$push15=, 4($0)
+	return  	$pop15
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	i32.const	$4=, 0
@@ -26,36 +26,43 @@ CalcPing:                               # @CalcPing
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.add 	$push3=, $0, $3
-	f32.load	$push21=, 0($pop3)
-	tee_local	$push20=, $1=, $pop21
-	f32.add 	$push4=, $5, $pop20
-	f32.const	$push19=, 0x0p0
-	f32.gt  	$push18=, $1, $pop19
-	tee_local	$push17=, $2=, $pop18
-	f32.select	$5=, $pop4, $5, $pop17
+	f32.load	$1=, 0($pop3)
+	f32.const	$push18=, 0x0p0
+	f32.gt  	$2=, $1, $pop18
+	f32.add 	$push4=, $5, $1
+	f32.select	$5=, $pop4, $5, $2
 	i32.add 	$4=, $4, $2
-	i32.const	$push16=, 24
-	i32.add 	$push15=, $3, $pop16
-	tee_local	$push14=, $3=, $pop15
-	i32.const	$push13=, 1552
-	i32.ne  	$push5=, $pop14, $pop13
+	i32.const	$push17=, 24
+	i32.add 	$3=, $3, $pop17
+	i32.const	$push16=, 1552
+	i32.ne  	$push5=, $3, $pop16
 	br_if   	0, $pop5        # 0: up to label1
-# BB#4:                                 # %for.end
+# %bb.4:                                # %for.end
 	end_loop
 	block   	
-	i32.eqz 	$push22=, $4
-	br_if   	0, $pop22       # 0: down to label2
-# BB#5:                                 # %if.end9
+	block   	
+	i32.eqz 	$push19=, $4
+	br_if   	0, $pop19       # 0: down to label3
+# %bb.5:                                # %if.end9
 	f32.convert_s/i32	$push6=, $4
 	f32.div 	$push7=, $5, $pop6
 	f32.const	$push8=, 0x1.f4p9
-	f32.mul 	$push9=, $pop7, $pop8
-	i32.trunc_s/f32	$push10=, $pop9
-	return  	$pop10
-.LBB0_6:
+	f32.mul 	$5=, $pop7, $pop8
+	f32.abs 	$push9=, $5
+	f32.const	$push10=, 0x1p31
+	f32.lt  	$push11=, $pop9, $pop10
+	br_if   	1, $pop11       # 1: down to label2
+# %bb.6:                                # %if.end9
+	i32.const	$push12=, -2147483648
+	return  	$pop12
+.LBB0_7:
+	end_block                       # label3:
+	i32.const	$push14=, 9999
+	return  	$pop14
+.LBB0_8:                                # %if.end9
 	end_block                       # label2:
-	i32.const	$push11=, 9999
-                                        # fallthrough-return: $pop11
+	i32.trunc_s/f32	$push13=, $5
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end0:
 	.size	CalcPing, .Lfunc_end0-CalcPing
@@ -67,71 +74,80 @@ CalcPing:                               # @CalcPing
 main:                                   # @main
 	.result 	i32
 	.local  	f32, i32, i32, i32, f32, i32
-# BB#0:                                 # %if.end.i
-	i32.const	$push17=, 0
-	i32.const	$push15=, 0
-	i32.load	$push14=, __stack_pointer($pop15)
-	i32.const	$push16=, 1552
-	i32.sub 	$push30=, $pop14, $pop16
-	tee_local	$push29=, $5=, $pop30
-	i32.store	__stack_pointer($pop17), $pop29
+# %bb.0:                                # %if.end.i
+	i32.const	$push16=, 0
+	i32.load	$push15=, __stack_pointer($pop16)
+	i32.const	$push17=, 1552
+	i32.sub 	$5=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $5
 	i32.const	$3=, 0
-	i32.const	$push21=, 8
-	i32.add 	$push22=, $5, $pop21
-	i32.const	$push28=, 0
+	i32.const	$push22=, 8
+	i32.add 	$push23=, $5, $pop22
+	i32.const	$push29=, 0
 	i32.const	$push0=, 1544
-	i32.call	$drop=, memset@FUNCTION, $pop22, $pop28, $pop0
+	i32.call	$drop=, memset@FUNCTION, $pop23, $pop29, $pop0
 	i32.const	$2=, 16
-	i32.const	$push23=, 8
-	i32.add 	$push24=, $5, $pop23
-	i32.const	$push27=, 16
-	i32.add 	$push1=, $pop24, $pop27
+	i32.const	$push24=, 8
+	i32.add 	$push25=, $5, $pop24
+	i32.const	$push28=, 16
+	i32.add 	$push1=, $pop25, $pop28
 	i32.const	$push2=, 1065353216
 	i32.store	0($pop1), $pop2
 	f32.const	$4=, 0x0p0
 .LBB1_1:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label3:
-	i32.const	$push25=, 8
-	i32.add 	$push26=, $5, $pop25
-	i32.add 	$push3=, $pop26, $2
-	f32.load	$push39=, 0($pop3)
-	tee_local	$push38=, $0=, $pop39
-	f32.add 	$push4=, $4, $pop38
-	f32.const	$push37=, 0x0p0
-	f32.gt  	$push36=, $0, $pop37
-	tee_local	$push35=, $1=, $pop36
-	f32.select	$4=, $pop4, $4, $pop35
+	loop    	                # label4:
+	i32.const	$push26=, 8
+	i32.add 	$push27=, $5, $pop26
+	i32.add 	$push3=, $pop27, $2
+	f32.load	$0=, 0($pop3)
+	f32.const	$push32=, 0x0p0
+	f32.gt  	$1=, $0, $pop32
+	f32.add 	$push4=, $4, $0
+	f32.select	$4=, $pop4, $4, $1
 	i32.add 	$3=, $3, $1
-	i32.const	$push34=, 24
-	i32.add 	$push33=, $2, $pop34
-	tee_local	$push32=, $2=, $pop33
-	i32.const	$push31=, 1552
-	i32.ne  	$push5=, $pop32, $pop31
-	br_if   	0, $pop5        # 0: up to label3
-# BB#2:                                 # %for.end.i
+	i32.const	$push31=, 24
+	i32.add 	$2=, $2, $pop31
+	i32.const	$push30=, 1552
+	i32.ne  	$push5=, $2, $pop30
+	br_if   	0, $pop5        # 0: up to label4
+# %bb.2:                                # %for.end.i
 	end_loop
 	block   	
-	i32.eqz 	$push40=, $3
-	br_if   	0, $pop40       # 0: down to label4
-# BB#3:                                 # %CalcPing.exit
+	i32.eqz 	$push33=, $3
+	br_if   	0, $pop33       # 0: down to label5
+# %bb.3:                                # %CalcPing.exit
 	f32.convert_s/i32	$push6=, $3
 	f32.div 	$push7=, $4, $pop6
 	f32.const	$push8=, 0x1.f4p9
-	f32.mul 	$push9=, $pop7, $pop8
-	i32.trunc_s/f32	$push10=, $pop9
-	i32.const	$push11=, 1000
-	i32.ne  	$push12=, $pop10, $pop11
-	br_if   	0, $pop12       # 0: down to label4
-# BB#4:                                 # %if.end
-	i32.const	$push20=, 0
-	i32.const	$push18=, 1552
-	i32.add 	$push19=, $5, $pop18
-	i32.store	__stack_pointer($pop20), $pop19
-	i32.const	$push13=, 0
-	return  	$pop13
-.LBB1_5:                                # %if.then
-	end_block                       # label4:
+	f32.mul 	$4=, $pop7, $pop8
+	block   	
+	block   	
+	f32.abs 	$push12=, $4
+	f32.const	$push13=, 0x1p31
+	f32.lt  	$push14=, $pop12, $pop13
+	br_if   	0, $pop14       # 0: down to label7
+# %bb.4:                                # %CalcPing.exit
+	i32.const	$2=, -2147483648
+	br      	1               # 1: down to label6
+.LBB1_5:                                # %CalcPing.exit
+	end_block                       # label7:
+	i32.trunc_s/f32	$2=, $4
+.LBB1_6:                                # %CalcPing.exit
+	end_block                       # label6:
+	i32.const	$push9=, 1000
+	i32.ne  	$push10=, $2, $pop9
+	br_if   	0, $pop10       # 0: down to label5
+# %bb.7:                                # %if.end
+	i32.const	$push21=, 0
+	i32.const	$push19=, 1552
+	i32.add 	$push20=, $5, $pop19
+	i32.store	__stack_pointer($pop21), $pop20
+	i32.const	$push11=, 0
+	return  	$pop11
+.LBB1_8:                                # %if.then
+	end_block                       # label5:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -139,5 +155,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071108-1.c.s b/test/torture-s/20071108-1.c.s
index ae9ef8d8c..cc288ee70 100644
--- a/test/torture-s/20071108-1.c.s
+++ b/test/torture-s/20071108-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, foo.s
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,7 +33,7 @@ bar:                                    # @bar
 test:                                   # @test
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	foo.s+4($pop0), $1
 	i32.const	$push2=, 0
@@ -51,39 +51,37 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %lor.lhs.false
-	i32.const	$push10=, 0
+# %bb.0:                                # %lor.lhs.false
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push25=, $pop7, $pop9
-	tee_local	$push24=, $1=, $pop25
-	i32.store	__stack_pointer($pop10), $pop24
-	block   	
+	i32.sub 	$1=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $1
 	i32.const	$push14=, 12
 	i32.add 	$push15=, $1, $pop14
 	i32.const	$push16=, 8
 	i32.add 	$push17=, $1, $pop16
-	i32.call	$push23=, test@FUNCTION, $pop15, $pop17
-	tee_local	$push22=, $0=, $pop23
-	i32.load	$push0=, 0($pop22)
+	i32.call	$0=, test@FUNCTION, $pop15, $pop17
+	block   	
+	i32.load	$push0=, 0($0)
 	i32.const	$push18=, 12
 	i32.add 	$push19=, $1, $pop18
 	i32.ne  	$push1=, $pop0, $pop19
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false2
+# %bb.1:                                # %lor.lhs.false2
 	i32.load	$push2=, 4($0)
 	i32.const	$push20=, 8
 	i32.add 	$push21=, $1, $pop20
 	i32.ne  	$push3=, $pop2, $pop21
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false4
+# %bb.2:                                # %lor.lhs.false4
 	i32.load8_u	$push4=, 8($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false5
+# %bb.3:                                # %lor.lhs.false5
 	i32.load8_u	$push5=, 9($0)
 	br_if   	0, $pop5        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push13=, 0
 	i32.const	$push11=, 16
 	i32.add 	$push12=, $1, $pop11
@@ -106,5 +104,5 @@ foo.s:
 	.size	foo.s, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071120-1.c.s b/test/torture-s/20071120-1.c.s
index 4dd571df7..c29acdeab 100644
--- a/test/torture-s/20071120-1.c.s
+++ b/test/torture-s/20071120-1.c.s
@@ -5,7 +5,7 @@
 	.globl	vec_assert_fail
 	.type	vec_assert_fail,@function
 vec_assert_fail:                        # @vec_assert_fail
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -18,7 +18,7 @@ vec_assert_fail:                        # @vec_assert_fail
 	.type	perform_access_checks,@function
 perform_access_checks:                  # @perform_access_checks
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -31,50 +31,46 @@ perform_access_checks:                  # @perform_access_checks
 	.type	pop_to_parent_deferring_access_checks,@function
 pop_to_parent_deferring_access_checks:  # @pop_to_parent_deferring_access_checks
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push9=, 0
+	i32.load	$0=, deferred_access_no_check($pop9)
 	block   	
-	i32.const	$push11=, 0
-	i32.load	$push10=, deferred_access_no_check($pop11)
-	tee_local	$push9=, $0=, $pop10
-	i32.eqz 	$push20=, $pop9
-	br_if   	0, $pop20       # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push12=, 0
+	i32.eqz 	$push12=, $0
+	br_if   	0, $pop12       # 0: down to label0
+# %bb.1:                                # %if.then
+	i32.const	$push10=, 0
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $0, $pop0
-	i32.store	deferred_access_no_check($pop12), $pop1
+	i32.store	deferred_access_no_check($pop10), $pop1
 	return
 .LBB2_2:                                # %if.else
 	end_block                       # label0:
+	i32.const	$push11=, 0
+	i32.load	$0=, deferred_access_stack($pop11)
 	block   	
 	block   	
-	i32.const	$push15=, 0
-	i32.load	$push14=, deferred_access_stack($pop15)
-	tee_local	$push13=, $0=, $pop14
-	i32.eqz 	$push21=, $pop13
-	br_if   	0, $pop21       # 0: down to label2
-# BB#3:                                 # %land.lhs.true.i
-	i32.load	$push17=, 0($0)
-	tee_local	$push16=, $1=, $pop17
-	i32.eqz 	$push22=, $pop16
-	br_if   	0, $pop22       # 0: down to label2
-# BB#4:                                 # %land.lhs.true.i25
+	i32.eqz 	$push13=, $0
+	br_if   	0, $pop13       # 0: down to label2
+# %bb.3:                                # %land.lhs.true.i
+	i32.load	$1=, 0($0)
+	i32.eqz 	$push14=, $1
+	br_if   	0, $pop14       # 0: down to label2
+# %bb.4:                                # %land.lhs.true.i25
 	i32.const	$push2=, -1
-	i32.add 	$push19=, $1, $pop2
-	tee_local	$push18=, $2=, $pop19
-	i32.store	0($0), $pop18
-	i32.eqz 	$push23=, $2
-	br_if   	0, $pop23       # 0: down to label2
-# BB#5:                                 # %VEC_deferred_access_base_last.exit29
+	i32.add 	$2=, $1, $pop2
+	i32.store	0($0), $2
+	i32.eqz 	$push15=, $2
+	br_if   	0, $pop15       # 0: down to label2
+# %bb.5:                                # %VEC_deferred_access_base_last.exit29
 	i32.const	$push3=, 3
 	i32.shl 	$push4=, $1, $pop3
 	i32.add 	$push5=, $0, $pop4
 	i32.const	$push6=, -8
 	i32.add 	$push7=, $pop5, $pop6
 	i32.load	$push8=, 0($pop7)
-	i32.eqz 	$push24=, $pop8
-	br_if   	1, $pop24       # 1: down to label1
-# BB#6:                                 # %if.end16
+	i32.eqz 	$push16=, $pop8
+	br_if   	1, $pop16       # 1: down to label1
+# %bb.6:                                # %if.end16
 	return
 .LBB2_7:                                # %cond.false.i
 	end_block                       # label2:
@@ -95,12 +91,11 @@ pop_to_parent_deferring_access_checks:  # @pop_to_parent_deferring_access_checks
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 76
-	i32.call	$push8=, __builtin_malloc@FUNCTION, $pop0
-	tee_local	$push7=, $0=, $pop8
+	i32.call	$0=, __builtin_malloc@FUNCTION, $pop0
 	i32.const	$push1=, 2
-	i32.store	0($pop7), $pop1
+	i32.store	0($0), $pop1
 	i32.const	$push2=, 0
 	i32.store	deferred_access_stack($pop2), $0
 	i32.const	$push3=, 8
@@ -138,6 +133,6 @@ deferred_access_stack:
 	.size	deferred_access_stack, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 cddc43977..b5d1bffa0 100644
--- a/test/torture-s/20071202-1.c.s
+++ b/test/torture-s/20071202-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	8($0):p2align=2, $pop0
 	i32.load	$1=, 0($0)
@@ -34,14 +34,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push71=, 0
+# %bb.0:                                # %entry
 	i32.const	$push69=, 0
 	i32.load	$push68=, __stack_pointer($pop69)
 	i32.const	$push70=, 80
-	i32.sub 	$push80=, $pop68, $pop70
-	tee_local	$push79=, $0=, $pop80
-	i32.store	__stack_pointer($pop71), $pop79
+	i32.sub 	$0=, $pop68, $pop70
+	i32.const	$push71=, 0
+	i32.store	__stack_pointer($pop71), $0
 	i32.const	$push75=, 8
 	i32.add 	$push76=, $0, $pop75
 	i32.const	$push1=, .Lmain.s
@@ -55,101 +54,101 @@ main:                                   # @main
 	i32.const	$push2=, 12
 	i32.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push6=, 12($0)
 	i32.const	$push5=, 6
 	i32.ne  	$push7=, $pop6, $pop5
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.load	$push8=, 16($0)
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false3
+# %bb.3:                                # %lor.lhs.false3
 	i32.const	$push9=, 20
 	i32.add 	$push10=, $0, $pop9
 	i32.load	$push11=, 0($pop10)
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false7
+# %bb.4:                                # %lor.lhs.false7
 	i32.const	$push12=, 24
 	i32.add 	$push13=, $0, $pop12
 	i32.load	$push14=, 0($pop13)
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false11
+# %bb.5:                                # %lor.lhs.false11
 	i32.const	$push15=, 28
 	i32.add 	$push16=, $0, $pop15
 	i32.load	$push17=, 0($pop16)
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %lor.lhs.false15
+# %bb.6:                                # %lor.lhs.false15
 	i32.const	$push18=, 32
 	i32.add 	$push19=, $0, $pop18
 	i32.load	$push20=, 0($pop19)
 	br_if   	0, $pop20       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false19
+# %bb.7:                                # %lor.lhs.false19
 	i32.const	$push21=, 36
 	i32.add 	$push22=, $0, $pop21
 	i32.load	$push23=, 0($pop22)
 	br_if   	0, $pop23       # 0: down to label0
-# BB#8:                                 # %if.end
+# %bb.8:                                # %if.end
 	i32.load	$push25=, 40($0)
 	i32.const	$push24=, 7
 	i32.ne  	$push26=, $pop25, $pop24
 	br_if   	0, $pop26       # 0: down to label0
-# BB#9:                                 # %lor.lhs.false24
+# %bb.9:                                # %lor.lhs.false24
 	i32.const	$push27=, 44
 	i32.add 	$push28=, $0, $pop27
 	i32.load	$push29=, 0($pop28)
 	i32.const	$push30=, 8
 	i32.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#10:                                # %lor.lhs.false28
+# %bb.10:                               # %lor.lhs.false28
 	i32.const	$push32=, 48
 	i32.add 	$push33=, $0, $pop32
 	i32.load	$push34=, 0($pop33)
 	i32.const	$push35=, 9
 	i32.ne  	$push36=, $pop34, $pop35
 	br_if   	0, $pop36       # 0: down to label0
-# BB#11:                                # %lor.lhs.false33
+# %bb.11:                               # %lor.lhs.false33
 	i32.const	$push37=, 52
 	i32.add 	$push38=, $0, $pop37
 	i32.load	$push39=, 0($pop38)
 	i32.const	$push40=, 10
 	i32.ne  	$push41=, $pop39, $pop40
 	br_if   	0, $pop41       # 0: down to label0
-# BB#12:                                # %lor.lhs.false38
+# %bb.12:                               # %lor.lhs.false38
 	i32.const	$push42=, 56
 	i32.add 	$push43=, $0, $pop42
 	i32.load	$push44=, 0($pop43)
 	i32.const	$push45=, 11
 	i32.ne  	$push46=, $pop44, $pop45
 	br_if   	0, $pop46       # 0: down to label0
-# BB#13:                                # %lor.lhs.false43
+# %bb.13:                               # %lor.lhs.false43
 	i32.const	$push47=, 60
 	i32.add 	$push48=, $0, $pop47
 	i32.load	$push49=, 0($pop48)
 	i32.const	$push50=, 12
 	i32.ne  	$push51=, $pop49, $pop50
 	br_if   	0, $pop51       # 0: down to label0
-# BB#14:                                # %lor.lhs.false48
+# %bb.14:                               # %lor.lhs.false48
 	i32.const	$push52=, 64
 	i32.add 	$push53=, $0, $pop52
 	i32.load	$push54=, 0($pop53)
 	i32.const	$push55=, 13
 	i32.ne  	$push56=, $pop54, $pop55
 	br_if   	0, $pop56       # 0: down to label0
-# BB#15:                                # %lor.lhs.false53
+# %bb.15:                               # %lor.lhs.false53
 	i32.const	$push57=, 68
 	i32.add 	$push58=, $0, $pop57
 	i32.load	$push59=, 0($pop58)
 	i32.const	$push60=, 14
 	i32.ne  	$push61=, $pop59, $pop60
 	br_if   	0, $pop61       # 0: down to label0
-# BB#16:                                # %lor.lhs.false58
+# %bb.16:                               # %lor.lhs.false58
 	i32.const	$push62=, 72
 	i32.add 	$push63=, $0, $pop62
 	i32.load	$push64=, 0($pop63)
 	i32.const	$push65=, 15
 	i32.ne  	$push66=, $pop64, $pop65
 	br_if   	0, $pop66       # 0: down to label0
-# BB#17:                                # %if.end64
+# %bb.17:                               # %if.end64
 	i32.const	$push74=, 0
 	i32.const	$push72=, 80
 	i32.add 	$push73=, $0, $pop72
@@ -188,5 +187,5 @@ main:                                   # @main
 	.size	.Lmain.s, 68
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071205-1.c.s b/test/torture-s/20071205-1.c.s
index 44e9fa534..e35787958 100644
--- a/test/torture-s/20071205-1.c.s
+++ b/test/torture-s/20071205-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 65280
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,4 +33,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20071211-1.c.s b/test/torture-s/20071211-1.c.s
index 0d18f2bea..bbb28eed0 100644
--- a/test/torture-s/20071211-1.c.s
+++ b/test/torture-s/20071211-1.c.s
@@ -7,39 +7,37 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i64.load	$push0=, sv($pop20)
+# %bb.0:                                # %entry
+	i32.const	$push17=, 0
+	i32.const	$push16=, 0
+	i64.load	$push0=, sv($pop16)
 	i64.const	$push1=, -1099511627776
 	i64.or  	$push2=, $pop0, $pop1
-	i64.store	sv($pop21), $pop2
+	i64.store	sv($pop17), $pop2
 	#APP
 	#NO_APP
-	i32.const	$push19=, 0
-	i32.const	$push18=, 0
-	i64.load	$push17=, sv($pop18)
-	tee_local	$push16=, $0=, $pop17
+	i32.const	$push15=, 0
+	i64.load	$0=, sv($pop15)
 	i64.const	$push5=, 40
-	i64.shr_u	$push6=, $pop16, $pop5
+	i64.shr_u	$push6=, $0, $pop5
 	i64.const	$push7=, 1
-	i64.add 	$push15=, $pop6, $pop7
-	tee_local	$push14=, $1=, $pop15
+	i64.add 	$1=, $pop6, $pop7
+	i32.const	$push14=, 0
 	i64.const	$push13=, 40
-	i64.shl 	$push8=, $pop14, $pop13
+	i64.shl 	$push8=, $1, $pop13
 	i64.const	$push3=, 1099511627775
 	i64.and 	$push4=, $0, $pop3
 	i64.or  	$push9=, $pop8, $pop4
-	i64.store	sv($pop19), $pop9
+	i64.store	sv($pop14), $pop9
 	block   	
 	i64.const	$push10=, 16777215
 	i64.and 	$push11=, $1, $pop10
 	i64.eqz 	$push12=, $pop11
-	i32.eqz 	$push23=, $pop12
-	br_if   	0, $pop23       # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push22=, 0
-	return  	$pop22
+	i32.eqz 	$push19=, $pop12
+	br_if   	0, $pop19       # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push18=, 0
+	return  	$pop18
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -58,5 +56,5 @@ sv:
 	.size	sv, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071213-1.c.s b/test/torture-s/20071213-1.c.s
index 117a6c658..824ff57df 100644
--- a/test/torture-s/20071213-1.c.s
+++ b/test/torture-s/20071213-1.c.s
@@ -6,23 +6,23 @@
 	.type	h,@function
 h:                                      # @h
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 5
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $0, $pop2
 	br_if   	1, $pop3        # 1: down to label1
-# BB#2:                                 # %sw.bb
+# %bb.2:                                # %sw.bb
 	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
+# %bb.3:                                # %lor.lhs.false
 	i32.load	$push13=, 4($1)
 	i32.const	$push14=, 4
 	i32.ne  	$push15=, $pop13, $pop14
@@ -34,7 +34,7 @@ h:                                      # @h
 	i32.const	$push5=, 9
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#5:                                 # %lor.lhs.false8
+# %bb.5:                                # %lor.lhs.false8
 	i32.load	$push7=, 4($1)
 	i32.const	$push8=, 10
 	i32.eq  	$push9=, $pop7, $pop8
@@ -57,35 +57,34 @@ h:                                      # @h
 f1:                                     # @f1
 	.param  	i32, i64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $3
 	i32.store	12($3), $2
 	block   	
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label4
-# BB#1:                                 # %sw.bb.i
+# %bb.1:                                # %sw.bb.i
 	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
+# %bb.2:                                # %lor.lhs.false.i
 	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
+# %bb.3:                                # %h.exit
 	i64.const	$push15=, 2
 	i64.ne  	$push16=, $1, $pop15
 	br_if   	1, $pop16       # 1: down to label3
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push23=, 0
 	i32.const	$push21=, 16
 	i32.add 	$push22=, $3, $pop21
@@ -96,12 +95,12 @@ f1:                                     # @f1
 	i32.const	$push2=, 5
 	i32.ne  	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#6:                                 # %sw.bb4.i
+# %bb.6:                                # %sw.bb4.i
 	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
+# %bb.7:                                # %lor.lhs.false8.i
 	i32.load	$push7=, 4($2)
 	i32.const	$push8=, 10
 	i32.eq  	$drop=, $pop7, $pop8
@@ -120,14 +119,13 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32, i32, i64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
+# %bb.0:                                # %entry
 	i32.const	$push25=, 0
 	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.sub 	$5=, $pop24, $pop26
+	i32.const	$push27=, 0
+	i32.store	__stack_pointer($pop27), $5
 	i32.store	12($5), $4
 	block   	
 	block   	
@@ -135,16 +133,16 @@ f2:                                     # @f2
 	i32.const	$push0=, 5
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label7
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $0, $pop2
 	br_if   	2, $pop3        # 2: down to label5
-# BB#2:                                 # %sw.bb.i
+# %bb.2:                                # %sw.bb.i
 	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
+# %bb.3:                                # %lor.lhs.false.i
 	i32.load	$push13=, 4($4)
 	i32.const	$push14=, 4
 	i32.eq  	$push15=, $pop13, $pop14
@@ -156,7 +154,7 @@ f2:                                     # @f2
 	i32.const	$push5=, 9
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	1, $pop6        # 1: down to label5
-# BB#5:                                 # %lor.lhs.false8.i
+# %bb.5:                                # %lor.lhs.false8.i
 	i32.load	$push7=, 4($4)
 	i32.const	$push8=, 10
 	i32.ne  	$push9=, $pop7, $pop8
@@ -166,19 +164,19 @@ f2:                                     # @f2
 	i32.const	$push16=, 5
 	i32.ne  	$push17=, $0, $pop16
 	br_if   	0, $pop17       # 0: down to label5
-# BB#7:                                 # %h.exit
+# %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
+# %bb.8:                                # %h.exit
 	i32.const	$push20=, 7
 	i32.ne  	$push21=, $2, $pop20
 	br_if   	0, $pop21       # 0: down to label5
-# BB#9:                                 # %h.exit
+# %bb.9:                                # %h.exit
 	i64.const	$push22=, 8
 	i64.ne  	$push23=, $3, $pop22
 	br_if   	0, $pop23       # 0: down to label5
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	i32.const	$push30=, 0
 	i32.const	$push28=, 16
 	i32.add 	$push29=, $5, $pop28
@@ -199,14 +197,13 @@ f2:                                     # @f2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 32
-	i32.sub 	$push19=, $pop9, $pop11
-	tee_local	$push18=, $0=, $pop19
-	i32.store	__stack_pointer($pop12), $pop18
+	i32.sub 	$0=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $0
 	i64.const	$push0=, 17179869187
 	i64.store	16($0), $pop0
 	i32.const	$push2=, 1
@@ -232,5 +229,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071216-1.c.s b/test/torture-s/20071216-1.c.s
index 269d178de..03a2357f0 100644
--- a/test/torture-s/20071216-1.c.s
+++ b/test/torture-s/20071216-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, x($pop0)
                                         # fallthrough-return: $pop1
@@ -21,9 +21,8 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.call	$push9=, bar@FUNCTION
-	tee_local	$push8=, $0=, $pop9
+# %bb.0:                                # %entry
+	i32.call	$0=, bar@FUNCTION
 	i32.const	$push3=, -37
 	i32.const	$push2=, -1
 	i32.const	$push0=, -38
@@ -31,7 +30,7 @@ foo:                                    # @foo
 	i32.select	$push4=, $pop3, $pop2, $pop1
 	i32.const	$push5=, -4095
 	i32.lt_u	$push6=, $0, $pop5
-	i32.select	$push7=, $pop8, $pop4, $pop6
+	i32.select	$push7=, $0, $pop4, $pop6
                                         # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end1:
@@ -44,13 +43,12 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push28=, 0
+# %bb.0:                                # %entry
+	i32.const	$push26=, 0
 	i32.const	$push0=, 26
-	i32.store	x($pop28), $pop0
+	i32.store	x($pop26), $pop0
+	i32.call	$0=, bar@FUNCTION
 	block   	
-	i32.call	$push27=, bar@FUNCTION
-	tee_local	$push26=, $0=, $pop27
 	i32.const	$push25=, -37
 	i32.const	$push24=, -1
 	i32.const	$push23=, -38
@@ -58,47 +56,45 @@ main:                                   # @main
 	i32.select	$push2=, $pop25, $pop24, $pop1
 	i32.const	$push22=, -4095
 	i32.lt_u	$push3=, $0, $pop22
-	i32.select	$push4=, $pop26, $pop2, $pop3
+	i32.select	$push4=, $0, $pop2, $pop3
 	i32.const	$push21=, 26
 	i32.ne  	$push5=, $pop4, $pop21
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push36=, 0
+# %bb.1:                                # %if.end
+	i32.const	$push32=, 0
 	i32.const	$push6=, -39
-	i32.store	x($pop36), $pop6
-	i32.call	$push35=, bar@FUNCTION
-	tee_local	$push34=, $0=, $pop35
-	i32.const	$push33=, -37
-	i32.const	$push32=, -1
-	i32.const	$push31=, -38
-	i32.eq  	$push7=, $0, $pop31
-	i32.select	$push8=, $pop33, $pop32, $pop7
-	i32.const	$push30=, -4095
-	i32.lt_u	$push9=, $0, $pop30
-	i32.select	$push10=, $pop34, $pop8, $pop9
-	i32.const	$push29=, -1
-	i32.ne  	$push11=, $pop10, $pop29
+	i32.store	x($pop32), $pop6
+	i32.call	$0=, bar@FUNCTION
+	i32.const	$push31=, -37
+	i32.const	$push30=, -1
+	i32.const	$push29=, -38
+	i32.eq  	$push7=, $0, $pop29
+	i32.select	$push8=, $pop31, $pop30, $pop7
+	i32.const	$push28=, -4095
+	i32.lt_u	$push9=, $0, $pop28
+	i32.select	$push10=, $0, $pop8, $pop9
+	i32.const	$push27=, -1
+	i32.ne  	$push11=, $pop10, $pop27
 	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %if.end4
-	i32.const	$push41=, 0
+# %bb.2:                                # %if.end4
+	i32.const	$push35=, 0
 	i32.const	$push12=, -38
-	i32.store	x($pop41), $pop12
-	i32.call	$push40=, bar@FUNCTION
-	tee_local	$push39=, $0=, $pop40
+	i32.store	x($pop35), $pop12
+	i32.call	$0=, bar@FUNCTION
 	i32.const	$push15=, -37
 	i32.const	$push14=, -1
-	i32.const	$push38=, -38
-	i32.eq  	$push13=, $0, $pop38
+	i32.const	$push34=, -38
+	i32.eq  	$push13=, $0, $pop34
 	i32.select	$push16=, $pop15, $pop14, $pop13
 	i32.const	$push17=, -4095
 	i32.lt_u	$push18=, $0, $pop17
-	i32.select	$push19=, $pop39, $pop16, $pop18
-	i32.const	$push37=, -37
-	i32.ne  	$push20=, $pop19, $pop37
+	i32.select	$push19=, $0, $pop16, $pop18
+	i32.const	$push33=, -37
+	i32.ne  	$push20=, $pop19, $pop33
 	br_if   	0, $pop20       # 0: down to label0
-# BB#3:                                 # %if.end8
-	i32.const	$push42=, 0
-	return  	$pop42
+# %bb.3:                                # %if.end8
+	i32.const	$push36=, 0
+	return  	$pop36
 .LBB2_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -115,5 +111,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071219-1.c.s b/test/torture-s/20071219-1.c.s
index ea1f7ceec..97aca9b69 100644
--- a/test/torture-s/20071219-1.c.s
+++ b/test/torture-s/20071219-1.c.s
@@ -7,34 +7,32 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.add 	$push4=, $0, $3
-	tee_local	$push3=, $2=, $pop4
-	i32.load8_u	$push0=, 0($pop3)
+	i32.add 	$2=, $0, $3
+	i32.load8_u	$push0=, 0($2)
 	br_if   	1, $pop0        # 1: down to label0
-# BB#2:                                 # %if.else
+# %bb.2:                                # %if.else
                                         #   in Loop: Header=BB0_1 Depth=1
 	block   	
-	i32.eqz 	$push9=, $1
-	br_if   	0, $pop9        # 0: down to label2
-# BB#3:                                 # %if.then3
+	i32.eqz 	$push5=, $1
+	br_if   	0, $pop5        # 0: down to label2
+# %bb.3:                                # %if.then3
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.store8	0($2), $1
 .LBB0_4:                                # %for.inc
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $3, $pop8
-	tee_local	$push6=, $3=, $pop7
-	i32.const	$push5=, 25
-	i32.lt_u	$push1=, $pop6, $pop5
+	i32.const	$push4=, 1
+	i32.add 	$3=, $3, $pop4
+	i32.const	$push3=, 25
+	i32.lt_u	$push1=, $3, $pop3
 	br_if   	0, $pop1        # 0: up to label1
-# BB#5:                                 # %for.end
+# %bb.5:                                # %for.end
 	end_loop
 	i32.const	$push2=, 0
 	i32.store	p($pop2), $0
@@ -53,56 +51,49 @@ foo:                                    # @foo
 	.type	test1,@function
 test1:                                  # @test1
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push17=, 0
+# %bb.0:                                # %entry
 	i32.const	$push15=, 0
 	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 64
-	i32.sub 	$push49=, $pop14, $pop16
-	tee_local	$push48=, $6=, $pop49
-	i32.store	__stack_pointer($pop17), $pop48
+	i32.sub 	$6=, $pop14, $pop16
+	i32.const	$push17=, 0
+	i32.store	__stack_pointer($pop17), $6
 	i32.const	$push21=, 32
 	i32.add 	$push22=, $6, $pop21
 	i32.const	$push0=, 24
-	i32.add 	$push47=, $pop22, $pop0
-	tee_local	$push46=, $0=, $pop47
+	i32.add 	$0=, $pop22, $pop0
 	i32.const	$push1=, 0
-	i32.store8	0($pop46), $pop1
+	i32.store8	0($0), $pop1
 	i32.const	$push23=, 32
 	i32.add 	$push24=, $6, $pop23
 	i32.const	$push2=, 16
-	i32.add 	$push45=, $pop24, $pop2
-	tee_local	$push44=, $1=, $pop45
+	i32.add 	$1=, $pop24, $pop2
 	i64.const	$push3=, 0
-	i64.store	0($pop44), $pop3
+	i64.store	0($1), $pop3
 	i32.const	$push25=, 32
 	i32.add 	$push26=, $6, $pop25
 	i32.const	$push4=, 8
-	i32.add 	$push43=, $pop26, $pop4
-	tee_local	$push42=, $2=, $pop43
-	i64.const	$push41=, 0
-	i64.store	0($pop42), $pop41
-	i64.const	$push40=, 0
-	i64.store	32($6), $pop40
+	i32.add 	$2=, $pop26, $pop4
+	i64.const	$push35=, 0
+	i64.store	0($2), $pop35
+	i64.const	$push34=, 0
+	i64.store	32($6), $pop34
 	i32.const	$push27=, 32
 	i32.add 	$push28=, $6, $pop27
-	i32.const	$push39=, 0
-	call    	foo@FUNCTION, $pop28, $pop39
-	i32.const	$push38=, 24
-	i32.add 	$push37=, $6, $pop38
-	tee_local	$push36=, $3=, $pop37
+	i32.const	$push33=, 0
+	call    	foo@FUNCTION, $pop28, $pop33
+	i32.const	$push32=, 24
+	i32.add 	$3=, $6, $pop32
 	i32.load8_u	$push5=, 0($0)
-	i32.store8	0($pop36), $pop5
-	i32.const	$push35=, 16
-	i32.add 	$push34=, $6, $pop35
-	tee_local	$push33=, $4=, $pop34
+	i32.store8	0($3), $pop5
+	i32.const	$push31=, 16
+	i32.add 	$4=, $6, $pop31
 	i64.load	$push6=, 0($1)
-	i64.store	0($pop33), $pop6
-	i32.const	$push32=, 8
-	i32.add 	$push31=, $6, $pop32
-	tee_local	$push30=, $5=, $pop31
+	i64.store	0($4), $pop6
+	i32.const	$push30=, 8
+	i32.add 	$5=, $6, $pop30
 	i64.load	$push7=, 0($2)
-	i64.store	0($pop30), $pop7
+	i64.store	0($5), $pop7
 	i64.load	$push8=, 32($6)
 	i64.store	0($6), $pop8
 	i32.const	$push9=, 1
@@ -132,56 +123,49 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push24=, 0
+# %bb.0:                                # %entry
 	i32.const	$push22=, 0
 	i32.load	$push21=, __stack_pointer($pop22)
 	i32.const	$push23=, 64
-	i32.sub 	$push62=, $pop21, $pop23
-	tee_local	$push61=, $6=, $pop62
-	i32.store	__stack_pointer($pop24), $pop61
+	i32.sub 	$6=, $pop21, $pop23
+	i32.const	$push24=, 0
+	i32.store	__stack_pointer($pop24), $6
 	i32.const	$push28=, 32
 	i32.add 	$push29=, $6, $pop28
 	i32.const	$push0=, 24
-	i32.add 	$push60=, $pop29, $pop0
-	tee_local	$push59=, $5=, $pop60
+	i32.add 	$5=, $pop29, $pop0
 	i32.const	$push1=, 0
-	i32.store8	0($pop59), $pop1
+	i32.store8	0($5), $pop1
 	i32.const	$push30=, 32
 	i32.add 	$push31=, $6, $pop30
 	i32.const	$push2=, 16
-	i32.add 	$push58=, $pop31, $pop2
-	tee_local	$push57=, $0=, $pop58
+	i32.add 	$0=, $pop31, $pop2
 	i64.const	$push3=, 0
-	i64.store	0($pop57), $pop3
+	i64.store	0($0), $pop3
 	i32.const	$push32=, 32
 	i32.add 	$push33=, $6, $pop32
 	i32.const	$push4=, 8
-	i32.add 	$push56=, $pop33, $pop4
-	tee_local	$push55=, $1=, $pop56
-	i64.const	$push54=, 0
-	i64.store	0($pop55), $pop54
-	i64.const	$push53=, 0
-	i64.store	32($6), $pop53
+	i32.add 	$1=, $pop33, $pop4
+	i64.const	$push46=, 0
+	i64.store	0($1), $pop46
+	i64.const	$push45=, 0
+	i64.store	32($6), $pop45
 	i32.const	$push34=, 32
 	i32.add 	$push35=, $6, $pop34
-	i32.const	$push52=, 0
-	call    	foo@FUNCTION, $pop35, $pop52
-	i32.const	$push51=, 24
-	i32.add 	$push50=, $6, $pop51
-	tee_local	$push49=, $2=, $pop50
+	i32.const	$push44=, 0
+	call    	foo@FUNCTION, $pop35, $pop44
+	i32.const	$push43=, 24
+	i32.add 	$2=, $6, $pop43
 	i32.load8_u	$push5=, 0($5)
-	i32.store8	0($pop49), $pop5
-	i32.const	$push48=, 16
-	i32.add 	$push47=, $6, $pop48
-	tee_local	$push46=, $3=, $pop47
+	i32.store8	0($2), $pop5
+	i32.const	$push42=, 16
+	i32.add 	$3=, $6, $pop42
 	i64.load	$push6=, 0($0)
-	i64.store	0($pop46), $pop6
-	i32.const	$push45=, 8
-	i32.add 	$push44=, $6, $pop45
-	tee_local	$push43=, $4=, $pop44
+	i64.store	0($3), $pop6
+	i32.const	$push41=, 8
+	i32.add 	$4=, $6, $pop41
 	i64.load	$push7=, 0($1)
-	i64.store	0($pop43), $pop7
+	i64.store	0($4), $pop7
 	i64.load	$push8=, 32($6)
 	i64.store	0($6), $pop8
 	i32.const	$push9=, 1
@@ -194,11 +178,10 @@ test2:                                  # @test2
 	i64.store	0($4), $pop12
 	i64.load	$push13=, 32($6)
 	i64.store	0($6), $pop13
-	i32.const	$push42=, 0
-	i32.load	$push41=, p($pop42)
-	tee_local	$push40=, $5=, $pop41
+	i32.const	$push40=, 0
+	i32.load	$5=, p($pop40)
 	i32.const	$push39=, 8
-	i32.add 	$push14=, $pop40, $pop39
+	i32.add 	$push14=, $5, $pop39
 	i64.load	$push15=, 0($pop14):p2align=0
 	i64.store	0($4), $pop15
 	i32.const	$push38=, 16
@@ -228,80 +211,69 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
 	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.sub 	$8=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $8
 	i32.const	$push25=, 32
 	i32.add 	$push26=, $8, $pop25
 	i32.const	$push0=, 24
-	i32.add 	$push63=, $pop26, $pop0
-	tee_local	$push62=, $0=, $pop63
+	i32.add 	$0=, $pop26, $pop0
 	i32.const	$push1=, 0
-	i32.store8	0($pop62), $pop1
+	i32.store8	0($0), $pop1
 	i32.const	$push27=, 32
 	i32.add 	$push28=, $8, $pop27
 	i32.const	$push2=, 16
-	i32.add 	$push61=, $pop28, $pop2
-	tee_local	$push60=, $1=, $pop61
+	i32.add 	$1=, $pop28, $pop2
 	i64.const	$push3=, 0
-	i64.store	0($pop60), $pop3
+	i64.store	0($1), $pop3
 	i32.const	$push29=, 32
 	i32.add 	$push30=, $8, $pop29
 	i32.const	$push4=, 8
-	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.add 	$2=, $pop30, $pop4
+	i64.const	$push43=, 0
+	i64.store	0($2), $pop43
+	i64.const	$push42=, 0
+	i64.store	32($8), $pop42
 	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.const	$push41=, 0
+	call    	foo@FUNCTION, $pop32, $pop41
+	i32.const	$push40=, 24
+	i32.add 	$3=, $8, $pop40
 	i32.load8_u	$push5=, 0($0)
-	i32.store8	0($pop52), $pop5
-	i32.const	$push51=, 16
-	i32.add 	$push50=, $8, $pop51
-	tee_local	$push49=, $4=, $pop50
+	i32.store8	0($3), $pop5
+	i32.const	$push39=, 16
+	i32.add 	$4=, $8, $pop39
 	i64.load	$push6=, 0($1)
-	i64.store	0($pop49), $pop6
-	i32.const	$push48=, 8
-	i32.add 	$push47=, $8, $pop48
-	tee_local	$push46=, $5=, $pop47
+	i64.store	0($4), $pop6
+	i32.const	$push38=, 8
+	i32.add 	$5=, $8, $pop38
 	i64.load	$push7=, 0($2)
-	i64.store	0($pop46), $pop7
+	i64.store	0($5), $pop7
 	i64.load	$push8=, 32($8)
 	i64.store	0($8), $pop8
 	i32.const	$push9=, 1
 	call    	foo@FUNCTION, $8, $pop9
-	i32.const	$push45=, 0
-	i32.load	$push44=, p($pop45)
-	tee_local	$push43=, $6=, $pop44
+	i32.const	$push37=, 0
+	i32.load	$6=, p($pop37)
 	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.store	0($6):p2align=0, $pop10
+	i32.const	$push36=, 16
+	i32.add 	$7=, $6, $pop36
 	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.store	0($7):p2align=0, $pop11
+	i32.const	$push35=, 8
+	i32.add 	$1=, $6, $pop35
 	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
+	i64.store	0($1):p2align=0, $pop12
+	i32.const	$push34=, 24
+	i32.add 	$2=, $6, $pop34
 	i32.load8_u	$push13=, 0($0)
-	i32.store8	0($pop34), $pop13
+	i32.store8	0($2), $pop13
 	i64.load	$push14=, 0($8)
 	i64.store	0($6):p2align=0, $pop14
 	i32.load8_u	$push15=, 0($3)
@@ -327,7 +299,7 @@ test3:                                  # @test3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	test1@FUNCTION
 	call    	test2@FUNCTION
 	call    	test3@FUNCTION
@@ -347,5 +319,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20071220-1.c.s b/test/torture-s/20071220-1.c.s
index 3b5739857..7eed2f506 100644
--- a/test/torture-s/20071220-1.c.s
+++ b/test/torture-s/20071220-1.c.s
@@ -7,7 +7,7 @@
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	i32.load	$push0=, 0($0)
@@ -22,7 +22,7 @@ baz:                                    # @baz
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, bar@FUNCTION
 	i32.const	$push0=, 17
                                         # fallthrough-return: $pop0
@@ -35,11 +35,11 @@ f1:                                     # @f1
 bar:                                    # @bar
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, bar.b
 	i32.call	$drop=, baz@FUNCTION, $pop0
 .Ltmp0:                                 # Block address taken
-# BB#1:                                 # %addr
+# %bb.1:                                # %addr
 	copy_local	$push1=, $0
                                         # fallthrough-return: $pop1
 	.endfunc
@@ -52,7 +52,7 @@ bar:                                    # @bar
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, bar@FUNCTION
 	i32.const	$push0=, 17
                                         # fallthrough-return: $pop0
@@ -66,7 +66,7 @@ f2:                                     # @f2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f1@FUNCTION
 	i32.call	$drop=, f1@FUNCTION
 	i32.call	$drop=, f2@FUNCTION
@@ -85,4 +85,4 @@ bar.b:
 	.size	bar.b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20071220-2.c.s b/test/torture-s/20071220-2.c.s
index 2d9c27e21..a50a26d63 100644
--- a/test/torture-s/20071220-2.c.s
+++ b/test/torture-s/20071220-2.c.s
@@ -7,7 +7,7 @@
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	i32.load	$push0=, 0($0)
@@ -22,7 +22,7 @@ baz:                                    # @baz
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, bar@FUNCTION
 	i32.const	$push0=, 17
                                         # fallthrough-return: $pop0
@@ -35,11 +35,11 @@ f1:                                     # @f1
 bar:                                    # @bar
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, bar.b
 	i32.call	$drop=, baz@FUNCTION, $pop0
 .Ltmp0:                                 # Block address taken
-# BB#1:                                 # %addr
+# %bb.1:                                # %addr
 	copy_local	$push1=, $0
                                         # fallthrough-return: $pop1
 	.endfunc
@@ -52,7 +52,7 @@ bar:                                    # @bar
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, bar@FUNCTION
 	i32.const	$push0=, 17
                                         # fallthrough-return: $pop0
@@ -66,7 +66,7 @@ f2:                                     # @f2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f1@FUNCTION
 	i32.call	$drop=, f1@FUNCTION
 	i32.call	$drop=, f2@FUNCTION
@@ -85,4 +85,4 @@ bar.b:
 	.size	bar.b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080117-1.c.s b/test/torture-s/20080117-1.c.s
index 2b5b8a4e5..f6af81591 100644
--- a/test/torture-s/20080117-1.c.s
+++ b/test/torture-s/20080117-1.c.s
@@ -6,7 +6,7 @@
 	.type	gstate_path_memory,@function
 gstate_path_memory:                     # @gstate_path_memory
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
@@ -26,7 +26,7 @@ gstate_path_memory:                     # @gstate_path_memory
 	.type	gs_state_update_overprint,@function
 gs_state_update_overprint:              # @gs_state_update_overprint
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -39,7 +39,7 @@ gs_state_update_overprint:              # @gs_state_update_overprint
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -56,4 +56,4 @@ gstate_initial:
 	.size	gstate_initial, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080122-1.c.s b/test/torture-s/20080122-1.c.s
index 5f61af1d5..5a25fb993 100644
--- a/test/torture-s/20080122-1.c.s
+++ b/test/torture-s/20080122-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	#APP
@@ -91,4 +91,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080222-1.c.s b/test/torture-s/20080222-1.c.s
index f6b275753..6daa85139 100644
--- a/test/torture-s/20080222-1.c.s
+++ b/test/torture-s/20080222-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_u	$push0=, 4($0)
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,14 +20,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load8_u	$push0=, space+4($pop3)
 	i32.const	$push1=, 5
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -47,5 +47,5 @@ space:
 	.size	space, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080408-1.c.s b/test/torture-s/20080408-1.c.s
index a81a2bce7..f30a84154 100644
--- a/test/torture-s/20080408-1.c.s
+++ b/test/torture-s/20080408-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080424-1.c.s b/test/torture-s/20080424-1.c.s
index 8d1ef6a86..02f882346 100644
--- a/test/torture-s/20080424-1.c.s
+++ b/test/torture-s/20080424-1.c.s
@@ -7,28 +7,26 @@
 bar:                                    # @bar
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push13=, 0
-	i32.load	$push12=, bar.i($pop13)
-	tee_local	$push11=, $2=, $pop12
+# %bb.0:                                # %entry
+	i32.const	$push9=, 0
+	i32.load	$2=, bar.i($pop9)
 	i32.const	$push0=, 36
-	i32.mul 	$push10=, $pop11, $pop0
-	tee_local	$push9=, $3=, $pop10
+	i32.mul 	$3=, $2, $pop0
+	block   	
 	i32.const	$push1=, g+288
-	i32.add 	$push2=, $pop9, $pop1
+	i32.add 	$push2=, $3, $pop1
 	i32.ne  	$push3=, $pop2, $0
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push14=, 0
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push10=, 0
 	i32.const	$push4=, 1
 	i32.add 	$push5=, $2, $pop4
-	i32.store	bar.i($pop14), $pop5
+	i32.store	bar.i($pop10), $pop5
 	i32.const	$push6=, g
 	i32.add 	$push7=, $3, $pop6
 	i32.ne  	$push8=, $pop7, $1
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -44,7 +42,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, g+288
 	i32.const	$push0=, g
 	call    	bar@FUNCTION, $pop1, $pop0
@@ -92,5 +90,5 @@ g:
 	.size	g, 1728
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080502-1.c.s b/test/torture-s/20080502-1.c.s
index 2f49cf5b2..ee1b1f45f 100644
--- a/test/torture-s/20080502-1.c.s
+++ b/test/torture-s/20080502-1.c.s
@@ -6,18 +6,15 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push0=, 8
-	i32.add 	$push1=, $0, $pop0
-	i64.const	$push2=, 63
-	i64.shr_s	$push8=, $2, $pop2
-	tee_local	$push7=, $2=, $pop8
-	i64.const	$push3=, 4611846683310179025
-	i64.and 	$push4=, $pop7, $pop3
-	i64.store	0($pop1), $pop4
-	i64.const	$push5=, -8905435550453399112
-	i64.and 	$push6=, $2, $pop5
-	i64.store	0($0), $pop6
+# %bb.0:                                # %entry
+	i64.const	$push0=, 63
+	i64.shr_s	$2=, $2, $pop0
+	i64.const	$push1=, 4611846683310179025
+	i64.and 	$push2=, $2, $pop1
+	i64.store	8($0), $pop2
+	i64.const	$push3=, -8905435550453399112
+	i64.and 	$push4=, $2, $pop3
+	i64.store	0($0), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -30,14 +27,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push16=, $pop8, $pop10
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop11), $pop15
+	i32.sub 	$0=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $0
 	i64.const	$push1=, 0
 	i64.const	$push0=, -4611967493404098560
 	call    	foo@FUNCTION, $0, $pop1, $pop0
@@ -48,7 +44,7 @@ main:                                   # @main
 	i64.const	$push2=, 4611846683310179025
 	i32.call	$push6=, __eqtf2@FUNCTION, $pop5, $pop4, $pop3, $pop2
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push14=, 0
 	i32.const	$push12=, 16
 	i32.add 	$push13=, $0, $pop12
@@ -64,5 +60,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080506-1.c.s b/test/torture-s/20080506-1.c.s
index 55490909d..50231fc08 100644
--- a/test/torture-s/20080506-1.c.s
+++ b/test/torture-s/20080506-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080506-2.c.s b/test/torture-s/20080506-2.c.s
index 64f3a88b5..a9933fceb 100644
--- a/test/torture-s/20080506-2.c.s
+++ b/test/torture-s/20080506-2.c.s
@@ -6,11 +6,10 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push7=, 0($0)
-	tee_local	$push6=, $0=, $pop7
+# %bb.0:                                # %entry
+	i32.load	$0=, 0($0)
 	i32.const	$push0=, 1
-	i32.store	0($pop6), $pop0
+	i32.store	0($0), $pop0
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 2
 	i32.store	0($pop1), $pop2
@@ -19,7 +18,7 @@ foo:                                    # @foo
 	i32.const	$push5=, 2
 	i32.ne  	$push4=, $pop3, $pop5
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -36,14 +35,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push17=, $pop1, $pop3
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop4), $pop16
+	i32.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $0, $pop8
 	i32.store	8($0), $pop9
@@ -66,5 +64,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080519-1.c.s b/test/torture-s/20080519-1.c.s
index 167a6114e..f0bf59b08 100644
--- a/test/torture-s/20080519-1.c.s
+++ b/test/torture-s/20080519-1.c.s
@@ -6,18 +6,18 @@
 	.type	merge_overlapping_regs,@function
 merge_overlapping_regs:                 # @merge_overlapping_regs
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push4=, -1
 	i32.ne  	$push1=, $pop0, $pop4
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push2=, 4($0)
 	i32.const	$push5=, -1
 	i32.ne  	$push3=, $pop2, $pop5
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -33,91 +33,75 @@ merge_overlapping_regs:                 # @merge_overlapping_regs
 	.type	regrename_optimize,@function
 regrename_optimize:                     # @regrename_optimize
 	.param  	i32
-	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
-	i32.const	$push25=, 0
-	i32.load	$push24=, __stack_pointer($pop25)
-	i32.const	$push26=, 16
-	i32.sub 	$push36=, $pop24, $pop26
-	tee_local	$push35=, $6=, $pop36
-	i32.store	__stack_pointer($pop27), $pop35
+	.local  	i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push24=, 0
+	i32.load	$push23=, __stack_pointer($pop24)
+	i32.const	$push25=, 16
+	i32.sub 	$5=, $pop23, $pop25
+	i32.const	$push26=, 0
+	i32.store	__stack_pointer($pop26), $5
 	i64.const	$push0=, 0
-	i64.store	8($6):p2align=2, $pop0
+	i64.store	8($5):p2align=2, $pop0
+	i32.load	$4=, 0($0)
 	block   	
-	i32.load	$push34=, 0($0)
-	tee_local	$push33=, $5=, $pop34
-	i32.eqz 	$push54=, $pop33
-	br_if   	0, $pop54       # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push38=, $4
+	br_if   	0, $pop38       # 0: down to label1
+# %bb.1:                                # %for.body.preheader
+	i32.const	$2=, 0
 	i32.const	$3=, 0
-	i32.const	$2=, -1
-	i32.const	$4=, 0
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push48=, 1
-	i32.add 	$2=, $2, $pop48
+	copy_local	$1=, $4
 	i32.load	$push1=, 4($0)
-	i32.const	$push47=, 3
-	i32.shl 	$push46=, $pop1, $pop47
-	tee_local	$push45=, $0=, $pop46
-	i32.const	$push44=, reg_class_contents+4
-	i32.add 	$push2=, $pop45, $pop44
+	i32.const	$push36=, 3
+	i32.shl 	$4=, $pop1, $pop36
+	i32.const	$push35=, reg_class_contents+4
+	i32.add 	$push2=, $4, $pop35
 	i32.load	$push3=, 0($pop2)
-	i32.const	$push43=, -1
-	i32.xor 	$push4=, $pop3, $pop43
-	i32.or  	$3=, $3, $pop4
-	i32.const	$push42=, reg_class_contents
-	i32.add 	$push5=, $0, $pop42
+	i32.const	$push34=, -1
+	i32.xor 	$push4=, $pop3, $pop34
+	i32.or  	$2=, $2, $pop4
+	i32.const	$push33=, reg_class_contents
+	i32.add 	$push5=, $4, $pop33
 	i32.load	$push6=, 0($pop5)
-	i32.const	$push41=, -1
-	i32.xor 	$push7=, $pop6, $pop41
-	i32.or  	$4=, $4, $pop7
-	copy_local	$push40=, $5
-	tee_local	$push39=, $1=, $pop40
-	copy_local	$0=, $pop39
-	i32.load	$push38=, 0($1)
-	tee_local	$push37=, $5=, $pop38
-	br_if   	0, $pop37       # 0: up to label2
-# BB#3:                                 # %for.end
+	i32.const	$push32=, -1
+	i32.xor 	$push7=, $pop6, $pop32
+	i32.or  	$3=, $3, $pop7
+	i32.load	$4=, 0($1)
+	copy_local	$0=, $1
+	br_if   	0, $4           # 0: up to label2
+# %bb.3:                                # %if.end
 	end_loop
-	i32.const	$push8=, 12
-	i32.add 	$push50=, $6, $pop8
-	tee_local	$push49=, $0=, $pop50
-	i32.store	0($pop49), $3
-	i32.store	8($6), $4
-	i32.const	$push9=, 0
-	i32.lt_s	$push10=, $2, $pop9
-	br_if   	0, $pop10       # 0: down to label1
-# BB#4:                                 # %if.end
-	i32.load	$push11=, 4($1)
-	i32.const	$push12=, 3
-	i32.shl 	$push53=, $pop11, $pop12
-	tee_local	$push52=, $2=, $pop53
-	i32.const	$push13=, reg_class_contents+4
-	i32.add 	$push14=, $pop52, $pop13
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push16=, -1
-	i32.xor 	$push17=, $pop15, $pop16
-	i32.or  	$push18=, $3, $pop17
-	i32.store	0($0), $pop18
-	i32.const	$push19=, reg_class_contents
-	i32.add 	$push20=, $2, $pop19
-	i32.load	$push21=, 0($pop20)
-	i32.const	$push51=, -1
-	i32.xor 	$push22=, $pop21, $pop51
-	i32.or  	$push23=, $4, $pop22
-	i32.store	8($6), $pop23
-	i32.const	$push31=, 8
-	i32.add 	$push32=, $6, $pop31
-	call    	merge_overlapping_regs@FUNCTION, $pop32
-.LBB1_5:                                # %cleanup
+	i32.load	$push8=, 4($1)
+	i32.const	$push9=, 3
+	i32.shl 	$4=, $pop8, $pop9
+	i32.const	$push16=, 12
+	i32.add 	$push17=, $5, $pop16
+	i32.const	$push10=, reg_class_contents+4
+	i32.add 	$push11=, $4, $pop10
+	i32.load	$push12=, 0($pop11)
+	i32.const	$push13=, -1
+	i32.xor 	$push14=, $pop12, $pop13
+	i32.or  	$push15=, $2, $pop14
+	i32.store	0($pop17), $pop15
+	i32.const	$push18=, reg_class_contents
+	i32.add 	$push19=, $4, $pop18
+	i32.load	$push20=, 0($pop19)
+	i32.const	$push37=, -1
+	i32.xor 	$push21=, $pop20, $pop37
+	i32.or  	$push22=, $3, $pop21
+	i32.store	8($5), $pop22
+	i32.const	$push30=, 8
+	i32.add 	$push31=, $5, $pop30
+	call    	merge_overlapping_regs@FUNCTION, $pop31
+.LBB1_4:                                # %cleanup
 	end_block                       # label1:
-	i32.const	$push30=, 0
-	i32.const	$push28=, 16
-	i32.add 	$push29=, $6, $pop28
-	i32.store	__stack_pointer($pop30), $pop29
+	i32.const	$push29=, 0
+	i32.const	$push27=, 16
+	i32.add 	$push28=, $5, $pop27
+	i32.store	__stack_pointer($pop29), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -130,14 +114,13 @@ regrename_optimize:                     # @regrename_optimize
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push17=, $pop4, $pop6
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop7), $pop16
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push0=, 0
 	i64.store	8($0), $pop0
 	i32.const	$push2=, 0
@@ -172,5 +155,5 @@ reg_class_contents:
 	.size	reg_class_contents, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080522-1.c.s b/test/torture-s/20080522-1.c.s
index 51689d2af..b260136f1 100644
--- a/test/torture-s/20080522-1.c.s
+++ b/test/torture-s/20080522-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	i($pop1), $pop0
@@ -27,7 +27,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.store	0($0), $pop0
 	i32.const	$push2=, 0
@@ -46,14 +46,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 16
-	i32.sub 	$push29=, $pop16, $pop18
-	tee_local	$push28=, $0=, $pop29
-	i32.store	__stack_pointer($pop19), $pop28
+	i32.sub 	$0=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $0
 	i32.const	$push0=, 0
 	i32.store	12($0), $pop0
 	block   	
@@ -62,37 +61,37 @@ main:                                   # @main
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push31=, i
-	i32.call	$push4=, bar@FUNCTION, $pop31
-	i32.const	$push30=, 1
-	i32.ne  	$push5=, $pop4, $pop30
+# %bb.1:                                # %if.end
+	i32.const	$push29=, i
+	i32.call	$push4=, bar@FUNCTION, $pop29
+	i32.const	$push28=, 1
+	i32.ne  	$push5=, $pop4, $pop28
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push23=, 12
 	i32.add 	$push24=, $0, $pop23
 	i32.call	$push6=, foo@FUNCTION, $pop24
-	i32.const	$push32=, 1
-	i32.ne  	$push7=, $pop6, $pop32
+	i32.const	$push30=, 1
+	i32.ne  	$push7=, $pop6, $pop30
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	i32.load	$push8=, 12($0)
-	i32.const	$push33=, 2
-	i32.ne  	$push9=, $pop8, $pop33
+	i32.const	$push31=, 2
+	i32.ne  	$push9=, $pop8, $pop31
 	br_if   	0, $pop9        # 0: down to label0
-# BB#4:                                 # %if.end11
+# %bb.4:                                # %if.end11
 	i32.const	$push25=, 12
 	i32.add 	$push26=, $0, $pop25
 	i32.call	$push10=, bar@FUNCTION, $pop26
-	i32.const	$push34=, 2
-	i32.ne  	$push11=, $pop10, $pop34
+	i32.const	$push32=, 2
+	i32.ne  	$push11=, $pop10, $pop32
 	br_if   	0, $pop11       # 0: down to label0
-# BB#5:                                 # %if.end15
+# %bb.5:                                # %if.end15
 	i32.load	$push13=, 12($0)
 	i32.const	$push12=, 2
 	i32.ne  	$push14=, $pop13, $pop12
 	br_if   	0, $pop14       # 0: down to label0
-# BB#6:                                 # %if.end18
+# %bb.6:                                # %if.end18
 	i32.const	$push22=, 0
 	i32.const	$push20=, 16
 	i32.add 	$push21=, $0, $pop20
@@ -115,5 +114,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080529-1.c.s b/test/torture-s/20080529-1.c.s
index 89f1808db..9523dd563 100644
--- a/test/torture-s/20080529-1.c.s
+++ b/test/torture-s/20080529-1.c.s
@@ -7,7 +7,7 @@
 test:                                   # @test
 	.param  	f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.const	$push0=, 0x0p0
 	f32.eq  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080604-1.c.s b/test/torture-s/20080604-1.c.s
index d56aa6ab6..acfcd0916 100644
--- a/test/torture-s/20080604-1.c.s
+++ b/test/torture-s/20080604-1.c.s
@@ -5,13 +5,13 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push1=, x($pop0)
 	i32.eqz 	$push2=, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,21 +28,19 @@ foo:                                    # @foo
 baz:                                    # @baz
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push15=, $pop2, $pop4
-	tee_local	$push14=, $1=, $pop15
-	i32.store	__stack_pointer($pop5), $pop14
+	i32.sub 	$1=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $1
 	i32.const	$push9=, 12
 	i32.add 	$push10=, $1, $pop9
 	i32.const	$push0=, x
-	i32.select	$push13=, $pop10, $pop0, $0
-	tee_local	$push12=, $0=, $pop13
+	i32.select	$0=, $pop10, $pop0, $0
 	i32.const	$push1=, .L.str
-	i32.store	0($pop12), $pop1
+	i32.store	0($0), $pop1
 	call    	foo@FUNCTION
 	i32.const	$push11=, .L.str
 	i32.store	0($0), $pop11
@@ -61,7 +59,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, .L.str
 	i32.store	x($pop1), $pop0
@@ -91,5 +89,5 @@ x:
 	.size	.L.str, 14
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20080719-1.c.s b/test/torture-s/20080719-1.c.s
index cf346dd89..329eec66a 100644
--- a/test/torture-s/20080719-1.c.s
+++ b/test/torture-s/20080719-1.c.s
@@ -7,7 +7,7 @@
 xxx:                                    # @xxx
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, cfb_tab8_be
 	i32.const	$push3=, cfb_tab16_be
 	i32.const	$push2=, cfb_tab32
@@ -28,7 +28,7 @@ xxx:                                    # @xxx
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -76,4 +76,4 @@ cfb_tab32:
 	.size	cfb_tab32, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20080813-1.c.s b/test/torture-s/20080813-1.c.s
index 7879644ca..077f39494 100644
--- a/test/torture-s/20080813-1.c.s
+++ b/test/torture-s/20080813-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,12 +18,12 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 255
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -39,7 +39,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -47,5 +47,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20081103-1.c.s b/test/torture-s/20081103-1.c.s
index 1420f0b57..e39390709 100644
--- a/test/torture-s/20081103-1.c.s
+++ b/test/torture-s/20081103-1.c.s
@@ -6,14 +6,14 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push2=, 1($0):p2align=0
 	i32.const	$push0=, 0
 	i32.load	$push1=, A($pop0)
 	i32.ne  	$push3=, $pop2, $pop1
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,30 +30,28 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push14=, $pop2, $pop4
-	tee_local	$push13=, $1=, $pop14
-	i32.store	__stack_pointer($pop5), $pop13
-	i32.const	$push12=, 0
-	i32.load	$push11=, A($pop12)
-	tee_local	$push10=, $0=, $pop11
-	i32.store	1($1):p2align=0, $pop10
+	i32.sub 	$1=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $1
+	i32.const	$push10=, 0
+	i32.load	$0=, A($pop10)
+	i32.store	1($1):p2align=0, $0
 	block   	
 	i32.const	$push9=, 0
 	i32.load	$push0=, A($pop9)
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %foo.exit
+# %bb.1:                                # %foo.exit
 	i32.const	$push8=, 0
 	i32.const	$push6=, 16
 	i32.add 	$push7=, $1, $pop6
 	i32.store	__stack_pointer($pop8), $pop7
-	i32.const	$push15=, 0
-	return  	$pop15
+	i32.const	$push11=, 0
+	return  	$pop11
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -72,6 +70,6 @@ A:
 	.size	A, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2de9c8c93..4129c7957 100644
--- a/test/torture-s/20081112-1.c.s
+++ b/test/torture-s/20081112-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20081117-1.c.s b/test/torture-s/20081117-1.c.s
index a52280764..ad572c4c2 100644
--- a/test/torture-s/20081117-1.c.s
+++ b/test/torture-s/20081117-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($0)
 	i64.const	$push1=, 16
 	i64.shr_u	$push2=, $pop0, $pop1
@@ -25,14 +25,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push14=, $pop3, $pop5
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop6), $pop13
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push12=, 0
 	i64.load	$push0=, s($pop12)
 	i64.store	8($0), $pop0
@@ -41,15 +40,15 @@ main:                                   # @main
 	i32.add 	$push11=, $0, $pop10
 	i32.const	$push1=, -2023406815
 	i32.call	$push2=, f@FUNCTION, $pop11, $pop1
-	i32.eqz 	$push16=, $pop2
-	br_if   	0, $pop16       # 0: down to label0
-# BB#1:                                 # %if.end
+	i32.eqz 	$push14=, $pop2
+	br_if   	0, $pop14       # 0: down to label0
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 0
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $0, $pop7
 	i32.store	__stack_pointer($pop9), $pop8
-	i32.const	$push15=, 0
-	return  	$pop15
+	i32.const	$push13=, 0
+	return  	$pop13
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -75,5 +74,5 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20081218-1.c.s b/test/torture-s/20081218-1.c.s
index 31f2d3956..3b8a012a6 100644
--- a/test/torture-s/20081218-1.c.s
+++ b/test/torture-s/20081218-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, a
 	i32.const	$push1=, 38
 	i32.const	$push0=, 520
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, a
 	i32.const	$push1=, 54
 	i32.const	$push0=, 520
@@ -42,13 +42,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push1=, foo@FUNCTION
 	i32.const	$push0=, 640034342
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$0=, 0
 .LBB2_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -59,45 +59,43 @@ main:                                   # @main
 	i32.const	$push16=, 38
 	i32.ne  	$push5=, $pop4, $pop16
 	br_if   	1, $pop5        # 1: down to label0
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB2_2 Depth=1
-	i32.const	$push21=, 1
-	i32.add 	$push20=, $0, $pop21
-	tee_local	$push19=, $0=, $pop20
+	i32.const	$push19=, 1
+	i32.add 	$0=, $0, $pop19
 	i32.const	$push18=, 519
-	i32.le_u	$push6=, $pop19, $pop18
+	i32.le_u	$push6=, $0, $pop18
 	br_if   	0, $pop6        # 0: up to label1
-# BB#4:                                 # %for.end
+# %bb.4:                                # %for.end
 	end_loop
 	call    	bar@FUNCTION
 	i32.const	$0=, 0
-	i32.const	$push22=, 0
-	i32.load	$push7=, a+4($pop22)
+	i32.const	$push20=, 0
+	i32.load	$push7=, a+4($pop20)
 	i32.const	$push8=, 909588022
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#5:                                 # %if.end9
-	i32.const	$push23=, 0
+# %bb.5:                                # %if.end9
+	i32.const	$push21=, 0
 	i32.const	$push10=, 909522486
-	i32.store	a+4($pop23), $pop10
+	i32.store	a+4($pop21), $pop10
 .LBB2_6:                                # %for.body13
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push25=, a
-	i32.add 	$push11=, $0, $pop25
+	i32.const	$push23=, a
+	i32.add 	$push11=, $0, $pop23
 	i32.load8_u	$push12=, 0($pop11)
-	i32.const	$push24=, 54
-	i32.ne  	$push13=, $pop12, $pop24
+	i32.const	$push22=, 54
+	i32.ne  	$push13=, $pop12, $pop22
 	br_if   	1, $pop13       # 1: down to label0
-# BB#7:                                 # %for.cond10
+# %bb.7:                                # %for.cond10
                                         #   in Loop: Header=BB2_6 Depth=1
-	i32.const	$push29=, 1
-	i32.add 	$push28=, $0, $pop29
-	tee_local	$push27=, $0=, $pop28
-	i32.const	$push26=, 519
-	i32.le_u	$push14=, $pop27, $pop26
+	i32.const	$push25=, 1
+	i32.add 	$0=, $0, $pop25
+	i32.const	$push24=, 519
+	i32.le_u	$push14=, $0, $pop24
 	br_if   	0, $pop14       # 0: up to label2
-# BB#8:                                 # %for.end22
+# %bb.8:                                # %for.end22
 	end_loop
 	i32.const	$push15=, 0
 	return  	$pop15
@@ -119,5 +117,5 @@ a:
 	.size	a, 520
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20090113-1.c.s b/test/torture-s/20090113-1.c.s
index d820f4a91..e3d4d3ac5 100644
--- a/test/torture-s/20090113-1.c.s
+++ b/test/torture-s/20090113-1.c.s
@@ -7,25 +7,21 @@
 msum_i4:                                # @msum_i4
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
+# %bb.0:                                # %entry
 	i32.const	$push21=, 0
 	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 64
-	i32.sub 	$push42=, $pop20, $pop22
-	tee_local	$push41=, $8=, $pop42
-	i32.store	__stack_pointer($pop23), $pop41
-	i32.load	$push40=, 0($2)
-	tee_local	$push39=, $2=, $pop40
-	i32.const	$push38=, -1
-	i32.add 	$push37=, $pop39, $pop38
-	tee_local	$push36=, $6=, $pop37
-	i32.const	$push35=, 12
-	i32.mul 	$push1=, $pop36, $pop35
-	i32.add 	$push34=, $1, $pop1
-	tee_local	$push33=, $7=, $pop34
+	i32.sub 	$8=, $pop20, $pop22
+	i32.const	$push23=, 0
+	i32.store	__stack_pointer($pop23), $8
+	i32.load	$2=, 0($2)
+	i32.const	$push34=, -1
+	i32.add 	$6=, $2, $pop34
+	i32.const	$push33=, 12
+	i32.mul 	$push1=, $6, $pop33
+	i32.add 	$7=, $1, $pop1
 	i32.const	$push32=, 16
-	i32.add 	$push2=, $pop33, $pop32
+	i32.add 	$push2=, $7, $pop32
 	i32.load	$push3=, 0($pop2)
 	i32.const	$push31=, 1
 	i32.add 	$push4=, $pop3, $pop31
@@ -37,46 +33,45 @@ 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.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push27=, 32
 	i32.add 	$push28=, $8, $pop27
 	i32.const	$push10=, 0
-	i32.const	$push45=, 2
-	i32.shl 	$push8=, $2, $pop45
-	i32.const	$push44=, -4
-	i32.add 	$push9=, $pop8, $pop44
+	i32.const	$push37=, 2
+	i32.shl 	$push8=, $2, $pop37
+	i32.const	$push36=, -4
+	i32.add 	$push9=, $pop8, $pop36
 	i32.call	$drop=, memset@FUNCTION, $pop28, $pop10, $pop9
-	i32.const	$push43=, 16
-	i32.add 	$2=, $1, $pop43
+	i32.const	$push35=, 16
+	i32.add 	$2=, $1, $pop35
 	copy_local	$7=, $8
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.load	$push11=, 0($2)
-	i32.const	$push52=, 1
-	i32.add 	$push12=, $pop11, $pop52
-	i32.const	$push51=, -4
-	i32.add 	$push13=, $2, $pop51
+	i32.const	$push42=, 1
+	i32.add 	$push12=, $pop11, $pop42
+	i32.const	$push41=, -4
+	i32.add 	$push13=, $2, $pop41
 	i32.load	$push14=, 0($pop13)
 	i32.sub 	$push15=, $pop12, $pop14
 	i32.store	0($7), $pop15
-	i32.const	$push50=, 12
-	i32.add 	$2=, $2, $pop50
-	i32.const	$push49=, 4
-	i32.add 	$7=, $7, $pop49
-	i32.const	$push48=, -1
-	i32.add 	$push47=, $6, $pop48
-	tee_local	$push46=, $6=, $pop47
-	br_if   	0, $pop46       # 0: up to label1
+	i32.const	$push40=, 12
+	i32.add 	$2=, $2, $pop40
+	i32.const	$push39=, -1
+	i32.add 	$6=, $6, $pop39
+	i32.const	$push38=, 4
+	i32.add 	$7=, $7, $pop38
+	br_if   	0, $6           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
 	i32.load	$5=, 0($1)
 	i32.load	$1=, 0($0)
-	i32.const	$push54=, 1
-	i32.lt_s	$0=, $3, $pop54
-	i32.const	$push53=, 2
-	i32.shl 	$4=, $3, $pop53
+	i32.const	$push44=, 1
+	i32.lt_s	$0=, $3, $pop44
+	i32.const	$push43=, 2
+	i32.shl 	$4=, $3, $pop43
 .LBB0_4:                                # %do.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_6 Depth 2
@@ -84,25 +79,24 @@ msum_i4:                                # @msum_i4
 	block   	
 	block   	
 	br_if   	0, $0           # 0: down to label4
-# BB#5:                                 # %for.body18.preheader
+# %bb.5:                                # %for.body18.preheader
                                         #   in Loop: Header=BB0_4 Depth=1
 	i32.const	$7=, 0
-	copy_local	$6=, $3
-	copy_local	$2=, $5
+	copy_local	$2=, $3
+	copy_local	$6=, $5
 .LBB0_6:                                # %for.body18
                                         #   Parent Loop BB0_4 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label5:
-	i32.load	$push16=, 0($2)
+	i32.const	$push46=, -1
+	i32.add 	$2=, $2, $pop46
+	i32.load	$push16=, 0($6)
 	i32.add 	$7=, $pop16, $7
-	i32.const	$push58=, 4
-	i32.add 	$push0=, $2, $pop58
-	copy_local	$2=, $pop0
-	i32.const	$push57=, -1
-	i32.add 	$push56=, $6, $pop57
-	tee_local	$push55=, $6=, $pop56
-	br_if   	0, $pop55       # 0: up to label5
-# BB#7:                                 # %for.end22.loopexit
+	i32.const	$push45=, 4
+	i32.add 	$push0=, $6, $pop45
+	copy_local	$6=, $pop0
+	br_if   	0, $2           # 0: up to label5
+# %bb.7:                                # %for.end22.loopexit
                                         #   in Loop: Header=BB0_4 Depth=1
 	end_loop
 	i32.add 	$5=, $5, $4
@@ -114,17 +108,16 @@ msum_i4:                                # @msum_i4
                                         #   in Loop: Header=BB0_4 Depth=1
 	end_block                       # label3:
 	i32.store	0($1), $7
-	i32.const	$push62=, 4
-	i32.add 	$1=, $1, $pop62
+	i32.const	$push48=, 4
+	i32.add 	$1=, $1, $pop48
 	i32.load	$push17=, 32($8)
-	i32.const	$push61=, 1
-	i32.add 	$push60=, $pop17, $pop61
-	tee_local	$push59=, $2=, $pop60
-	i32.store	32($8), $pop59
+	i32.const	$push47=, 1
+	i32.add 	$2=, $pop17, $pop47
+	i32.store	32($8), $2
 	i32.load	$push18=, 0($8)
 	i32.ne  	$push19=, $2, $pop18
 	br_if   	0, $pop19       # 0: up to label2
-# BB#10:                                # %do.end
+# %bb.10:                               # %do.end
 	end_loop
 	i32.const	$push26=, 0
 	i32.const	$push24=, 64
@@ -141,7 +134,7 @@ msum_i4:                                # @msum_i4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -149,4 +142,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20090113-2.c.s b/test/torture-s/20090113-2.c.s
index bbc18a7be..49b1333d0 100644
--- a/test/torture-s/20090113-2.c.s
+++ b/test/torture-s/20090113-2.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $0
 	i32.const	$push2=, 40
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -54,14 +53,13 @@ main:                                   # @main
 foobar:                                 # @foobar
 	.param  	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 32
-	i32.sub 	$push34=, $pop11, $pop13
-	tee_local	$push33=, $7=, $pop34
-	i32.store	__stack_pointer($pop14), $pop33
+	i32.sub 	$7=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $7
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $7, $pop18
 	i32.const	$push20=, 12
@@ -78,64 +76,64 @@ foobar:                                 # @foobar
                                         #     Child Loop BB1_3 Depth 2
                                         #     Child Loop BB1_9 Depth 2
 	loop    	                # label0:
-	i32.load	$0=, 12($7)
+	i32.load	$0=, 0($2)
+	i32.load	$5=, 12($7)
+	block   	
 	block   	
 	block   	
 	block   	
 	block   	
-	i32.load	$push36=, 0($2)
-	tee_local	$push35=, $5=, $pop36
-	i32.eqz 	$push66=, $pop35
-	br_if   	0, $pop66       # 0: down to label4
-# BB#2:                                 # %if.then.i
+	i32.eqz 	$push50=, $0
+	br_if   	0, $pop50       # 0: down to label5
+# %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 label5
+	i32.const	$push33=, 1
+	i32.and 	$push1=, $0, $pop33
+	br_if   	0, $pop1        # 0: down to label6
 .LBB1_3:                                # %while.body.i
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label6:
-	i32.const	$push42=, 1
-	i32.add 	$0=, $0, $pop42
-	i32.const	$push41=, 1
-	i32.shr_u	$push40=, $5, $pop41
-	tee_local	$push39=, $5=, $pop40
-	i32.const	$push38=, 1
-	i32.and 	$push1=, $pop39, $pop38
-	i32.eqz 	$push67=, $pop1
-	br_if   	0, $pop67       # 0: up to label6
+	loop    	                # label7:
+	i32.const	$push36=, 1
+	i32.add 	$5=, $5, $pop36
+	i32.const	$push35=, 2
+	i32.and 	$6=, $0, $pop35
+	i32.const	$push34=, 1
+	i32.shr_u	$push0=, $0, $pop34
+	copy_local	$0=, $pop0
+	i32.eqz 	$push51=, $6
+	br_if   	0, $pop51       # 0: up to label7
 .LBB1_4:                                # %while.end.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
-	end_block                       # label5:
-	i32.store	12($7), $0
-	br      	1               # 1: down to label3
+	end_block                       # label6:
+	i32.store	12($7), $5
+	br      	1               # 1: down to label4
 .LBB1_5:                                # %if.end.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	end_block                       # label4:
+	end_block                       # label5:
 	i32.load	$push3=, 0($3)
-	i32.const	$push50=, 1
-	i32.add 	$push49=, $pop3, $pop50
-	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=, $6=, $pop45
-	i32.store	12($7), $pop44
+	i32.const	$push40=, 1
+	i32.add 	$0=, $pop3, $pop40
+	i32.store	0($3), $0
+	i32.const	$push39=, 63
+	i32.add 	$push4=, $5, $pop39
+	i32.const	$push38=, -64
+	i32.and 	$6=, $pop4, $pop38
+	i32.store	12($7), $6
 	i32.load	$4=, 16($7)
-	i32.const	$push43=, 2
-	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=, 4
+	i32.const	$push37=, 2
+	i32.eq  	$push5=, $0, $pop37
+	br_if   	1, $pop5        # 1: down to label3
+	br      	2               # 2: down to label2
+.LBB1_6:                                #   in Loop: Header=BB1_1 Depth=1
+	end_block                       # label4:
+	i32.const	$8=, 2
 	br      	2               # 2: down to label1
 .LBB1_7:                                #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label3:
-	i32.const	$8=, 2
+	i32.const	$8=, 4
 	br      	1               # 1: down to label1
 .LBB1_8:                                #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label2:
@@ -143,7 +141,8 @@ foobar:                                 # @foobar
 .LBB1_9:                                #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	end_block                       # label1:
-	loop    	                # label7:
+	block   	
+	loop    	                # label9:
 	block   	
 	block   	
 	block   	
@@ -156,18 +155,72 @@ foobar:                                 # @foobar
 	block   	
 	block   	
 	block   	
-	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
+	br_table 	$8, 2, 5, 13, 3, 4, 0, 1, 1 # 2: down to label19
+                                        # 5: down to label16
+                                        # 13: down to label8
+                                        # 3: down to label18
+                                        # 4: down to label17
+                                        # 0: down to label21
+                                        # 1: down to label20
+.LBB1_10:                               # %if.end25.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label21:
+	i32.load	$push10=, 8($4)
+	i32.const	$push43=, 7
+	i32.shl 	$6=, $pop10, $pop43
+	i32.const	$0=, 0
+	i32.const	$push42=, 0
+	i32.const	$push41=, 2
+	i32.eq  	$push6=, $pop42, $pop41
+	br_if   	9, $pop6        # 9: down to label11
+# %bb.11:                               #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 6
+	br      	11              # 11: up to label9
+.LBB1_12:                               # %while.body9.i.preheader
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label20:
+	i32.const	$push45=, 2
+	i32.shl 	$push7=, $0, $pop45
+	i32.add 	$push8=, $4, $pop7
+	i32.const	$push44=, 12
+	i32.add 	$5=, $pop8, $pop44
+# %bb.13:                               #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 0
+	br      	10              # 10: up to label9
+.LBB1_14:                               # %while.body9.i
                                         #   in Loop: Header=BB1_9 Depth=2
 	end_block                       # label19:
+	i32.load	$1=, 0($5)
+	br_if   	4, $1           # 4: down to label14
+# %bb.15:                               #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 3
+	br      	9               # 9: up to label9
+.LBB1_16:                               # %if.end17.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label18:
+	i32.const	$push49=, 4
+	i32.add 	$5=, $5, $pop49
+	i32.const	$push48=, 64
+	i32.add 	$6=, $6, $pop48
+	i32.const	$push47=, 1
+	i32.add 	$0=, $0, $pop47
+	i32.const	$push46=, 2
+	i32.ne  	$push9=, $0, $pop46
+	br_if   	4, $pop9        # 4: down to label13
+# %bb.17:                               #   in Loop: Header=BB1_9 Depth=2
+	i32.const	$8=, 4
+	br      	8               # 8: up to label9
+.LBB1_18:                               # %while.end21.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label17:
+	i32.load	$4=, 0($4)
+	br_if   	6, $4           # 6: down to label10
+	br      	1               # 1: down to label15
+.LBB1_19:                               # %if.then15.i
+                                        #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label16:
 	i32.store	0($2), $1
-	i32.store	0($3), $5
+	i32.store	0($3), $0
 	i32.store	12($7), $6
 	i32.store	16($7), $4
 	i32.const	$push24=, 16
@@ -175,104 +228,48 @@ foobar:                                 # @foobar
 	i32.const	$push26=, 12
 	i32.add 	$push27=, $7, $pop26
 	call    	bmp_iter_set_tail@FUNCTION, $pop25, $pop27
-	i32.load	$0=, 12($7)
-# 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
+	i32.load	$5=, 12($7)
+	br      	3               # 3: down to label12
+.LBB1_20:                               # %for.end
 	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                       # label11:
+.LBB1_21:                               #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label14:
 	i32.const	$8=, 1
-	br      	3               # 3: up to label7
+	br      	4               # 4: up to label9
+.LBB1_22:                               #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label13:
+	i32.const	$8=, 0
+	br      	3               # 3: up to label9
+.LBB1_23:                               #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label12:
+	i32.const	$8=, 2
+	br      	2               # 2: up to label9
 .LBB1_24:                               #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label10:
+	end_block                       # label11:
 	i32.const	$8=, 4
-	br      	2               # 2: up to label7
+	br      	1               # 1: up to label9
 .LBB1_25:                               #   in Loop: Header=BB1_9 Depth=2
-	end_block                       # label9:
-	i32.const	$8=, 0
-	br      	1               # 1: up to label7
-.LBB1_26:                               #   in Loop: Header=BB1_9 Depth=2
+	end_block                       # label10:
+	i32.const	$8=, 5
+	br      	0               # 0: up to label9
+.LBB1_26:                               # %for.body
+                                        #   in Loop: Header=BB1_1 Depth=1
+	end_loop
 	end_block                       # label8:
-	i32.const	$8=, 4
-	br      	0               # 0: up to label7
+	call    	catchme@FUNCTION, $5
+	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_27:
 	end_loop
-	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	foobar, .Lfunc_end1-foobar
@@ -282,25 +279,23 @@ foobar:                                 # @foobar
 bmp_iter_set_init:                      # @bmp_iter_set_init
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.store	4($0), $pop7
-	i32.load	$push6=, 0($1)
-	tee_local	$push5=, $1=, $pop6
-	i32.store	0($0), $pop5
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.store	4($0), $pop5
+	i32.load	$1=, 0($1)
+	i32.store	0($0), $1
 	block   	
-	br_if   	0, $1           # 0: down to label20
-# BB#1:                                 # %if.then
+	br_if   	0, $1           # 0: down to label22
+# %bb.1:                                # %if.then
 	i32.const	$1=, bitmap_zero_bits
-	i32.const	$push8=, bitmap_zero_bits
-	i32.store	0($0), $pop8
+	i32.const	$push6=, bitmap_zero_bits
+	i32.store	0($0), $pop6
 .LBB2_2:                                # %while.end
-	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
+	end_block                       # label22:
+	i32.const	$push7=, 0
+	i32.store	8($0), $pop7
+	i32.load	$3=, 12($1)
+	i32.store	12($0), $3
 	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.shl 	$push2=, $pop0, $pop1
@@ -316,17 +311,17 @@ bmp_iter_set_init:                      # @bmp_iter_set_init
 	.type	catchme,@function       # -- Begin function catchme
 catchme:                                # @catchme
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 64
 	i32.or  	$push1=, $0, $pop0
 	i32.const	$push3=, 64
 	i32.ne  	$push2=, $pop1, $pop3
-	br_if   	0, $pop2        # 0: down to label21
-# BB#1:                                 # %if.end
+	br_if   	0, $pop2        # 0: down to label23
+# %bb.1:                                # %if.end
 	return
 .LBB3_2:                                # %if.then
-	end_block                       # label21:
+	end_block                       # label23:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -337,7 +332,7 @@ catchme:                                # @catchme
 	.type	bmp_iter_next,@function # -- Begin function bmp_iter_next
 bmp_iter_next:                          # @bmp_iter_next
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 12($0)
 	i32.const	$push1=, 1
 	i32.shr_u	$push2=, $pop0, $pop1
@@ -355,36 +350,35 @@ bmp_iter_next:                          # @bmp_iter_next
 	.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
-# BB#0:                                 # %entry
+	.local  	i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.load	$5=, 12($0)
 	block   	
-	i32.load	$push6=, 12($0)
-	tee_local	$push5=, $3=, $pop6
-	i32.const	$push4=, 1
-	i32.and 	$push0=, $pop5, $pop4
-	br_if   	0, $pop0        # 0: down to label22
-# BB#1:                                 # %while.body.lr.ph
-	i32.load	$2=, 0($1)
+	i32.const	$push3=, 1
+	i32.and 	$push0=, $5, $pop3
+	br_if   	0, $pop0        # 0: down to label24
+# %bb.1:                                # %while.body.lr.ph
+	i32.load	$4=, 0($1)
 .LBB5_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label23:
-	i32.const	$push11=, 1
-	i32.add 	$2=, $2, $pop11
-	i32.const	$push10=, 1
-	i32.shr_u	$push9=, $3, $pop10
-	tee_local	$push8=, $3=, $pop9
-	i32.const	$push7=, 1
-	i32.and 	$push1=, $pop8, $pop7
-	i32.eqz 	$push12=, $pop1
-	br_if   	0, $pop12       # 0: up to label23
-# BB#3:                                 # %while.cond.while.end_crit_edge
+	loop    	                # label25:
+	i32.const	$push6=, 1
+	i32.add 	$4=, $4, $pop6
+	i32.const	$push5=, 1
+	i32.shr_u	$2=, $5, $pop5
+	i32.const	$push4=, 2
+	i32.and 	$3=, $5, $pop4
+	copy_local	$5=, $2
+	i32.eqz 	$push7=, $3
+	br_if   	0, $pop7        # 0: up to label25
+# %bb.3:                                # %while.cond.while.end_crit_edge
 	end_loop
-	i32.store	0($1), $2
-	i32.const	$push2=, 12
-	i32.add 	$push3=, $0, $pop2
-	i32.store	0($pop3), $3
+	i32.store	0($1), $4
+	i32.const	$push1=, 12
+	i32.add 	$push2=, $0, $pop1
+	i32.store	0($pop2), $2
 .LBB5_4:                                # %while.end
-	end_block                       # label22:
+	end_block                       # label24:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -411,5 +405,5 @@ bitmap_zero_bits:
 	.size	bitmap_zero_bits, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20090113-3.c.s b/test/torture-s/20090113-3.c.s
index 1628a4bfe..41add8808 100644
--- a/test/torture-s/20090113-3.c.s
+++ b/test/torture-s/20090113-3.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $0
 	i32.const	$push2=, 40
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -53,33 +52,31 @@ main:                                   # @main
 	.type	foobar,@function        # -- Begin function foobar
 foobar:                                 # @foobar
 	.param  	i32
-	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+	.local  	i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 32
+	i32.sub 	$5=, $pop6, $pop8
 	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)
+	i32.store	__stack_pointer($pop9), $5
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $5, $pop13
+	i32.const	$push15=, 12
+	i32.add 	$push16=, $5, $pop15
+	call    	bmp_iter_set_init@FUNCTION, $pop14, $0, $pop16
+	i32.load	$1=, 16($5)
+	i32.load	$2=, 24($5)
+	i32.load	$0=, 28($5)
 	block   	
 	block   	
-	i32.load	$push20=, 28($4)
-	tee_local	$push19=, $0=, $pop20
-	br_if   	0, $pop19       # 0: down to label1
-# BB#1:
-	i32.const	$5=, 2
+	br_if   	0, $0           # 0: down to label1
+# %bb.1:
+	i32.const	$6=, 2
 	br      	1               # 1: down to label0
 .LBB1_2:
 	end_block                       # label1:
-	i32.const	$5=, 0
+	i32.const	$6=, 0
 .LBB1_3:                                # =>This Inner Loop Header: Depth=1
 	end_block                       # label0:
 	loop    	                # label2:
@@ -107,184 +104,204 @@ foobar:                                 # @foobar
 	block   	
 	block   	
 	block   	
-	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
+	block   	
+	block   	
+	block   	
+	br_table 	$6, 1, 0, 4, 5, 6, 7, 10, 11, 12, 8, 9, 13, 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
+                                        # 10: down to label19
+                                        # 11: down to label18
+                                        # 12: down to label17
+                                        # 8: down to label21
+                                        # 9: down to label20
+                                        # 13: down to label16
+                                        # 2: down to label27
+                                        # 3: down to label26
 .LBB1_4:                                # %for.inc
                                         #   in Loop: Header=BB1_3 Depth=1
-	end_block                       # label26:
-	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
+	end_block                       # label29:
+	i32.const	$push17=, 1
+	i32.shr_u	$0=, $0, $pop17
+	i32.eqz 	$push33=, $0
+	br_if   	13, $pop33      # 13: down to label15
+# %bb.5:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 0
+	br      	26              # 26: up to label2
 .LBB1_6:                                # %if.then.i
                                         #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label28:
+	i32.const	$push18=, 1
+	i32.and 	$push0=, $0, $pop18
+	br_if   	14, $pop0       # 14: down to label13
+# %bb.7:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 12
+	br      	25              # 25: up to label2
+.LBB1_8:                                # %while.body.i
+                                        #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label27:
+	i32.const	$push20=, 1
+	i32.shr_u	$4=, $0, $pop20
+	i32.const	$push19=, 2
+	i32.and 	$3=, $0, $pop19
+	copy_local	$0=, $4
+	i32.eqz 	$push34=, $3
+	br_if   	23, $pop34      # 23: down to label3
+# %bb.9:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 13
+	br      	24              # 24: up to label2
+.LBB1_10:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label26:
+	copy_local	$0=, $4
+	br      	11              # 11: down to label14
+.LBB1_11:                               # %if.end.i
+                                        #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label25:
-	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
+	i32.const	$push21=, 1
+	i32.add 	$2=, $2, $pop21
+# %bb.12:                               #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 3
 	br      	22              # 22: up to label2
-.LBB1_8:                                # %while.body.i
+.LBB1_13:                               # %while.body6.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label24:
-	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
+	i32.const	$push22=, 2
+	i32.eq  	$push1=, $2, $pop22
+	br_if   	16, $pop1       # 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
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label23:
-	i32.const	$push31=, 1
-	i32.add 	$2=, $2, $pop31
-# BB#10:                                #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$5=, 3
+	i32.const	$push24=, 2
+	i32.shl 	$push2=, $2, $pop24
+	i32.add 	$push3=, $1, $pop2
+	i32.const	$push23=, 12
+	i32.add 	$4=, $pop3, $pop23
+# %bb.16:                               #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 5
 	br      	20              # 20: up to label2
-.LBB1_11:                               # %while.body6.i
+.LBB1_17:                               # %while.body9.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label22:
-	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
+	i32.load	$0=, 0($4)
+	br_if   	16, $0          # 16: down to label5
+# %bb.18:                               #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 9
 	br      	19              # 19: up to label2
-.LBB1_13:                               # %while.body9.i.preheader
+.LBB1_19:                               # %if.end26.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label21:
-	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
+	i32.const	$push27=, 4
+	i32.add 	$4=, $4, $pop27
+	i32.const	$push26=, 1
+	i32.add 	$2=, $2, $pop26
+	i32.const	$push25=, 2
+	i32.ne  	$push5=, $2, $pop25
+	br_if   	14, $pop5       # 14: down to label6
+# %bb.20:                               #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 10
 	br      	18              # 18: up to label2
-.LBB1_15:                               # %while.body9.i
+.LBB1_21:                               # %while.end30.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label20:
-	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_17:                               # %if.end26.i
+	i32.load	$1=, 0($1)
+	i32.const	$2=, 0
+	br_if   	11, $1          # 11: down to label8
+	br      	10              # 10: down to label9
+.LBB1_22:                               # %if.then15.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label19:
-	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
+	i32.const	$push28=, 1
+	i32.and 	$push4=, $0, $pop28
+	br_if   	8, $pop4        # 8: down to label10
+# %bb.23:                               #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 7
 	br      	16              # 16: up to label2
-.LBB1_19:                               # %while.end30.i
+.LBB1_24:                               # %while.body21.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label18:
-	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
+	i32.const	$push30=, 1
+	i32.shr_u	$4=, $0, $pop30
+	i32.const	$push29=, 2
+	i32.and 	$3=, $0, $pop29
+	copy_local	$0=, $4
+	i32.eqz 	$push35=, $3
+	br_if   	13, $pop35      # 13: down to label4
+# %bb.25:                               #   in Loop: Header=BB1_3 Depth=1
+	i32.const	$6=, 8
+	br      	15              # 15: up to label2
+.LBB1_26:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label17:
-	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_22:                               # %while.body21.i
-                                        #   in Loop: Header=BB1_3 Depth=1
+	copy_local	$push32=, $4
+	i32.const	$push31=, 1
+	i32.shr_u	$0=, $pop32, $pop31
+	br_if   	5, $0           # 5: down to label11
+	br      	4               # 4: down to label12
+.LBB1_27:                               # %for.end
 	end_block                       # label16:
-	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	$push14=, 0
-	i32.const	$push12=, 32
-	i32.add 	$push13=, $4, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.const	$push12=, 0
+	i32.const	$push10=, 32
+	i32.add 	$push11=, $5, $pop10
+	i32.store	__stack_pointer($pop12), $pop11
 	return
-.LBB1_24:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_28:                               #   in Loop: Header=BB1_3 Depth=1
+	end_block                       # label15:
+	i32.const	$6=, 2
+	br      	12              # 12: up to label2
+.LBB1_29:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label14:
-	i32.const	$5=, 2
+	i32.const	$6=, 1
 	br      	11              # 11: up to label2
-.LBB1_25:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_30:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label13:
-	i32.const	$5=, 11
+	i32.const	$6=, 1
 	br      	10              # 10: up to label2
-.LBB1_26:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_31:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label12:
-	i32.const	$5=, 1
+	i32.const	$6=, 2
 	br      	9               # 9: up to label2
-.LBB1_27:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_32:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label11:
-	i32.const	$5=, 1
+	i32.const	$6=, 0
 	br      	8               # 8: up to label2
-.LBB1_28:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_33:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label10:
-	i32.const	$5=, 1
+	i32.const	$6=, 1
 	br      	7               # 7: up to label2
-.LBB1_29:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_34:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label9:
-	i32.const	$5=, 7
+	i32.const	$6=, 11
 	br      	6               # 6: up to label2
-.LBB1_30:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_35:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label8:
-	i32.const	$5=, 1
+	i32.const	$6=, 3
 	br      	5               # 5: up to label2
-.LBB1_31:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_36:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label7:
-	i32.const	$5=, 10
+	i32.const	$6=, 10
 	br      	4               # 4: up to label2
-.LBB1_32:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_37:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label6:
-	i32.const	$5=, 3
+	i32.const	$6=, 5
 	br      	3               # 3: up to label2
-.LBB1_33:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_38:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label5:
-	i32.const	$5=, 9
+	i32.const	$6=, 6
 	br      	2               # 2: up to label2
-.LBB1_34:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_39:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label4:
-	i32.const	$5=, 5
+	i32.const	$6=, 7
 	br      	1               # 1: up to label2
-.LBB1_35:                               #   in Loop: Header=BB1_3 Depth=1
+.LBB1_40:                               #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label3:
-	i32.const	$5=, 6
+	i32.const	$6=, 12
 	br      	0               # 0: up to label2
-.LBB1_36:
+.LBB1_41:
 	end_loop
 	.endfunc
 .Lfunc_end1:
@@ -295,25 +312,23 @@ foobar:                                 # @foobar
 bmp_iter_set_init:                      # @bmp_iter_set_init
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.store	4($0), $pop7
-	i32.load	$push6=, 0($1)
-	tee_local	$push5=, $1=, $pop6
-	i32.store	0($0), $pop5
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.store	4($0), $pop5
+	i32.load	$1=, 0($1)
+	i32.store	0($0), $1
 	block   	
-	br_if   	0, $1           # 0: down to label27
-# BB#1:                                 # %if.then
+	br_if   	0, $1           # 0: down to label30
+# %bb.1:                                # %if.then
 	i32.const	$1=, bitmap_zero_bits
-	i32.const	$push8=, bitmap_zero_bits
-	i32.store	0($0), $pop8
+	i32.const	$push6=, bitmap_zero_bits
+	i32.store	0($0), $pop6
 .LBB2_2:                                # %while.end
-	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
+	end_block                       # label30:
+	i32.const	$push7=, 0
+	i32.store	8($0), $pop7
+	i32.load	$3=, 12($1)
+	i32.store	12($0), $3
 	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.shl 	$push2=, $pop0, $pop1
@@ -346,4 +361,4 @@ bitmap_zero_bits:
 	.size	bitmap_zero_bits, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20090207-1.c.s b/test/torture-s/20090207-1.c.s
index 87449e8d5..bd696e5f9 100644
--- a/test/torture-s/20090207-1.c.s
+++ b/test/torture-s/20090207-1.c.s
@@ -8,14 +8,13 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 128
-	i32.sub 	$push10=, $pop5, $pop7
-	tee_local	$push9=, $1=, $pop10
+	i32.sub 	$1=, $pop5, $pop7
 	i64.const	$push0=, 12884901889
-	i64.store	0($pop9), $pop0
+	i64.store	0($1), $pop0
 	i32.const	$push1=, 2
 	i32.shl 	$push2=, $0, $pop1
 	i32.add 	$push3=, $1, $pop2
@@ -33,7 +32,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -41,4 +40,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20090527-1.c.s b/test/torture-s/20090527-1.c.s
index cea569e99..4155c4482 100644
--- a/test/torture-s/20090527-1.c.s
+++ b/test/torture-s/20090527-1.c.s
@@ -7,34 +7,33 @@
 new_unit:                               # @new_unit
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 4($0)
 	block   	
-	i32.load	$push8=, 4($0)
-	tee_local	$push7=, $1=, $pop8
 	i32.const	$push6=, 1
-	i32.ne  	$push0=, $pop7, $pop6
+	i32.ne  	$push0=, $1, $pop6
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$1=, 0
 	i32.const	$push1=, 4
 	i32.add 	$push2=, $0, $pop1
-	i32.const	$push9=, 0
-	i32.store	0($pop2), $pop9
+	i32.const	$push7=, 0
+	i32.store	0($pop2), $pop7
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	block   	
 	i32.load	$push3=, 0($0)
-	i32.const	$push10=, 1
-	i32.ne  	$push4=, $pop3, $pop10
+	i32.const	$push8=, 1
+	i32.ne  	$push4=, $pop3, $pop8
 	br_if   	0, $pop4        # 0: down to label1
-# BB#3:                                 # %if.then3
+# %bb.3:                                # %if.then3
 	i32.const	$push5=, 0
 	i32.store	0($0), $pop5
 .LBB0_4:                                # %if.end5
 	end_block                       # label1:
 	block   	
 	br_if   	0, $1           # 0: down to label2
-# BB#5:                                 # %sw.epilog
+# %bb.5:                                # %sw.epilog
 	return
 .LBB0_6:                                # %sw.default
 	end_block                       # label2:
@@ -50,7 +49,7 @@ new_unit:                               # @new_unit
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %new_unit.exit
+# %bb.0:                                # %new_unit.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -58,5 +57,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20090623-1.c.s b/test/torture-s/20090623-1.c.s
index c63361425..0b4583cda 100644
--- a/test/torture-s/20090623-1.c.s
+++ b/test/torture-s/20090623-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, x($pop0)
 	i32.store	0($pop1), $0
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
@@ -48,4 +48,4 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20090711-1.c.s b/test/torture-s/20090711-1.c.s
index 2f5c32bbe..4ed5fded7 100644
--- a/test/torture-s/20090711-1.c.s
+++ b/test/torture-s/20090711-1.c.s
@@ -7,7 +7,7 @@
 div:                                    # @div
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 32768
 	i64.div_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,14 +21,14 @@ div:                                    # @div
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, -990000000
 	i64.call	$push1=, div@FUNCTION, $pop0
 	i64.const	$push2=, -30212
 	i64.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -40,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20090814-1.c.s b/test/torture-s/20090814-1.c.s
index 77200bbb3..199632d50 100644
--- a/test/torture-s/20090814-1.c.s
+++ b/test/torture-s/20090814-1.c.s
@@ -7,7 +7,7 @@
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0)
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, i($pop0)
 	i32.const	$push2=, 2
@@ -39,7 +39,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.const	$push0=, 1
 	i32.store	i($pop7), $pop0
@@ -52,7 +52,7 @@ main:                                   # @main
 	i32.const	$push4=, 42
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB2_2:                                # %if.then
@@ -82,5 +82,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20091229-1.c.s b/test/torture-s/20091229-1.c.s
index d0ddd4b57..651530688 100644
--- a/test/torture-s/20091229-1.c.s
+++ b/test/torture-s/20091229-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -2147483648
 	i64.div_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.globl	main
 	.type	main,@function
 main:                                   # @main
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/20100209-1.c.s b/test/torture-s/20100209-1.c.s
index 8308a1ebe..4536c0036 100644
--- a/test/torture-s/20100209-1.c.s
+++ b/test/torture-s/20100209-1.c.s
@@ -7,7 +7,7 @@
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20100316-1.c.s b/test/torture-s/20100316-1.c.s
index 1544870cb..cf9a4de6c 100644
--- a/test/torture-s/20100316-1.c.s
+++ b/test/torture-s/20100316-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$push0=, 4($0)
 	i32.const	$push1=, 1023
 	i32.and 	$push2=, $pop0, $pop1
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.const	$push0=, -1
 	i32.store	f($pop10), $pop0
@@ -38,7 +38,7 @@ main:                                   # @main
 	i32.const	$push6=, f
 	i32.call	$push7=, foo@FUNCTION, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push11=, 0
 	return  	$pop11
 .LBB1_2:                                # %if.then
@@ -59,5 +59,5 @@ f:
 	.size	f, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20100416-1.c.s b/test/torture-s/20100416-1.c.s
index 06cf4e7cc..6e61d62da 100644
--- a/test/torture-s/20100416-1.c.s
+++ b/test/torture-s/20100416-1.c.s
@@ -7,7 +7,7 @@
 movegt:                                 # @movegt
 	.param  	i32, i32, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -1152921504606846977
 	i64.gt_s	$push1=, $2, $pop0
 	i32.select	$push2=, $0, $1, $pop1
@@ -26,7 +26,7 @@ movegt:                                 # @movegt
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push32=, -1
 	i32.const	$push31=, 1
@@ -39,7 +39,7 @@ main:                                   # @main
 	i32.load	$push3=, tests+8($pop28)
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %for.cond
+# %bb.1:                                # %for.cond
 	i32.const	$push37=, -1
 	i32.const	$push36=, 1
 	i32.const	$push35=, 0
@@ -51,7 +51,7 @@ main:                                   # @main
 	i32.load	$push8=, tests+24($pop33)
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %for.cond.1
+# %bb.2:                                # %for.cond.1
 	i32.const	$push42=, -1
 	i32.const	$push41=, 1
 	i32.const	$push40=, 0
@@ -63,7 +63,7 @@ main:                                   # @main
 	i32.load	$push13=, tests+40($pop38)
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#3:                                 # %for.cond.2
+# %bb.3:                                # %for.cond.2
 	i32.const	$push47=, -1
 	i32.const	$push46=, 1
 	i32.const	$push45=, 0
@@ -75,7 +75,7 @@ main:                                   # @main
 	i32.load	$push18=, tests+56($pop43)
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#4:                                 # %for.cond.3
+# %bb.4:                                # %for.cond.3
 	i32.const	$push24=, -1
 	i32.const	$push23=, 1
 	i32.const	$push49=, 0
@@ -87,7 +87,7 @@ main:                                   # @main
 	i32.load	$push26=, tests+72($pop48)
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#5:                                 # %for.cond.4
+# %bb.5:                                # %for.cond.4
 	i32.const	$push50=, 0
 	return  	$pop50
 .LBB1_6:                                # %if.then
@@ -122,5 +122,5 @@ tests:
 	.size	tests, 80
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20100430-1.c.s b/test/torture-s/20100430-1.c.s
index 7b0de98c5..044548902 100644
--- a/test/torture-s/20100430-1.c.s
+++ b/test/torture-s/20100430-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20100708-1.c.s b/test/torture-s/20100708-1.c.s
index 50fd2d313..231cc0dc6 100644
--- a/test/torture-s/20100708-1.c.s
+++ b/test/torture-s/20100708-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push3=, 0
@@ -24,14 +24,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 208
-	i32.sub 	$push11=, $pop1, $pop3
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop4), $pop10
+	i32.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push8=, 8
 	i32.add 	$push9=, $0, $pop8
 	call    	f@FUNCTION, $pop9
@@ -46,4 +45,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20100805-1.c.s b/test/torture-s/20100805-1.c.s
index 81f80cac0..24870ed75 100644
--- a/test/torture-s/20100805-1.c.s
+++ b/test/torture-s/20100805-1.c.s
@@ -7,27 +7,26 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.and 	$0=, $0, $pop0
 	block   	
-	i32.eqz 	$push5=, $1
-	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push3=, $1
+	br_if   	0, $pop3        # 0: down to label0
+# %bb.1:                                # %for.body.preheader
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push4=, 1
-	i32.rotl	$0=, $0, $pop4
-	i32.const	$push3=, -1
-	i32.add 	$push2=, $1, $pop3
-	tee_local	$push1=, $1=, $pop2
-	br_if   	0, $pop1        # 0: up to label1
+	i32.const	$push2=, -1
+	i32.add 	$1=, $1, $pop2
+	i32.const	$push1=, 1
+	i32.rotl	$0=, $0, $pop1
+	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -38,7 +37,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -46,4 +45,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20100827-1.c.s b/test/torture-s/20100827-1.c.s
index b33075c97..eb907a469 100644
--- a/test/torture-s/20100827-1.c.s
+++ b/test/torture-s/20100827-1.c.s
@@ -7,41 +7,32 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	block   	
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($0)
-	i32.eqz 	$push8=, $pop0
-	br_if   	0, $pop8        # 0: down to label1
-# BB#1:                                 # %if.end.preheader
-	i32.const	$2=, 0
-.LBB0_2:                                # %if.end
+	i32.eqz 	$push5=, $pop0
+	br_if   	0, $pop5        # 0: down to label0
+# %bb.1:                                # %if.end5.preheader
+	i32.const	$push3=, 1
+	i32.add 	$1=, $0, $pop3
+	i32.const	$0=, 0
+.LBB0_2:                                # %if.end5
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label2:
-	i32.add 	$push5=, $0, $2
-	tee_local	$push4=, $1=, $pop5
-	i32.eqz 	$push9=, $pop4
-	br_if   	2, $pop9        # 2: down to label0
-# BB#3:                                 # %if.end5
-                                        #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push7=, 1
-	i32.add 	$2=, $2, $pop7
-	i32.const	$push6=, 1
-	i32.add 	$push1=, $1, $pop6
-	i32.load8_u	$push2=, 0($pop1)
-	br_if   	0, $pop2        # 0: up to label2
-# BB#4:                                 # %do.end
+	loop    	                # label1:
+	i32.const	$push4=, 1
+	i32.add 	$3=, $0, $pop4
+	i32.add 	$2=, $1, $0
+	copy_local	$0=, $3
+	i32.load8_u	$push1=, 0($2)
+	br_if   	0, $pop1        # 0: up to label1
+# %bb.3:                                # %do.end
 	end_loop
-	return  	$2
-.LBB0_5:
-	end_block                       # label1:
-	i32.const	$push3=, 0
-	return  	$pop3
-.LBB0_6:                                # %if.then4
+	return  	$3
+.LBB0_4:
 	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+	i32.const	$push2=, 0
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -52,18 +43,18 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
-	br_if   	0, $pop3        # 0: down to label3
-# BB#1:                                 # %if.end
+	br_if   	0, $pop3        # 0: down to label2
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
-	end_block                       # label3:
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -77,5 +68,5 @@ main:                                   # @main
 	.size	.L.str, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20101011-1.c.s b/test/torture-s/20101011-1.c.s
index 8ed79eb99..103ff2d04 100644
--- a/test/torture-s/20101011-1.c.s
+++ b/test/torture-s/20101011-1.c.s
@@ -6,7 +6,7 @@
 	.type	sigfpe,@function
 sigfpe:                                 # @sigfpe
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ sigfpe:                                 # @sigfpe
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 8
 	i32.const	$push0=, sigfpe@FUNCTION
 	i32.call	$drop=, signal@FUNCTION, $pop1, $pop0
@@ -40,7 +40,7 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f1b345ff4..bb4a46825 100644
--- a/test/torture-s/20101013-1.c.s
+++ b/test/torture-s/20101013-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	build_ref_for_offset@FUNCTION
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
@@ -18,14 +18,13 @@ main:                                   # @main
 	.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
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push13=, $pop3, $pop5
-	tee_local	$push12=, $0=, $pop13
-	i32.store	__stack_pointer($pop6), $pop12
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push10=, 8
 	i32.add 	$push11=, $0, $pop10
 	call    	get_addr_base_and_unit_offset@FUNCTION, $pop11
@@ -46,7 +45,7 @@ build_ref_for_offset:                   # @build_ref_for_offset
 	.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
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	0($0), $pop0
                                         # fallthrough-return
@@ -58,12 +57,12 @@ get_addr_base_and_unit_offset:          # @get_addr_base_and_unit_offset
 	.type	build_int_cst,@function # -- Begin function build_int_cst
 build_int_cst:                          # @build_int_cst
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 4
 	i64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB3_2:                                # %if.then
 	end_block                       # label0:
@@ -74,5 +73,5 @@ build_int_cst:                          # @build_int_cst
 	.size	build_int_cst, .Lfunc_end3-build_int_cst
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20101025-1.c.s b/test/torture-s/20101025-1.c.s
index f2a2a8ce5..37f3faebd 100644
--- a/test/torture-s/20101025-1.c.s
+++ b/test/torture-s/20101025-1.c.s
@@ -6,7 +6,7 @@
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	g_3($pop0), $0
                                         # fallthrough-return
@@ -20,7 +20,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, g_6($pop0)
 	i32.const	$push2=, 1
@@ -40,7 +40,7 @@ f3:                                     # @f3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f3@FUNCTION
 	block   	
 	i32.const	$push3=, 0
@@ -48,7 +48,7 @@ main:                                   # @main
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -84,6 +84,6 @@ g_7:
 	.size	g_7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b318fd551..63e3f48de 100644
--- a/test/torture-s/20111208-1.c.s
+++ b/test/torture-s/20111208-1.c.s
@@ -8,40 +8,37 @@ pack_unpack:                            # @pack_unpack
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.call	$3=, strlen@FUNCTION, $1
 	block   	
-	i32.call	$push10=, strlen@FUNCTION, $1
-	tee_local	$push9=, $3=, $pop10
 	i32.const	$push8=, 1
-	i32.lt_s	$push0=, $pop9, $pop8
+	i32.lt_s	$push0=, $3, $pop8
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# %bb.1:                                # %while.body.preheader
 	i32.add 	$2=, $1, $3
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	copy_local	$push16=, $1
-	tee_local	$push15=, $3=, $pop16
-	i32.const	$push14=, 1
-	i32.add 	$1=, $pop15, $pop14
+	copy_local	$3=, $1
+	i32.const	$push10=, 1
+	i32.add 	$1=, $3, $pop10
+	i32.load8_s	$3=, 0($3)
 	block   	
-	i32.load8_s	$push13=, 0($3)
-	tee_local	$push12=, $3=, $pop13
-	i32.const	$push11=, 108
-	i32.eq  	$push1=, $pop12, $pop11
+	i32.const	$push9=, 108
+	i32.eq  	$push1=, $3, $pop9
 	br_if   	0, $pop1        # 0: down to label2
-# BB#3:                                 # %while.body
+# %bb.3:                                # %while.body
                                         #   in Loop: Header=BB0_2 Depth=1
 	block   	
-	i32.const	$push17=, 115
-	i32.ne  	$push2=, $3, $pop17
+	i32.const	$push11=, 115
+	i32.ne  	$push2=, $3, $pop11
 	br_if   	0, $pop2        # 0: down to label3
-# BB#4:                                 # %sw.bb4
+# %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
+	i32.const	$push12=, 2
+	i32.add 	$0=, $0, $pop12
 .LBB0_5:                                # %sw.epilog13
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
@@ -53,8 +50,8 @@ pack_unpack:                            # @pack_unpack
 	end_block                       # label2:
 	i32.load	$push3=, 0($0):p2align=0
 	call    	do_something@FUNCTION, $pop3
-	i32.const	$push19=, 4
-	i32.add 	$0=, $0, $pop19
+	i32.const	$push13=, 4
+	i32.add 	$0=, $0, $pop13
 	i32.lt_u	$push5=, $1, $2
 	br_if   	0, $pop5        # 0: up to label1
 .LBB0_7:                                # %while.end
@@ -70,7 +67,7 @@ pack_unpack:                            # @pack_unpack
 	.type	do_something,@function  # -- Begin function do_something
 do_something:                           # @do_something
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	a($pop0), $0
                                         # fallthrough-return
@@ -84,7 +81,7 @@ do_something:                           # @do_something
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 384
 	call    	do_something@FUNCTION, $pop0
 	i32.const	$push1=, -1071776001
@@ -105,5 +102,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	strlen, i32, i32
diff --git a/test/torture-s/20111212-1.c.s b/test/torture-s/20111212-1.c.s
index 24fd4e49b..0650e572f 100644
--- a/test/torture-s/20111212-1.c.s
+++ b/test/torture-s/20111212-1.c.s
@@ -6,13 +6,13 @@
 	.type	frob_entry,@function
 frob_entry:                             # @frob_entry
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0):p2align=0
 	i32.const	$push1=, 63
 	i32.gt_u	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push3=, -1
 	i32.store	0($0):p2align=0, $pop3
 .LBB0_2:                                # %if.end
@@ -29,14 +29,13 @@ frob_entry:                             # @frob_entry
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop4, $pop6
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop7), $pop13
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push0=, 0
 	i64.store	8($0), $pop0
 	i32.const	$push11=, 8
@@ -55,4 +54,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20111227-1.c.s b/test/torture-s/20111227-1.c.s
index 9ef6a5c02..56477ba32 100644
--- a/test/torture-s/20111227-1.c.s
+++ b/test/torture-s/20111227-1.c.s
@@ -6,12 +6,12 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,12 +27,12 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$0=, 0($0)
 	block   	
 	i32.eqz 	$push4=, $1
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	bar@FUNCTION, $0
 	return
 .LBB1_2:                                # %if.else
@@ -53,7 +53,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, v
 	i32.const	$push0=, 0
 	call    	foo@FUNCTION, $pop1, $pop0
@@ -73,5 +73,5 @@ v:
 	.size	v, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20111227-2.c.s b/test/torture-s/20111227-2.c.s
index ac4fedd19..0312b2f0a 100644
--- a/test/torture-s/20111227-2.c.s
+++ b/test/torture-s/20111227-2.c.s
@@ -6,13 +6,13 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push1=, 2
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push16=, 0
 	i32.load16_u	$push0=, s($pop16)
 	i32.const	$push3=, 65535
@@ -26,7 +26,7 @@ bar:                                    # @bar
 	i32.const	$push8=, 1
 	i32.ne  	$push9=, $0, $pop8
 	br_if   	0, $pop9        # 0: down to label2
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push17=, 0
 	i32.load	$push7=, i($pop17)
 	i32.const	$push10=, 255
@@ -36,7 +36,7 @@ bar:                                    # @bar
 	end_block                       # label2:
 	block   	
 	br_if   	0, $0           # 0: down to label3
-# BB#5:                                 # %if.end9
+# %bb.5:                                # %if.end9
 	i32.const	$push13=, 0
 	i32.load	$push12=, l($pop13)
 	i32.const	$push14=, 255
@@ -60,7 +60,7 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load8_u	$2=, v($pop6)
 	block   	
@@ -68,15 +68,15 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push8=, $1
 	br_if   	0, $pop8        # 0: down to label6
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push0=, 1
 	i32.eq  	$push1=, $1, $pop0
 	br_if   	2, $pop1        # 2: down to label4
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	1, $pop3        # 1: down to label5
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
 	i32.const	$push5=, 0
 	i32.store16	s($pop5), $2
 	call    	bar@FUNCTION, $1
@@ -106,7 +106,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	foo@FUNCTION, $0, $pop0
 	i32.const	$push1=, 1
@@ -155,5 +155,5 @@ l:
 	.size	l, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20111227-3.c.s b/test/torture-s/20111227-3.c.s
index cff3e52e7..3e3787413 100644
--- a/test/torture-s/20111227-3.c.s
+++ b/test/torture-s/20111227-3.c.s
@@ -6,13 +6,13 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push1=, 2
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push16=, 0
 	i32.load16_u	$push0=, s($pop16)
 	i32.const	$push3=, 65535
@@ -26,7 +26,7 @@ bar:                                    # @bar
 	i32.const	$push7=, 1
 	i32.ne  	$push8=, $0, $pop7
 	br_if   	0, $pop8        # 0: down to label2
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push17=, 0
 	i32.load	$push6=, i($pop17)
 	i32.const	$push9=, -1
@@ -36,7 +36,7 @@ bar:                                    # @bar
 	end_block                       # label2:
 	block   	
 	br_if   	0, $0           # 0: down to label3
-# BB#5:                                 # %if.end9
+# %bb.5:                                # %if.end9
 	i32.const	$push12=, 0
 	i32.load	$push11=, l($pop12)
 	i32.const	$push13=, -1
@@ -60,7 +60,7 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load8_s	$2=, v($pop6)
 	block   	
@@ -68,15 +68,15 @@ foo:                                    # @foo
 	block   	
 	i32.eqz 	$push8=, $1
 	br_if   	0, $pop8        # 0: down to label6
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push0=, 1
 	i32.eq  	$push1=, $1, $pop0
 	br_if   	2, $pop1        # 2: down to label4
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	1, $pop3        # 1: down to label5
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
 	i32.const	$push5=, 0
 	i32.store16	s($pop5), $2
 	call    	bar@FUNCTION, $1
@@ -106,7 +106,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	foo@FUNCTION, $0, $pop0
 	i32.const	$push1=, 1
@@ -155,5 +155,5 @@ l:
 	.size	l, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20120105-1.c.s b/test/torture-s/20120105-1.c.s
index 9b4a34e7b..3e7cc4876 100644
--- a/test/torture-s/20120105-1.c.s
+++ b/test/torture-s/20120105-1.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i64.const	$push0=, 0
 	i64.store	5($0):p2align=0, $pop0
 	i64.const	$push13=, 0
@@ -39,7 +38,7 @@ main:                                   # @main
 extract:                                # @extract
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0):p2align=0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -56,4 +55,4 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20120111-1.c.s b/test/torture-s/20120111-1.c.s
index beb262771..f1f659a15 100644
--- a/test/torture-s/20120111-1.c.s
+++ b/test/torture-s/20120111-1.c.s
@@ -7,7 +7,7 @@
 f0a:                                    # @f0a
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -3
 	i64.gt_u	$push1=, $0, $pop0
 	i32.const	$push2=, -1
@@ -23,14 +23,14 @@ f0a:                                    # @f0a
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, -6352373499721454287
 	i32.call	$push1=, f0a@FUNCTION, $pop0
 	i32.const	$push2=, -1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -42,5 +42,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20120207-1.c.s b/test/torture-s/20120207-1.c.s
index 5f6c635c1..51dc05ad3 100644
--- a/test/torture-s/20120207-1.c.s
+++ b/test/torture-s/20120207-1.c.s
@@ -8,15 +8,14 @@ test:                                   # @test
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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.sub 	$1=, $pop8, $pop10
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, .L.str+10($pop0)
-	i32.store8	10($pop13), $pop1
+	i32.store8	10($1), $pop1
 	i32.const	$push12=, 0
 	i32.load16_u	$push2=, .L.str+8($pop12)
 	i32.store16	8($1), $pop2
@@ -38,14 +37,14 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 2
 	i32.call	$push1=, test@FUNCTION, $pop0
 	i32.const	$push2=, 49
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -64,5 +63,5 @@ main:                                   # @main
 	.size	.L.str, 11
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20120427-1.c.s b/test/torture-s/20120427-1.c.s
index 9f5f46785..4457a9781 100644
--- a/test/torture-s/20120427-1.c.s
+++ b/test/torture-s/20120427-1.c.s
@@ -8,36 +8,32 @@ sreal_compare:                          # @sreal_compare
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$3=, 4($1)
+	i32.load	$2=, 4($0)
 	i32.const	$4=, 1
 	block   	
-	i32.load	$push9=, 4($0)
-	tee_local	$push8=, $2=, $pop9
-	i32.load	$push7=, 4($1)
-	tee_local	$push6=, $3=, $pop7
-	i32.gt_s	$push0=, $pop8, $pop6
+	i32.gt_s	$push0=, $2, $3
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$4=, -1
 	i32.lt_s	$push1=, $2, $3
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
+	i32.load	$3=, 0($1)
+	i32.load	$2=, 0($0)
 	i32.const	$4=, 1
-	i32.load	$push13=, 0($0)
-	tee_local	$push12=, $0=, $pop13
-	i32.load	$push11=, 0($1)
-	tee_local	$push10=, $1=, $pop11
-	i32.gt_u	$push2=, $pop12, $pop10
+	i32.gt_u	$push2=, $2, $3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#3:                                 # %if.end10
+# %bb.3:                                # %if.end10
 	i32.const	$push5=, -1
 	i32.const	$push4=, 0
-	i32.lt_u	$push3=, $0, $1
+	i32.lt_u	$push3=, $2, $3
 	i32.select	$4=, $pop5, $pop4, $pop3
 .LBB0_4:                                # %return
 	end_block                       # label0:
-	copy_local	$push14=, $4
-                                        # fallthrough-return: $pop14
+	copy_local	$push6=, $4
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	sreal_compare, .Lfunc_end0-sreal_compare
@@ -49,199 +45,181 @@ sreal_compare:                          # @sreal_compare
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %land.lhs.true.1
-	block   	
+# %bb.0:                                # %land.lhs.true.1
 	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
+	i32.load	$1=, a+12($pop0)
+	i32.const	$push56=, 0
+	i32.load	$0=, a+4($pop56)
+	block   	
+	i32.gt_s	$push1=, $0, $1
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end.i.1
+# %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
+# %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.const	$push57=, 0
+	i32.load	$push4=, a+8($pop57)
 	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
+	i32.load	$1=, a+20($pop7)
+	i32.const	$push58=, 0
+	i32.load	$0=, a+4($pop58)
+	i32.gt_s	$push8=, $0, $1
 	br_if   	0, $pop8        # 0: down to label1
-# BB#4:                                 # %if.end.i.2
+# %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
+# %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.const	$push59=, 0
+	i32.load	$push11=, a+16($pop59)
 	i32.ge_u	$push13=, $pop12, $pop11
 	br_if   	1, $pop13       # 1: down to label1
 .LBB1_6:                                # %land.lhs.true16.190
 	end_block                       # label3:
+	i32.const	$push61=, 0
+	i32.load	$1=, a+4($pop61)
+	i32.const	$push60=, 0
+	i32.load	$0=, a+12($pop60)
 	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
+	i32.gt_s	$push14=, $0, $1
 	br_if   	0, $pop14       # 0: down to label4
-# BB#7:                                 # %if.end.i45.192
+# %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
+# %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.const	$push62=, 0
+	i32.load	$push17=, a($pop62)
 	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
+	i32.const	$push64=, 0
+	i32.load	$1=, a+20($pop64)
+	i32.const	$push63=, 0
+	i32.load	$0=, a+12($pop63)
+	i32.gt_s	$push20=, $0, $1
 	br_if   	0, $pop20       # 0: down to label1
-# BB#10:                                # %if.end.i.2.1
+# %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
+# %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.const	$push65=, 0
+	i32.load	$push23=, a+16($pop65)
 	i32.ge_u	$push25=, $pop24, $pop23
 	br_if   	1, $pop25       # 1: down to label1
 .LBB1_12:                               # %land.lhs.true16.2109
 	end_block                       # label5:
+	i32.const	$push67=, 0
+	i32.load	$1=, a+4($pop67)
+	i32.const	$push66=, 0
+	i32.load	$0=, a+20($pop66)
 	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
+	i32.gt_s	$push26=, $0, $1
 	br_if   	0, $pop26       # 0: down to label6
-# BB#13:                                # %if.end.i45.2111
+# %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
+# %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.const	$push68=, 0
+	i32.load	$push29=, a($pop68)
 	i32.le_u	$push31=, $pop30, $pop29
 	br_if   	1, $pop31       # 1: down to label1
 .LBB1_15:                               # %land.lhs.true16.1.2
 	end_block                       # label6:
+	i32.const	$push70=, 0
+	i32.load	$1=, a+12($pop70)
+	i32.const	$push69=, 0
+	i32.load	$0=, a+20($pop69)
 	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
+	i32.gt_s	$push32=, $0, $1
 	br_if   	0, $pop32       # 0: down to label7
-# BB#16:                                # %if.end.i45.1.2
+# %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
+# %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.const	$push71=, 0
+	i32.load	$push35=, a+8($pop71)
 	i32.le_u	$push37=, $pop36, $pop35
 	br_if   	1, $pop37       # 1: down to label1
 .LBB1_18:                               # %land.lhs.true16.3
 	end_block                       # label7:
+	i32.const	$push73=, 0
+	i32.load	$1=, a+4($pop73)
+	i32.const	$push72=, 0
+	i32.load	$0=, a+28($pop72)
 	block   	
-	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
+	i32.gt_s	$push38=, $0, $1
 	br_if   	0, $pop38       # 0: down to label8
-# BB#19:                                # %if.end.i45.3
+# %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
+# %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.const	$push74=, 0
+	i32.load	$push41=, a($pop74)
 	i32.le_u	$push43=, $pop42, $pop41
 	br_if   	1, $pop43       # 1: down to label1
 .LBB1_21:                               # %land.lhs.true16.1.3
 	end_block                       # label8:
+	i32.const	$push76=, 0
+	i32.load	$1=, a+12($pop76)
+	i32.const	$push75=, 0
+	i32.load	$0=, a+28($pop75)
 	block   	
-	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
+	i32.gt_s	$push44=, $0, $1
 	br_if   	0, $pop44       # 0: down to label9
-# BB#22:                                # %if.end.i45.1.3
+# %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
+# %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.const	$push77=, 0
+	i32.load	$push47=, a+8($pop77)
 	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	$push79=, 0
+	i32.load	$1=, a+20($pop79)
+	i32.const	$push78=, 0
+	i32.load	$0=, a+28($pop78)
 	block   	
-	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
+	i32.gt_s	$push50=, $0, $1
 	br_if   	0, $pop50       # 0: down to label10
-# BB#25:                                # %if.end.i45.2.3
+# %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
+# %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.const	$push80=, 0
+	i32.load	$push53=, a+16($pop80)
 	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
+	i32.const	$push81=, 0
+	return  	$pop81
 .LBB1_28:                               # %if.then21
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -266,5 +244,5 @@ a:
 	.size	a, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20120427-2.c.s b/test/torture-s/20120427-2.c.s
index 259ffc3b3..0330a00de 100644
--- a/test/torture-s/20120427-2.c.s
+++ b/test/torture-s/20120427-2.c.s
@@ -8,36 +8,32 @@ sreal_compare:                          # @sreal_compare
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$3=, 4($1)
+	i32.load	$2=, 4($0)
 	i32.const	$4=, 1
 	block   	
-	i32.load	$push9=, 4($0)
-	tee_local	$push8=, $2=, $pop9
-	i32.load	$push7=, 4($1)
-	tee_local	$push6=, $3=, $pop7
-	i32.gt_s	$push0=, $pop8, $pop6
+	i32.gt_s	$push0=, $2, $3
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$4=, -1
 	i32.lt_s	$push1=, $2, $3
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
+	i32.load	$3=, 0($1)
+	i32.load	$2=, 0($0)
 	i32.const	$4=, 1
-	i32.load	$push13=, 0($0)
-	tee_local	$push12=, $0=, $pop13
-	i32.load	$push11=, 0($1)
-	tee_local	$push10=, $1=, $pop11
-	i32.gt_u	$push2=, $pop12, $pop10
+	i32.gt_u	$push2=, $2, $3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#3:                                 # %if.end10
+# %bb.3:                                # %if.end10
 	i32.const	$push5=, -1
 	i32.const	$push4=, 0
-	i32.lt_u	$push3=, $0, $1
+	i32.lt_u	$push3=, $2, $3
 	i32.select	$4=, $pop5, $pop4, $pop3
 .LBB0_4:                                # %return
 	end_block                       # label0:
-	copy_local	$push14=, $4
-                                        # fallthrough-return: $pop14
+	copy_local	$push6=, $4
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	sreal_compare, .Lfunc_end0-sreal_compare
@@ -49,199 +45,181 @@ sreal_compare:                          # @sreal_compare
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %land.lhs.true.1
-	block   	
+# %bb.0:                                # %land.lhs.true.1
 	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
+	i32.load	$1=, a+12($pop0)
+	i32.const	$push56=, 0
+	i32.load	$0=, a+4($pop56)
+	block   	
+	i32.gt_s	$push1=, $0, $1
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end.i.1
+# %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
+# %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.const	$push57=, 0
+	i32.load	$push4=, a+8($pop57)
 	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
+	i32.load	$1=, a+20($pop7)
+	i32.const	$push58=, 0
+	i32.load	$0=, a+4($pop58)
+	i32.gt_s	$push8=, $0, $1
 	br_if   	0, $pop8        # 0: down to label1
-# BB#4:                                 # %if.end.i.2
+# %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
+# %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.const	$push59=, 0
+	i32.load	$push11=, a+16($pop59)
 	i32.ge_u	$push13=, $pop12, $pop11
 	br_if   	1, $pop13       # 1: down to label1
 .LBB1_6:                                # %land.lhs.true16.190
 	end_block                       # label3:
+	i32.const	$push61=, 0
+	i32.load	$1=, a+4($pop61)
+	i32.const	$push60=, 0
+	i32.load	$0=, a+12($pop60)
 	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
+	i32.gt_s	$push14=, $0, $1
 	br_if   	0, $pop14       # 0: down to label4
-# BB#7:                                 # %if.end.i45.192
+# %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
+# %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.const	$push62=, 0
+	i32.load	$push17=, a($pop62)
 	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
+	i32.const	$push64=, 0
+	i32.load	$1=, a+20($pop64)
+	i32.const	$push63=, 0
+	i32.load	$0=, a+12($pop63)
+	i32.gt_s	$push20=, $0, $1
 	br_if   	0, $pop20       # 0: down to label1
-# BB#10:                                # %if.end.i.2.1
+# %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
+# %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.const	$push65=, 0
+	i32.load	$push23=, a+16($pop65)
 	i32.ge_u	$push25=, $pop24, $pop23
 	br_if   	1, $pop25       # 1: down to label1
 .LBB1_12:                               # %land.lhs.true16.2109
 	end_block                       # label5:
+	i32.const	$push67=, 0
+	i32.load	$1=, a+4($pop67)
+	i32.const	$push66=, 0
+	i32.load	$0=, a+20($pop66)
 	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
+	i32.gt_s	$push26=, $0, $1
 	br_if   	0, $pop26       # 0: down to label6
-# BB#13:                                # %if.end.i45.2111
+# %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
+# %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.const	$push68=, 0
+	i32.load	$push29=, a($pop68)
 	i32.le_u	$push31=, $pop30, $pop29
 	br_if   	1, $pop31       # 1: down to label1
 .LBB1_15:                               # %land.lhs.true16.1.2
 	end_block                       # label6:
+	i32.const	$push70=, 0
+	i32.load	$1=, a+12($pop70)
+	i32.const	$push69=, 0
+	i32.load	$0=, a+20($pop69)
 	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
+	i32.gt_s	$push32=, $0, $1
 	br_if   	0, $pop32       # 0: down to label7
-# BB#16:                                # %if.end.i45.1.2
+# %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
+# %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.const	$push71=, 0
+	i32.load	$push35=, a+8($pop71)
 	i32.le_u	$push37=, $pop36, $pop35
 	br_if   	1, $pop37       # 1: down to label1
 .LBB1_18:                               # %land.lhs.true16.3
 	end_block                       # label7:
+	i32.const	$push73=, 0
+	i32.load	$1=, a+4($pop73)
+	i32.const	$push72=, 0
+	i32.load	$0=, a+28($pop72)
 	block   	
-	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
+	i32.gt_s	$push38=, $0, $1
 	br_if   	0, $pop38       # 0: down to label8
-# BB#19:                                # %if.end.i45.3
+# %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
+# %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.const	$push74=, 0
+	i32.load	$push41=, a($pop74)
 	i32.le_u	$push43=, $pop42, $pop41
 	br_if   	1, $pop43       # 1: down to label1
 .LBB1_21:                               # %land.lhs.true16.1.3
 	end_block                       # label8:
+	i32.const	$push76=, 0
+	i32.load	$1=, a+12($pop76)
+	i32.const	$push75=, 0
+	i32.load	$0=, a+28($pop75)
 	block   	
-	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
+	i32.gt_s	$push44=, $0, $1
 	br_if   	0, $pop44       # 0: down to label9
-# BB#22:                                # %if.end.i45.1.3
+# %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
+# %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.const	$push77=, 0
+	i32.load	$push47=, a+8($pop77)
 	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	$push79=, 0
+	i32.load	$1=, a+20($pop79)
+	i32.const	$push78=, 0
+	i32.load	$0=, a+28($pop78)
 	block   	
-	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
+	i32.gt_s	$push50=, $0, $1
 	br_if   	0, $pop50       # 0: down to label10
-# BB#25:                                # %if.end.i45.2.3
+# %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
+# %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.const	$push80=, 0
+	i32.load	$push53=, a+16($pop80)
 	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
+	i32.const	$push81=, 0
+	return  	$pop81
 .LBB1_28:                               # %if.then21
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -266,5 +244,5 @@ a:
 	.size	a, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20120615-1.c.s b/test/torture-s/20120615-1.c.s
index 7f61e95e7..16850e27a 100644
--- a/test/torture-s/20120615-1.c.s
+++ b/test/torture-s/20120615-1.c.s
@@ -6,19 +6,19 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 17
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 1
 	i32.shl 	$push3=, $pop2, $0
 	i32.const	$push4=, 167936
 	i32.and 	$push5=, $pop3, $pop4
 	i32.eqz 	$push6=, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	return
 .LBB0_3:                                # %if.end5
 	end_block                       # label0:
@@ -34,7 +34,7 @@ test1:                                  # @test1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
 	call    	test1@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20120808-1.c.s b/test/torture-s/20120808-1.c.s
index 7f9fd516f..f168906cf 100644
--- a/test/torture-s/20120808-1.c.s
+++ b/test/torture-s/20120808-1.c.s
@@ -6,123 +6,122 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push35=, 0
+	.local  	i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
 	i32.const	$push33=, 0
 	i32.load	$push32=, __stack_pointer($pop33)
 	i32.const	$push34=, 32
-	i32.sub 	$push41=, $pop32, $pop34
-	tee_local	$push40=, $5=, $pop41
-	i32.store	__stack_pointer($pop35), $pop40
+	i32.sub 	$6=, $pop32, $pop34
+	i32.const	$push35=, 0
+	i32.store	__stack_pointer($pop35), $6
 	i32.const	$push0=, 24
-	i32.add 	$push1=, $5, $pop0
+	i32.add 	$push1=, $6, $pop0
 	i64.const	$push2=, 0
 	i64.store	0($pop1), $pop2
 	i32.const	$push3=, 16
-	i32.add 	$push4=, $5, $pop3
+	i32.add 	$push4=, $6, $pop3
 	i64.const	$push39=, 0
 	i64.store	0($pop4), $pop39
 	i64.const	$push38=, 0
-	i64.store	8($5), $pop38
+	i64.store	8($6), $pop38
 	i64.const	$push37=, 0
-	i64.store	0($5), $pop37
+	i64.store	0($6), $pop37
 	i32.const	$push36=, 0
 	i32.load	$push5=, i($pop36)
 	i32.const	$push6=, d+1
 	i32.add 	$0=, $pop5, $pop6
-	i32.const	$3=, 0
+	i32.const	$4=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.add 	$push44=, $0, $3
-	tee_local	$push43=, $1=, $pop44
-	i32.load8_u	$2=, 0($pop43)
+	i32.const	$push41=, 2147483647
+	i32.and 	$3=, $4, $pop41
+	i32.add 	$1=, $0, $4
+	i32.load8_u	$2=, 0($1)
 	block   	
 	block   	
-	i32.const	$push42=, 25
-	i32.eq  	$push7=, $3, $pop42
+	i32.const	$push40=, 25
+	i32.eq  	$push7=, $3, $pop40
 	br_if   	0, $pop7        # 0: down to label2
-# BB#2:                                 # %for.body
+# %bb.2:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
 	block   	
-	i32.const	$push45=, 2
-	i32.eq  	$push8=, $3, $pop45
+	i32.const	$push42=, 2
+	i32.eq  	$push8=, $3, $pop42
 	br_if   	0, $pop8        # 0: down to label3
-# BB#3:                                 # %for.body
+# %bb.3:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$4=, 255
-	i32.const	$push46=, 1
-	i32.ne  	$push9=, $3, $pop46
+	i32.const	$5=, 255
+	i32.const	$push43=, 1
+	i32.ne  	$push9=, $3, $pop43
 	br_if   	2, $pop9        # 2: down to label1
-# BB#4:                                 # %sw.bb
+# %bb.4:                                # %sw.bb
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$4=, 253
+	i32.const	$5=, 253
 	br      	2               # 2: down to label1
 .LBB0_5:                                # %sw.bb1
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label3:
-	i32.const	$4=, 251
+	i32.const	$5=, 251
 	br      	1               # 1: down to label1
 .LBB0_6:                                # %sw.bb3
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	i32.const	$4=, 254
+	i32.const	$5=, 254
 .LBB0_7:                                # %sw.epilog
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
-	i32.const	$push51=, 0
-	i32.store	cp($pop51), $1
-	i32.add 	$push11=, $5, $3
-	i32.or  	$push10=, $4, $2
+	i32.const	$push46=, 0
+	i32.store	cp($pop46), $1
+	i32.add 	$push11=, $6, $4
+	i32.or  	$push10=, $5, $2
 	i32.store8	0($pop11), $pop10
-	i32.const	$push50=, 1
-	i32.add 	$push49=, $3, $pop50
-	tee_local	$push48=, $3=, $pop49
-	i32.const	$push47=, 30
-	i32.ne  	$push12=, $pop48, $pop47
+	i32.const	$push45=, 1
+	i32.add 	$4=, $4, $pop45
+	i32.const	$push44=, 30
+	i32.ne  	$push12=, $4, $pop44
 	br_if   	0, $pop12       # 0: up to label0
-# BB#8:                                 # %for.end
+# %bb.8:                                # %for.end
 	end_loop
 	block   	
-	i32.load8_u	$push14=, 0($5)
+	i32.load8_u	$push14=, 0($6)
 	i32.const	$push13=, 255
 	i32.ne  	$push15=, $pop14, $pop13
 	br_if   	0, $pop15       # 0: down to label4
-# BB#9:                                 # %lor.lhs.false
-	i32.load8_u	$push17=, 1($5)
+# %bb.9:                                # %lor.lhs.false
+	i32.load8_u	$push17=, 1($6)
 	i32.const	$push16=, 253
 	i32.ne  	$push18=, $pop17, $pop16
 	br_if   	0, $pop18       # 0: down to label4
-# BB#10:                                # %lor.lhs.false14
-	i32.load8_u	$push20=, 2($5)
+# %bb.10:                               # %lor.lhs.false14
+	i32.load8_u	$push20=, 2($6)
 	i32.const	$push19=, 251
 	i32.ne  	$push21=, $pop20, $pop19
 	br_if   	0, $pop21       # 0: down to label4
-# BB#11:                                # %lor.lhs.false19
-	i32.load8_u	$push22=, 3($5)
-	i32.const	$push52=, 255
-	i32.ne  	$push23=, $pop22, $pop52
+# %bb.11:                               # %lor.lhs.false19
+	i32.load8_u	$push22=, 3($6)
+	i32.const	$push47=, 255
+	i32.ne  	$push23=, $pop22, $pop47
 	br_if   	0, $pop23       # 0: down to label4
-# BB#12:                                # %lor.lhs.false24
-	i32.load8_u	$push24=, 4($5)
-	i32.const	$push53=, 255
-	i32.ne  	$push25=, $pop24, $pop53
+# %bb.12:                               # %lor.lhs.false24
+	i32.load8_u	$push24=, 4($6)
+	i32.const	$push48=, 255
+	i32.ne  	$push25=, $pop24, $pop48
 	br_if   	0, $pop25       # 0: down to label4
-# BB#13:                                # %lor.lhs.false29
-	i32.load8_u	$push27=, 25($5)
+# %bb.13:                               # %lor.lhs.false29
+	i32.load8_u	$push27=, 25($6)
 	i32.const	$push26=, 254
 	i32.ne  	$push28=, $pop27, $pop26
 	br_if   	0, $pop28       # 0: down to label4
-# BB#14:                                # %lor.lhs.false34
-	i32.const	$push54=, 0
-	i32.load	$push29=, cp($pop54)
+# %bb.14:                               # %lor.lhs.false34
+	i32.const	$push49=, 0
+	i32.load	$push29=, cp($pop49)
 	i32.const	$push30=, d+30
 	i32.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label4
-# BB#15:                                # %if.end
-	i32.const	$push55=, 0
-	call    	exit@FUNCTION, $pop55
+# %bb.15:                               # %if.end
+	i32.const	$push50=, 0
+	call    	exit@FUNCTION, $pop50
 	unreachable
 .LBB0_16:                               # %if.then
 	end_block                       # label4:
@@ -160,6 +159,6 @@ cp:
 	.size	cp, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 42d62c39c..128962ad9 100644
--- a/test/torture-s/20120817-1.c.s
+++ b/test/torture-s/20120817-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, foo($pop0)
 	i32.const	$push2=, -1
@@ -27,13 +27,13 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.call	$push1=, f@FUNCTION
 	i64.const	$push0=, 16
 	i64.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 0
 	call    	exit@FUNCTION, $pop3
 	unreachable
@@ -55,6 +55,6 @@ foo:
 	.size	foo, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d24c9d733..e498e5b1f 100644
--- a/test/torture-s/20120919-1.c.s
+++ b/test/torture-s/20120919-1.c.s
@@ -6,11 +6,11 @@
 	.type	init,@function
 init:                                   # @init
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push1=, $0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,32 +28,30 @@ init:                                   # @init
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, f64, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	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.sub 	$7=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $7
+	i32.const	$push23=, 1
+	i32.store	12($7), $pop23
 	i32.const	$push18=, 12
 	i32.add 	$push19=, $7, $pop18
 	i32.const	$push20=, 16
 	i32.add 	$push21=, $7, $pop20
 	call    	init@FUNCTION, $pop19, $pop21
+	i32.load	$0=, 12($7)
 	block   	
-	i32.load	$push24=, 12($7)
-	tee_local	$push23=, $0=, $pop24
 	i32.const	$push22=, 0
-	i32.lt_s	$push0=, $pop23, $pop22
+	i32.lt_s	$push0=, $0, $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	$1=, pd($pop28)
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push25=, 0
+	i32.load	$2=, pi($pop25)
+	i32.const	$push24=, 0
+	i32.load	$1=, pd($pop24)
 	i32.const	$6=, -1
 	i32.const	$3=, 0
 .LBB1_2:                                # %while.body
@@ -61,23 +59,22 @@ main:                                   # @main
 	loop    	                # label2:
 	block   	
 	br_if   	0, $6           # 0: down to label3
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
                                         #   in Loop: Header=BB1_2 Depth=1
+	f64.load	$5=, 0($1)
 	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.const	$push26=, 0x0p0
+	f64.le  	$push1=, $5, $pop26
 	f64.ne  	$push2=, $5, $5
 	i32.or  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label4
-# BB#4:                                 # %if.then3
+# %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.const	$push28=, 0
+	i32.const	$push27=, 0
+	i32.gt_s	$push4=, $4, $pop27
+	i32.select	$push5=, $4, $pop28, $pop4
 	i32.add 	$3=, $pop5, $3
 .LBB1_5:                                # %if.end8
                                         #   in Loop: Header=BB1_2 Depth=1
@@ -87,17 +84,16 @@ main:                                   # @main
 .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	$push7=, $pop35, $0
+	i32.const	$push29=, 1
+	i32.add 	$6=, $6, $pop29
+	i32.lt_s	$push7=, $6, $0
 	br_if   	0, $pop7        # 0: up to label2
-# BB#7:                                 # %while.end
+# %bb.7:                                # %while.end
 	end_loop
 	i32.const	$push8=, 1234567890
 	i32.ne  	$push9=, $3, $pop8
 	br_if   	0, $pop9        # 0: down to label1
-# BB#8:                                 # %if.end15
+# %bb.8:                                # %if.end15
 	i32.const	$push17=, 0
 	i32.const	$push15=, 6144
 	i32.add 	$push16=, $7, $pop15
@@ -151,5 +147,5 @@ pi:
 	.size	pi, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20121108-1.c.s b/test/torture-s/20121108-1.c.s
index 606c46f88..3e8f589ef 100644
--- a/test/torture-s/20121108-1.c.s
+++ b/test/torture-s/20121108-1.c.s
@@ -7,7 +7,7 @@
 strtoul1:                               # @strtoul1
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.add 	$push1=, $0, $pop0
 	i32.store	0($1), $pop1
@@ -18,19 +18,19 @@ strtoul1:                               # @strtoul1
 	i32.const	$push2=, temp
 	i32.eq  	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.const	$push4=, temp+4
 	i32.eq  	$push5=, $0, $pop4
 	br_if   	1, $pop5        # 1: down to label2
-# BB#2:                                 # %if.else3
+# %bb.2:                                # %if.else3
 	i32.const	$push6=, temp+8
 	i32.eq  	$push7=, $0, $pop6
 	br_if   	2, $pop7        # 2: down to label1
-# BB#3:                                 # %if.else6
+# %bb.3:                                # %if.else6
 	i32.const	$push8=, temp+12
 	i32.ne  	$push9=, $0, $pop8
 	br_if   	3, $pop9        # 3: down to label0
-# BB#4:                                 # %return
+# %bb.4:                                # %return
 	i32.const	$push13=, 160
 	return  	$pop13
 .LBB0_5:
@@ -60,102 +60,112 @@ strtoul1:                               # @strtoul1
 string_to_ip:                           # @string_to_ip
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
-	i32.const	$push21=, 0
-	i32.load	$push20=, __stack_pointer($pop21)
-	i32.const	$push22=, 16
-	i32.sub 	$push36=, $pop20, $pop22
-	tee_local	$push35=, $2=, $pop36
-	i32.store	__stack_pointer($pop23), $pop35
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 16
+	i32.sub 	$3=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $3
+	block   	
+	block   	
 	block   	
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push57=, $0
-	br_if   	0, $pop57       # 0: down to label7
-# BB#1:                                 # %if.end9
+	block   	
+	block   	
+	i32.eqz 	$push39=, $0
+	br_if   	0, $pop39       # 0: down to label11
+# %bb.1:                                # %if.end9
+	i32.const	$push23=, 12
+	i32.add 	$push24=, $3, $pop23
+	i32.call	$1=, strtoul1@FUNCTION, $0, $pop24, $3
+	i32.load	$0=, 12($3)
+	i32.const	$push32=, 1
+	i32.add 	$push0=, $0, $pop32
+	i32.load8_u	$push1=, 0($0)
+	i32.select	$2=, $pop0, $0, $pop1
+	i32.const	$push31=, 8
+	i32.shl 	$push2=, $1, $pop31
+	i32.const	$push3=, 65280
+	i32.and 	$0=, $pop2, $pop3
+	i32.eqz 	$push40=, $2
+	br_if   	3, $pop40       # 3: down to label8
+# %bb.2:                                # %if.then3.1
+	i32.const	$push25=, 12
+	i32.add 	$push26=, $3, $pop25
+	i32.call	$1=, strtoul1@FUNCTION, $2, $pop26, $3
+	i32.load	$2=, 12($3)
+	i32.const	$push33=, 255
+	i32.and 	$push4=, $1, $pop33
+	i32.or  	$0=, $pop4, $0
+	i32.load8_u	$push5=, 0($2)
+	i32.eqz 	$push41=, $pop5
+	br_if   	1, $pop41       # 1: down to label10
+# %bb.3:
+	i32.const	$push34=, 1
+	i32.add 	$2=, $2, $pop34
+	br      	2               # 2: down to label9
+.LBB1_4:
+	end_block                       # label11:
+	i32.const	$0=, 0
+	br      	6               # 6: down to label4
+.LBB1_5:                                # %if.end9.1
+	end_block                       # label10:
+	i32.eqz 	$push42=, $2
+	br_if   	1, $pop42       # 1: down to label8
+.LBB1_6:                                # %if.then3.2
+	end_block                       # label9:
 	i32.const	$push27=, 12
-	i32.add 	$push28=, $2, $pop27
-	i32.call	$push0=, strtoul1@FUNCTION, $0, $pop28, $2
-	i32.const	$push42=, 8
-	i32.shl 	$push3=, $pop0, $pop42
-	i32.const	$push4=, 65280
-	i32.and 	$0=, $pop3, $pop4
-	i32.load	$push41=, 12($2)
-	tee_local	$push40=, $1=, $pop41
-	i32.const	$push39=, 1
-	i32.add 	$push1=, $pop40, $pop39
-	i32.load8_u	$push2=, 0($1)
-	i32.select	$push38=, $pop1, $1, $pop2
-	tee_local	$push37=, $1=, $pop38
-	i32.eqz 	$push58=, $pop37
-	br_if   	1, $pop58       # 1: down to label6
-# BB#2:                                 # %if.end9.1
-	i32.const	$push29=, 12
-	i32.add 	$push30=, $2, $pop29
-	i32.call	$push5=, strtoul1@FUNCTION, $1, $pop30, $2
-	i32.const	$push48=, 255
-	i32.and 	$push8=, $pop5, $pop48
-	i32.or  	$0=, $pop8, $0
-	i32.load	$push47=, 12($2)
-	tee_local	$push46=, $1=, $pop47
-	i32.const	$push45=, 1
-	i32.add 	$push6=, $pop46, $pop45
-	i32.load8_u	$push7=, 0($1)
-	i32.select	$push44=, $pop6, $1, $pop7
-	tee_local	$push43=, $1=, $pop44
-	i32.eqz 	$push59=, $pop43
-	br_if   	1, $pop59       # 1: down to label6
-# BB#3:                                 # %if.end9.2
-	i32.const	$push31=, 12
-	i32.add 	$push32=, $2, $pop31
-	i32.call	$push10=, strtoul1@FUNCTION, $1, $pop32, $2
-	i32.const	$push54=, 255
-	i32.and 	$push11=, $pop10, $pop54
-	i32.const	$push53=, 8
-	i32.shl 	$push9=, $0, $pop53
-	i32.or  	$0=, $pop11, $pop9
-	i32.load	$push52=, 12($2)
-	tee_local	$push51=, $1=, $pop52
-	i32.const	$push12=, 1
-	i32.add 	$push13=, $pop51, $pop12
-	i32.load8_u	$push14=, 0($1)
-	i32.select	$push50=, $pop13, $1, $pop14
-	tee_local	$push49=, $1=, $pop50
-	i32.eqz 	$push60=, $pop49
-	br_if   	2, $pop60       # 2: down to label5
-# BB#4:                                 # %if.then3.3
-	i32.const	$push33=, 12
-	i32.add 	$push34=, $2, $pop33
-	i32.call	$push16=, strtoul1@FUNCTION, $1, $pop34, $2
-	i32.const	$push17=, 255
-	i32.and 	$push18=, $pop16, $pop17
-	i32.const	$push55=, 8
-	i32.shl 	$push15=, $0, $pop55
-	i32.or  	$0=, $pop18, $pop15
-	br      	3               # 3: down to label4
-.LBB1_5:
+	i32.add 	$push28=, $3, $pop27
+	i32.call	$push7=, strtoul1@FUNCTION, $2, $pop28, $3
+	i32.const	$push36=, 255
+	i32.and 	$push8=, $pop7, $pop36
+	i32.const	$push35=, 8
+	i32.shl 	$push6=, $0, $pop35
+	i32.or  	$2=, $pop8, $pop6
+	i32.load	$0=, 12($3)
+	i32.load8_u	$push10=, 0($0)
+	i32.eqz 	$push43=, $pop10
+	br_if   	1, $pop43       # 1: down to label7
+# %bb.7:
+	i32.const	$push9=, 1
+	i32.add 	$0=, $0, $pop9
+	br      	2               # 2: down to label6
+.LBB1_8:                                # %if.end9.2.thread
+	end_block                       # label8:
+	i32.const	$push37=, 8
+	i32.shl 	$2=, $0, $pop37
+	br      	2               # 2: down to label5
+.LBB1_9:                                # %if.end9.2
 	end_block                       # label7:
-	i32.const	$0=, 0
-	br      	2               # 2: down to label4
-.LBB1_6:                                # %if.end9.2.thread
+	i32.eqz 	$push44=, $0
+	br_if   	1, $pop44       # 1: down to label5
+.LBB1_10:                               # %if.then3.3
 	end_block                       # label6:
-	i32.const	$push56=, 8
-	i32.shl 	$0=, $0, $pop56
-.LBB1_7:                                # %cond.end.3
+	i32.const	$push29=, 12
+	i32.add 	$push30=, $3, $pop29
+	i32.call	$push12=, strtoul1@FUNCTION, $0, $pop30, $3
+	i32.const	$push13=, 255
+	i32.and 	$push14=, $pop12, $pop13
+	i32.const	$push38=, 8
+	i32.shl 	$push11=, $2, $pop38
+	i32.or  	$0=, $pop14, $pop11
+	br      	1               # 1: down to label4
+.LBB1_11:                               # %cond.end.3
 	end_block                       # label5:
-	i32.const	$push19=, 8
-	i32.shl 	$0=, $0, $pop19
-.LBB1_8:                                # %cleanup
+	i32.const	$push15=, 8
+	i32.shl 	$0=, $2, $pop15
+.LBB1_12:                               # %cleanup
 	end_block                       # label4:
-	i32.const	$push26=, 0
-	i32.const	$push24=, 16
-	i32.add 	$push25=, $2, $pop24
-	i32.store	__stack_pointer($pop26), $pop25
-	copy_local	$push61=, $0
-                                        # fallthrough-return: $pop61
+	i32.const	$push22=, 0
+	i32.const	$push20=, 16
+	i32.add 	$push21=, $3, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
+	copy_local	$push45=, $0
+                                        # fallthrough-return: $pop45
 	.endfunc
 .Lfunc_end1:
 	.size	string_to_ip, .Lfunc_end1-string_to_ip
@@ -167,18 +177,16 @@ string_to_ip:                           # @string_to_ip
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push21=, $pop6, $pop8
-	tee_local	$push20=, $1=, $pop21
-	i32.store	__stack_pointer($pop9), $pop20
+	i32.sub 	$1=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $1
 	i32.const	$push0=, temp
-	i32.call	$push19=, string_to_ip@FUNCTION, $pop0
-	tee_local	$push18=, $0=, $pop19
-	i32.store	16($1), $pop18
+	i32.call	$0=, string_to_ip@FUNCTION, $pop0
+	i32.store	16($1), $0
 	i32.const	$push1=, .L.str
 	i32.const	$push13=, 16
 	i32.add 	$push14=, $1, $pop13
@@ -192,18 +200,18 @@ main:                                   # @main
 	i32.const	$push15=, 0
 	i32.load	$push3=, result($pop15)
 	i32.ne  	$push4=, $0, $pop3
-	br_if   	0, $pop4        # 0: down to label8
-# BB#1:                                 # %if.end
+	br_if   	0, $pop4        # 0: down to label12
+# %bb.1:                                # %if.end
 	i32.const	$push5=, .Lstr
 	i32.call	$drop=, puts@FUNCTION, $pop5
 	i32.const	$push12=, 0
 	i32.const	$push10=, 32
 	i32.add 	$push11=, $1, $pop10
 	i32.store	__stack_pointer($pop12), $pop11
-	i32.const	$push22=, 0
-	return  	$pop22
+	i32.const	$push18=, 0
+	return  	$pop18
 .LBB2_2:                                # %if.then
-	end_block                       # label8:
+	end_block                       # label12:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -240,7 +248,7 @@ result:
 	.size	.Lstr, 7
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ddd481d0d..8e2be9ecc 100644
--- a/test/torture-s/20131127-1.c.s
+++ b/test/torture-s/20131127-1.c.s
@@ -6,7 +6,7 @@
 	.type	fn1,@function
 fn1:                                    # @fn1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
@@ -25,7 +25,7 @@ fn1:                                    # @fn1
 	.globl	fn2
 	.type	fn2,@function
 fn2:                                    # @fn2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push13=, 0
 	i64.load	$push1=, c+6($pop13):p2align=0
@@ -56,7 +56,7 @@ fn2:                                    # @fn2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push14=, 0
 	i64.load	$push1=, c+6($pop14):p2align=0
@@ -127,4 +127,4 @@ e:
 	.size	e, 14
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20140212-1.c.s b/test/torture-s/20140212-1.c.s
index 25049a5ba..d11e775b7 100644
--- a/test/torture-s/20140212-1.c.s
+++ b/test/torture-s/20140212-1.c.s
@@ -6,29 +6,27 @@
 	.type	fn1,@function
 fn1:                                    # @fn1
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.store	c($pop21), $pop20
-	i32.const	$push19=, 0
-	i32.const	$push18=, 0
-	i32.store	e($pop19), $pop18
-	i32.const	$push4=, 54
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.const	$push16=, 0
-	i32.load	$push2=, a($pop16)
+	i32.store	c($pop17), $pop16
 	i32.const	$push15=, 0
-	i32.ne  	$push3=, $pop2, $pop15
 	i32.const	$push14=, 0
-	i32.load	$push0=, b($pop14)
+	i32.store	e($pop15), $pop14
 	i32.const	$push13=, 0
-	i32.ne  	$push1=, $pop0, $pop13
-	i32.and 	$push12=, $pop3, $pop1
-	tee_local	$push11=, $0=, $pop12
-	i32.select	$push10=, $pop4, $pop17, $pop11
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$push2=, a($pop13)
+	i32.const	$push12=, 0
+	i32.ne  	$push3=, $pop2, $pop12
+	i32.const	$push11=, 0
+	i32.load	$push0=, b($pop11)
+	i32.const	$push10=, 0
+	i32.ne  	$push1=, $pop0, $pop10
+	i32.and 	$0=, $pop3, $pop1
+	i32.const	$push4=, 54
+	i32.const	$push9=, 0
+	i32.select	$1=, $pop4, $pop9, $0
 	i32.const	$push5=, 147
-	i32.mul 	$2=, $pop9, $pop5
+	i32.mul 	$2=, $1, $pop5
 	i32.const	$push8=, 0
 	i32.load	$4=, f($pop8)
 	i32.const	$push7=, 0
@@ -38,36 +36,36 @@ fn1:                                    # @fn1
 	block   	
 	loop    	                # label1:
 	block   	
-	i32.eqz 	$push30=, $3
-	br_if   	0, $pop30       # 0: down to label2
-# BB#2:                                 # %if.then
+	i32.eqz 	$push26=, $3
+	br_if   	0, $pop26       # 0: down to label2
+# %bb.2:                                # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push23=, 0
-	i32.const	$push22=, 1
-	i32.store	c($pop23), $pop22
-	i32.eqz 	$push31=, $4
-	br_if   	1, $pop31       # 1: up to label1
+	i32.const	$push19=, 0
+	i32.const	$push18=, 1
+	i32.store	c($pop19), $pop18
+	i32.eqz 	$push27=, $4
+	br_if   	1, $pop27       # 1: up to label1
 	br      	2               # 2: down to label0
 .LBB0_3:                                # %if.else
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	i32.const	$push27=, 0
-	i32.const	$push26=, 9
-	i32.store	h($pop27), $pop26
-	i32.const	$push25=, 0
-	i32.const	$push24=, 9
-	i32.store	i($pop25), $pop24
-	i32.eqz 	$push32=, $4
-	br_if   	0, $pop32       # 0: up to label1
+	i32.const	$push23=, 0
+	i32.const	$push22=, 9
+	i32.store	h($pop23), $pop22
+	i32.const	$push21=, 0
+	i32.const	$push20=, 9
+	i32.store	i($pop21), $pop20
+	i32.eqz 	$push28=, $4
+	br_if   	0, $pop28       # 0: up to label1
 .LBB0_4:                                # %if.then15
 	end_loop
 	end_block                       # label0:
 	i32.const	$push6=, 0
 	i32.store8	j($pop6), $1
-	i32.const	$push29=, 0
-	i32.store	k($pop29), $0
-	i32.const	$push28=, 0
-	i32.store8	g($pop28), $2
+	i32.const	$push25=, 0
+	i32.store	k($pop25), $0
+	i32.const	$push24=, 0
+	i32.store8	g($pop24), $2
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -80,26 +78,25 @@ fn1:                                    # @fn1
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.store	c($pop21), $pop20
+# %bb.0:                                # %entry
 	i32.const	$push19=, 0
 	i32.const	$push18=, 0
-	i32.store	e($pop19), $pop18
-	i32.const	$push4=, 54
+	i32.store	c($pop19), $pop18
 	i32.const	$push17=, 0
 	i32.const	$push16=, 0
-	i32.load	$push2=, a($pop16)
+	i32.store	e($pop17), $pop16
 	i32.const	$push15=, 0
-	i32.ne  	$push3=, $pop2, $pop15
+	i32.load	$push2=, a($pop15)
 	i32.const	$push14=, 0
-	i32.load	$push0=, b($pop14)
+	i32.ne  	$push3=, $pop2, $pop14
 	i32.const	$push13=, 0
-	i32.ne  	$push1=, $pop0, $pop13
-	i32.and 	$push12=, $pop3, $pop1
-	tee_local	$push11=, $0=, $pop12
-	i32.select	$1=, $pop4, $pop17, $pop11
+	i32.load	$push0=, b($pop13)
+	i32.const	$push12=, 0
+	i32.ne  	$push1=, $pop0, $pop12
+	i32.and 	$0=, $pop3, $pop1
+	i32.const	$push4=, 54
+	i32.const	$push11=, 0
+	i32.select	$1=, $pop4, $pop11, $0
 	i32.const	$push10=, 0
 	i32.load	$3=, f($pop10)
 	i32.const	$push9=, 0
@@ -110,46 +107,46 @@ main:                                   # @main
 	block   	
 	loop    	                # label4:
 	block   	
-	i32.eqz 	$push32=, $2
-	br_if   	0, $pop32       # 0: down to label5
-# BB#2:                                 # %if.then.i
+	i32.eqz 	$push30=, $2
+	br_if   	0, $pop30       # 0: down to label5
+# %bb.2:                                # %if.then.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	i32.const	$4=, 1
-	i32.const	$push23=, 0
-	i32.const	$push22=, 1
-	i32.store	c($pop23), $pop22
-	i32.eqz 	$push33=, $3
-	br_if   	1, $pop33       # 1: up to label4
+	i32.const	$push21=, 0
+	i32.const	$push20=, 1
+	i32.store	c($pop21), $pop20
+	i32.eqz 	$push31=, $3
+	br_if   	1, $pop31       # 1: up to label4
 	br      	2               # 2: down to label3
 .LBB1_3:                                # %if.else.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label5:
-	i32.const	$push27=, 0
-	i32.const	$push26=, 9
-	i32.store	h($pop27), $pop26
 	i32.const	$push25=, 0
 	i32.const	$push24=, 9
-	i32.store	i($pop25), $pop24
-	i32.eqz 	$push34=, $3
-	br_if   	0, $pop34       # 0: up to label4
+	i32.store	h($pop25), $pop24
+	i32.const	$push23=, 0
+	i32.const	$push22=, 9
+	i32.store	i($pop23), $pop22
+	i32.eqz 	$push32=, $3
+	br_if   	0, $pop32       # 0: up to label4
 .LBB1_4:                                # %fn1.exit
 	end_loop
 	end_block                       # label3:
-	i32.const	$push30=, 0
-	i32.store8	j($pop30), $1
-	i32.const	$push29=, 0
-	i32.store	k($pop29), $0
 	i32.const	$push28=, 0
+	i32.store8	j($pop28), $1
+	i32.const	$push27=, 0
+	i32.store	k($pop27), $0
+	i32.const	$push26=, 0
 	i32.const	$push5=, 147
 	i32.mul 	$push6=, $1, $pop5
-	i32.store8	g($pop28), $pop6
+	i32.store8	g($pop26), $pop6
 	block   	
 	i32.const	$push7=, 1
 	i32.ne  	$push8=, $4, $pop7
 	br_if   	0, $pop8        # 0: down to label6
-# BB#5:                                 # %if.end
-	i32.const	$push31=, 0
-	return  	$pop31
+# %bb.5:                                # %if.end
+	i32.const	$push29=, 0
+	return  	$pop29
 .LBB1_6:                                # %if.then
 	end_block                       # label6:
 	call    	abort@FUNCTION
@@ -256,5 +253,5 @@ h:
 	.size	h, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/20140326-1.c.s b/test/torture-s/20140326-1.c.s
index bb0f92ca5..9beab06b0 100644
--- a/test/torture-s/20140326-1.c.s
+++ b/test/torture-s/20140326-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,4 +23,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/20140425-1.c.s b/test/torture-s/20140425-1.c.s
index ad29d91de..8f2b6fba6 100644
--- a/test/torture-s/20140425-1.c.s
+++ b/test/torture-s/20140425-1.c.s
@@ -7,27 +7,25 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push17=, $pop5, $pop7
-	tee_local	$push16=, $1=, $pop17
-	i32.store	__stack_pointer($pop8), $pop16
+	i32.sub 	$1=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $1
 	i32.const	$push12=, 12
 	i32.add 	$push13=, $1, $pop12
 	call    	set@FUNCTION, $pop13
+	i32.load	$0=, 12($1)
 	i32.const	$push0=, 2
-	i32.load	$push15=, 12($1)
-	tee_local	$push14=, $0=, $pop15
-	i32.shl 	$push1=, $pop0, $pop14
+	i32.shl 	$push1=, $pop0, $0
 	i32.store	12($1), $pop1
 	block   	
 	i32.const	$push2=, 30
 	i32.le_u	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push11=, 0
 	i32.const	$push9=, 16
 	i32.add 	$push10=, $1, $pop9
@@ -46,7 +44,7 @@ main:                                   # @main
 	.type	set,@function           # -- Begin function set
 set:                                    # @set
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -55,5 +53,5 @@ set:                                    # @set
 	.size	set, .Lfunc_end1-set
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/900409-1.c.s b/test/torture-s/900409-1.c.s
index e9f451df7..c73ded2c3 100644
--- a/test/torture-s/900409-1.c.s
+++ b/test/torture-s/900409-1.c.s
@@ -7,7 +7,7 @@
 f1:                                     # @f1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -16777216
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16777215
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 255
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -52,7 +52,7 @@ f3:                                     # @f3
 f4:                                     # @f4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -256
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -67,7 +67,7 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -82,7 +82,7 @@ f5:                                     # @f5
 f6:                                     # @f6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -65536
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -96,7 +96,7 @@ f6:                                     # @f6
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -105,5 +105,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end6-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920202-1.c.s b/test/torture-s/920202-1.c.s
index efa89b56d..11b0f13f1 100644
--- a/test/torture-s/920202-1.c.s
+++ b/test/torture-s/920202-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920409-1.c.s b/test/torture-s/920409-1.c.s
index 15f7a63f5..3104af734 100644
--- a/test/torture-s/920409-1.c.s
+++ b/test/torture-s/920409-1.c.s
@@ -6,7 +6,7 @@
 	.type	x,@function
 x:                                      # @x
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ x:                                      # @x
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920410-1.c.s b/test/torture-s/920410-1.c.s
index ded487757..f96f946ec 100644
--- a/test/torture-s/920410-1.c.s
+++ b/test/torture-s/920410-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920411-1.c.s b/test/torture-s/920411-1.c.s
index 0db42b63e..802c23612 100644
--- a/test/torture-s/920411-1.c.s
+++ b/test/torture-s/920411-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0):p2align=0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920428-1.c.s b/test/torture-s/920428-1.c.s
index 68a5432dd..90d38dd1f 100644
--- a/test/torture-s/920428-1.c.s
+++ b/test/torture-s/920428-1.c.s
@@ -7,7 +7,7 @@
 x:                                      # @x
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,12 +20,12 @@ x:                                      # @x
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.eqz 	$push2=, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push1=, 0
 	call    	exit@FUNCTION, $pop1
 	unreachable
@@ -44,6 +44,6 @@ main:                                   # @main
 	.size	.L.str, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3d41ff322..416cc76be 100644
--- a/test/torture-s/920429-1.c.s
+++ b/test/torture-s/920429-1.c.s
@@ -8,12 +8,11 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load8_u	$1=, 0($0)
 	i32.const	$push4=, 0
-	i32.load8_u	$push13=, 0($0)
-	tee_local	$push12=, $1=, $pop13
 	i32.const	$push0=, 7
-	i32.and 	$push1=, $pop12, $pop0
+	i32.and 	$push1=, $1, $pop0
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $pop1, $pop2
 	i32.store	j($pop4), $pop3
@@ -36,7 +35,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 2
 	i32.store	j($pop1), $pop0
@@ -69,5 +68,5 @@ j:
 	.size	j, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920501-1.c.s b/test/torture-s/920501-1.c.s
index e9e693a87..d16f69dfd 100644
--- a/test/torture-s/920501-1.c.s
+++ b/test/torture-s/920501-1.c.s
@@ -7,22 +7,21 @@
 x:                                      # @x
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	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.eqz 	$push9=, $pop0
+	br_if   	0, $pop9        # 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	$push8=, 0
+	i32.load	$0=, s+4($pop8)
 	i32.const	$push1=, 2
-	i32.shl 	$push2=, $pop8, $pop1
+	i32.shl 	$push2=, $0, $pop1
 	i32.const	$push3=, s+4
 	i32.add 	$push4=, $pop2, $pop3
 	i32.store	0($pop4), $0
@@ -38,7 +37,7 @@ x:                                      # @x
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, 0
 	i64.store	s($pop1), $pop0
@@ -59,5 +58,5 @@ s:
 	.size	s, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920501-2.c.s b/test/torture-s/920501-2.c.s
index 3f51b0e7f..aa2cb2d59 100644
--- a/test/torture-s/920501-2.c.s
+++ b/test/torture-s/920501-2.c.s
@@ -7,25 +7,23 @@
 gcd_ll:                                 # @gcd_ll
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i64.eqz 	$push0=, $1
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %if.end.preheader
+# %bb.1:                                # %if.end.preheader
 .LBB0_2:                                # %if.end
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i64.rem_u	$push7=, $0, $1
-	tee_local	$push6=, $0=, $pop7
-	i64.eqz 	$push1=, $pop6
+	i64.rem_u	$0=, $0, $1
+	i64.eqz 	$push1=, $0
 	br_if   	2, $pop1        # 2: down to label0
-# BB#3:                                 # %if.end5
+# %bb.3:                                # %if.end5
                                         #   in Loop: Header=BB0_2 Depth=1
-	i64.rem_u	$push10=, $1, $0
-	tee_local	$push9=, $1=, $pop10
-	i64.const	$push8=, 0
-	i64.ne  	$push2=, $pop9, $pop8
+	i64.rem_u	$1=, $1, $0
+	i64.const	$push6=, 0
+	i64.ne  	$push2=, $1, $pop6
 	br_if   	0, $pop2        # 0: up to label2
 .LBB0_4:                                # %return
 	end_loop
@@ -49,69 +47,66 @@ powmod_ll:                              # @powmod_ll
 	.param  	i64, i32, i64
 	.result 	i64
 	.local  	i32, i32, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.eqz 	$push22=, $1
-	br_if   	0, $pop22       # 0: down to label4
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push16=, $1
+	br_if   	0, $pop16       # 0: down to label4
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 0
 	copy_local	$4=, $1
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.const	$push13=, 1
-	i32.add 	$3=, $3, $pop13
-	i32.const	$push12=, 1
-	i32.shr_u	$push11=, $4, $pop12
-	tee_local	$push10=, $4=, $pop11
-	br_if   	0, $pop10       # 0: up to label5
-# BB#3:                                 # %for.end
+	i32.const	$push10=, 1
+	i32.add 	$3=, $3, $pop10
+	i32.const	$push9=, 1
+	i32.shr_u	$4=, $4, $pop9
+	br_if   	0, $4           # 0: up to label5
+# %bb.3:                                # %for.end
 	end_loop
-	i32.const	$push15=, -1
-	i32.add 	$push0=, $3, $pop15
-	i32.const	$push14=, 1
-	i32.lt_s	$push1=, $pop0, $pop14
-	br_if   	1, $pop1        # 1: down to label3
-# BB#4:                                 # %for.body4.preheader
+	i32.const	$push11=, 1
+	i32.ne  	$push0=, $3, $pop11
+	br_if   	1, $pop0        # 1: down to label3
+# %bb.4:
+	copy_local	$push7=, $0
+	return  	$pop7
+.LBB1_5:
+	end_block                       # label4:
+	i64.const	$push8=, 1
+	return  	$pop8
+.LBB1_6:                                # %for.body4.preheader
+	end_block                       # label3:
 	copy_local	$5=, $0
-.LBB1_5:                                # %for.body4
+.LBB1_7:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i64.mul 	$push2=, $5, $5
-	i64.rem_u	$5=, $pop2, $2
+	i64.mul 	$push1=, $5, $5
+	i64.rem_u	$5=, $pop1, $2
 	block   	
-	i32.const	$push17=, 1
-	i32.const	$push16=, -2
-	i32.add 	$push3=, $3, $pop16
-	i32.shl 	$push4=, $pop17, $pop3
-	i32.and 	$push5=, $pop4, $1
-	i32.eqz 	$push23=, $pop5
-	br_if   	0, $pop23       # 0: down to label7
-# BB#6:                                 # %if.then5
-                                        #   in Loop: Header=BB1_5 Depth=1
-	i64.mul 	$push6=, $5, $0
-	i64.rem_u	$5=, $pop6, $2
-.LBB1_7:                                # %for.inc9
-                                        #   in Loop: Header=BB1_5 Depth=1
+	i32.const	$push13=, 1
+	i32.const	$push12=, -2
+	i32.add 	$push2=, $3, $pop12
+	i32.shl 	$push3=, $pop13, $pop2
+	i32.and 	$push4=, $pop3, $1
+	i32.eqz 	$push17=, $pop4
+	br_if   	0, $pop17       # 0: down to label7
+# %bb.8:                                # %if.then5
+                                        #   in Loop: Header=BB1_7 Depth=1
+	i64.mul 	$push5=, $5, $0
+	i64.rem_u	$5=, $pop5, $2
+.LBB1_9:                                # %for.inc9
+                                        #   in Loop: Header=BB1_7 Depth=1
 	end_block                       # label7:
-	i32.const	$push21=, -1
-	i32.add 	$push20=, $3, $pop21
-	tee_local	$push19=, $3=, $pop20
-	i32.const	$push18=, 1
-	i32.gt_s	$push7=, $pop19, $pop18
-	br_if   	0, $pop7        # 0: up to label6
-# BB#8:                                 # %cleanup
+	i32.const	$push15=, -1
+	i32.add 	$3=, $3, $pop15
+	i32.const	$push14=, 1
+	i32.gt_s	$push6=, $3, $pop14
+	br_if   	0, $pop6        # 0: up to label6
+# %bb.10:                               # %cleanup
 	end_loop
-	return  	$5
-.LBB1_9:
-	end_block                       # label4:
-	i64.const	$push9=, 1
-	return  	$pop9
-.LBB1_10:
-	end_block                       # label3:
-	copy_local	$push8=, $0
-                                        # fallthrough-return: $pop8
+	copy_local	$push18=, $5
+                                        # fallthrough-return: $pop18
 	.endfunc
 .Lfunc_end1:
 	.size	powmod_ll, .Lfunc_end1-powmod_ll
@@ -122,20 +117,18 @@ powmod_ll:                              # @powmod_ll
 	.type	facts,@function
 facts:                                  # @facts
 	.param  	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
-	i64.const	$push38=, 1
-	i64.add 	$5=, $pop39, $pop38
+	.local  	i64, i64, i64, i32, i64, i64, i32, i32, i64, i64, i64, i32, i32, i32
+# %bb.0:                                # %entry
+	i64.extend_s/i32	$4=, $1
+	i64.const	$push33=, 1
+	i64.add 	$5=, $4, $pop33
+	i64.extend_s/i32	$9=, $2
 	i32.const	$15=, factab
 	i32.const	$17=, 0
 	i32.const	$16=, 1
-	i32.const	$1=, 1
+	i32.const	$7=, 1
 	i64.const	$8=, 1
-	i64.extend_s/i32	$push37=, $2
-	tee_local	$push36=, $9=, $pop37
-	copy_local	$13=, $pop36
+	copy_local	$13=, $9
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
@@ -146,134 +139,125 @@ facts:                                  # @facts
                                         #     Child Loop BB2_22 Depth 2
                                         #     Child Loop BB2_29 Depth 2
 	loop    	                # label8:
-	copy_local	$7=, $13
-	copy_local	$6=, $1
+	copy_local	$6=, $13
 	copy_local	$13=, $5
 	i64.const	$14=, 1
 	block   	
-	i32.eqz 	$push104=, $3
-	br_if   	0, $pop104      # 0: down to label9
-# BB#2:                                 # %for.body.i.preheader
+	i32.eqz 	$push66=, $3
+	br_if   	0, $pop66       # 0: down to label9
+# %bb.2:                                # %for.body.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$2=, -1
+	i32.const	$11=, -1
 	i32.const	$10=, 1
-	copy_local	$11=, $3
+	copy_local	$1=, $3
 .LBB2_3:                                # %for.body.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label10:
-	copy_local	$push47=, $10
-	tee_local	$push46=, $1=, $pop47
-	i32.const	$push45=, 1
-	i32.add 	$10=, $pop46, $pop45
-	i32.const	$push44=, 1
-	i32.add 	$2=, $2, $pop44
-	i32.const	$push43=, 1
-	i32.shr_u	$push42=, $11, $pop43
-	tee_local	$push41=, $11=, $pop42
-	br_if   	0, $pop41       # 0: up to label10
-# BB#4:                                 # %for.end.i
+	copy_local	$2=, $10
+	i32.const	$push36=, 1
+	i32.add 	$10=, $2, $pop36
+	i32.const	$push35=, 1
+	i32.add 	$11=, $11, $pop35
+	i32.const	$push34=, 1
+	i32.shr_u	$1=, $1, $pop34
+	br_if   	0, $1           # 0: up to label10
+# %bb.4:                                # %for.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	block   	
 	block   	
-	i32.const	$push48=, 1
-	i32.lt_s	$push0=, $2, $pop48
-	br_if   	0, $pop0        # 0: down to label12
-# BB#5:                                 # %for.body4.i.preheader
+	i32.eqz 	$push67=, $11
+	br_if   	0, $pop67       # 0: down to label12
+# %bb.5:                                # %for.body4.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	copy_local	$12=, $7
+	copy_local	$12=, $6
 .LBB2_6:                                # %for.body4.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label13:
-	i64.mul 	$push1=, $12, $12
-	i64.rem_u	$12=, $pop1, $0
+	i64.mul 	$push0=, $12, $12
+	i64.rem_u	$12=, $pop0, $0
 	block   	
-	i32.const	$push50=, 1
-	i32.const	$push49=, -2
-	i32.add 	$push2=, $1, $pop49
-	i32.shl 	$push3=, $pop50, $pop2
-	i32.and 	$push4=, $pop3, $3
-	i32.eqz 	$push105=, $pop4
-	br_if   	0, $pop105      # 0: down to label14
-# BB#7:                                 # %if.then5.i
+	i32.const	$push38=, 1
+	i32.const	$push37=, -2
+	i32.add 	$push1=, $2, $pop37
+	i32.shl 	$push2=, $pop38, $pop1
+	i32.and 	$push3=, $pop2, $3
+	i32.eqz 	$push68=, $pop3
+	br_if   	0, $pop68       # 0: down to label14
+# %bb.7:                                # %if.then5.i
                                         #   in Loop: Header=BB2_6 Depth=2
-	i64.mul 	$push5=, $12, $7
-	i64.rem_u	$12=, $pop5, $0
+	i64.mul 	$push4=, $12, $6
+	i64.rem_u	$12=, $pop4, $0
 .LBB2_8:                                # %for.inc9.i
                                         #   in Loop: Header=BB2_6 Depth=2
 	end_block                       # label14:
-	i32.const	$push54=, -1
-	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
+	i32.const	$push40=, -1
+	i32.add 	$2=, $2, $pop40
+	i32.const	$push39=, 1
+	i32.gt_s	$push5=, $2, $pop39
+	br_if   	0, $pop5        # 0: up to label13
 	br      	2               # 2: down to label11
 .LBB2_9:                                #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	end_block                       # label12:
-	copy_local	$12=, $7
+	copy_local	$12=, $6
 .LBB2_10:                               # %for.body.lr.ph.i110
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label11:
 	i64.add 	$13=, $12, $4
-	i32.const	$2=, -1
+	i32.const	$11=, -1
 	i32.const	$10=, 1
-	copy_local	$11=, $3
+	copy_local	$1=, $3
 .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=, $1=, $pop61
-	i32.const	$push59=, 1
-	i32.add 	$10=, $pop60, $pop59
-	i32.const	$push58=, 1
-	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.i118
+	copy_local	$2=, $10
+	i32.const	$push43=, 1
+	i32.add 	$10=, $2, $pop43
+	i32.const	$push42=, 1
+	i32.add 	$11=, $11, $pop42
+	i32.const	$push41=, 1
+	i32.shr_u	$1=, $1, $pop41
+	br_if   	0, $1           # 0: up to label15
+# %bb.12:                               # %for.end.i118
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	block   	
 	block   	
-	i32.const	$push62=, 1
-	i32.lt_s	$push7=, $2, $pop62
-	br_if   	0, $pop7        # 0: down to label17
-# BB#13:                                # %for.body4.i128.preheader
+	i32.eqz 	$push69=, $11
+	br_if   	0, $pop69       # 0: down to label17
+# %bb.13:                               # %for.body4.i128.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
 	copy_local	$12=, $9
 .LBB2_14:                               # %for.body4.i128
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label18:
-	i64.mul 	$push8=, $12, $12
-	i64.rem_u	$12=, $pop8, $0
+	i64.mul 	$push6=, $12, $12
+	i64.rem_u	$12=, $pop6, $0
 	block   	
-	i32.const	$push64=, 1
-	i32.const	$push63=, -2
-	i32.add 	$push9=, $1, $pop63
-	i32.shl 	$push10=, $pop64, $pop9
-	i32.and 	$push11=, $pop10, $3
-	i32.eqz 	$push106=, $pop11
-	br_if   	0, $pop106      # 0: down to label19
-# BB#15:                                # %if.then5.i131
+	i32.const	$push45=, 1
+	i32.const	$push44=, -2
+	i32.add 	$push7=, $2, $pop44
+	i32.shl 	$push8=, $pop45, $pop7
+	i32.and 	$push9=, $pop8, $3
+	i32.eqz 	$push70=, $pop9
+	br_if   	0, $pop70       # 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
+	i64.mul 	$push10=, $12, $9
+	i64.rem_u	$12=, $pop10, $0
 .LBB2_16:                               # %for.inc9.i134
                                         #   in Loop: Header=BB2_14 Depth=2
 	end_block                       # label19:
-	i32.const	$push68=, -1
-	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
+	i32.const	$push47=, -1
+	i32.add 	$2=, $2, $pop47
+	i32.const	$push46=, 1
+	i32.gt_s	$push11=, $2, $pop46
+	br_if   	0, $pop11       # 0: up to label18
 	br      	2               # 2: down to label16
 .LBB2_17:                               #   in Loop: Header=BB2_1 Depth=1
 	end_loop
@@ -283,91 +267,86 @@ facts:                                  # @facts
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label16:
 	i64.add 	$14=, $12, $4
-	i32.const	$2=, -1
+	i32.const	$11=, -1
 	i32.const	$10=, 1
-	copy_local	$11=, $3
+	copy_local	$1=, $3
 .LBB2_19:                               # %for.body.i88
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label20:
-	copy_local	$push75=, $10
-	tee_local	$push74=, $1=, $pop75
-	i32.const	$push73=, 1
-	i32.add 	$10=, $pop74, $pop73
-	i32.const	$push72=, 1
-	i32.add 	$2=, $2, $pop72
-	i32.const	$push71=, 1
-	i32.shr_u	$push70=, $11, $pop71
-	tee_local	$push69=, $11=, $pop70
-	br_if   	0, $pop69       # 0: up to label20
-# BB#20:                                # %for.end.i90
+	copy_local	$2=, $10
+	i32.const	$push50=, 1
+	i32.add 	$10=, $2, $pop50
+	i32.const	$push49=, 1
+	i32.add 	$11=, $11, $pop49
+	i32.const	$push48=, 1
+	i32.shr_u	$1=, $1, $pop48
+	br_if   	0, $1           # 0: up to label20
+# %bb.20:                               # %for.end.i90
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.const	$push76=, 1
-	i32.lt_s	$push14=, $2, $pop76
-	br_if   	0, $pop14       # 0: down to label9
-# BB#21:                                # %for.body4.i100.preheader
+	i32.eqz 	$push71=, $11
+	br_if   	0, $pop71       # 0: down to label9
+# %bb.21:                               # %for.body4.i100.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
 	copy_local	$12=, $14
 .LBB2_22:                               # %for.body4.i100
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label21:
-	i64.mul 	$push15=, $12, $12
-	i64.rem_u	$12=, $pop15, $0
+	i64.mul 	$push12=, $12, $12
+	i64.rem_u	$12=, $pop12, $0
 	block   	
-	i32.const	$push78=, 1
-	i32.const	$push77=, -2
-	i32.add 	$push16=, $1, $pop77
-	i32.shl 	$push17=, $pop78, $pop16
-	i32.and 	$push18=, $pop17, $3
-	i32.eqz 	$push107=, $pop18
-	br_if   	0, $pop107      # 0: down to label22
-# BB#23:                                # %if.then5.i103
+	i32.const	$push52=, 1
+	i32.const	$push51=, -2
+	i32.add 	$push13=, $2, $pop51
+	i32.shl 	$push14=, $pop52, $pop13
+	i32.and 	$push15=, $pop14, $3
+	i32.eqz 	$push72=, $pop15
+	br_if   	0, $pop72       # 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
+	i64.mul 	$push16=, $12, $14
+	i64.rem_u	$12=, $pop16, $0
 .LBB2_24:                               # %for.inc9.i106
                                         #   in Loop: Header=BB2_22 Depth=2
 	end_block                       # label22:
-	i32.const	$push82=, -1
-	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
+	i32.const	$push54=, -1
+	i32.add 	$2=, $2, $pop54
+	i32.const	$push53=, 1
+	i32.gt_s	$push17=, $2, $pop53
+	br_if   	0, $pop17       # 0: up to label21
+# %bb.25:                               #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	copy_local	$14=, $12
 .LBB2_26:                               # %powmod_ll.exit108
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label9:
 	block   	
-	i64.add 	$push86=, $14, $4
-	tee_local	$push85=, $9=, $pop86
-	i64.sub 	$push23=, $13, $pop85
-	i64.sub 	$push22=, $9, $13
-	i64.gt_u	$push21=, $13, $9
-	i64.select	$push24=, $pop23, $pop22, $pop21
-	i64.const	$push84=, 4294967295
-	i64.and 	$push25=, $pop24, $pop84
-	i64.const	$push83=, 4294967295
-	i64.and 	$push26=, $8, $pop83
-	i64.mul 	$push27=, $pop25, $pop26
-	i64.rem_u	$8=, $pop27, $0
+	i64.add 	$9=, $14, $4
+	i64.sub 	$push20=, $13, $9
+	i64.sub 	$push19=, $9, $13
+	i64.gt_u	$push18=, $13, $9
+	i64.select	$push21=, $pop20, $pop19, $pop18
+	i64.const	$push56=, 4294967295
+	i64.and 	$push22=, $pop21, $pop56
+	i64.const	$push55=, 4294967295
+	i64.and 	$push23=, $8, $pop55
+	i64.mul 	$push24=, $pop22, $pop23
+	i64.rem_u	$8=, $pop24, $0
 	block   	
-	i32.ne  	$push28=, $6, $16
-	br_if   	0, $pop28       # 0: down to label24
-# BB#27:                                # %if.then18
+	i32.ne  	$push25=, $7, $16
+	br_if   	0, $pop25       # 0: down to label24
+# %bb.27:                               # %if.then18
                                         #   in Loop: Header=BB2_1 Depth=1
-	i64.const	$push88=, 4294967295
-	i64.and 	$12=, $8, $pop88
-	i32.const	$push87=, 1
-	i32.add 	$17=, $17, $pop87
+	i64.const	$push58=, 4294967295
+	i64.and 	$12=, $8, $pop58
+	i32.const	$push57=, 1
+	i32.add 	$17=, $17, $pop57
 	block   	
-	i64.eqz 	$push29=, $0
-	br_if   	0, $pop29       # 0: down to label25
-# BB#28:                                # %if.end.i.preheader
+	i64.eqz 	$push26=, $0
+	br_if   	0, $pop26       # 0: down to label25
+# %bb.28:                               # %if.end.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
 	copy_local	$14=, $0
 .LBB2_29:                               # %if.end.i
@@ -375,17 +354,15 @@ facts:                                  # @facts
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	loop    	                # label27:
-	i64.rem_u	$push90=, $12, $14
-	tee_local	$push89=, $12=, $pop90
-	i64.eqz 	$push30=, $pop89
-	br_if   	1, $pop30       # 1: down to label26
-# BB#30:                                # %if.end5.i
+	i64.rem_u	$12=, $12, $14
+	i64.eqz 	$push27=, $12
+	br_if   	1, $pop27       # 1: down to label26
+# %bb.30:                               # %if.end5.i
                                         #   in Loop: Header=BB2_29 Depth=2
-	i64.rem_u	$push93=, $14, $12
-	tee_local	$push92=, $14=, $pop93
-	i64.const	$push91=, 0
-	i64.ne  	$push31=, $pop92, $pop91
-	br_if   	0, $pop31       # 0: up to label27
+	i64.rem_u	$14=, $14, $12
+	i64.const	$push59=, 0
+	i64.ne  	$push28=, $14, $pop59
+	br_if   	0, $pop28       # 0: up to label27
 	br      	2               # 2: down to label25
 .LBB2_31:                               #   in Loop: Header=BB2_1 Depth=1
 	end_loop
@@ -395,32 +372,30 @@ facts:                                  # @facts
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label25:
 	i32.add 	$16=, $17, $16
-	i32.wrap/i64	$push96=, $12
-	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.then25
+	i32.wrap/i64	$2=, $12
+	i32.const	$push60=, 1
+	i32.eq  	$push29=, $2, $pop60
+	br_if   	0, $pop29       # 0: down to label24
+# %bb.33:                               # %if.then25
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.store	0($15), $1
-	i64.const	$push100=, 4294967295
-	i64.and 	$push33=, $12, $pop100
-	i64.div_u	$push99=, $0, $pop33
-	tee_local	$push98=, $0=, $pop99
-	i64.const	$push97=, 1
-	i64.eq  	$push34=, $pop98, $pop97
-	br_if   	1, $pop34       # 1: down to label23
-# BB#34:                                #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push101=, 4
-	i32.add 	$15=, $15, $pop101
+	i32.store	0($15), $2
+	i64.const	$push62=, 4294967295
+	i64.and 	$push30=, $12, $pop62
+	i64.div_u	$0=, $0, $pop30
+	i64.const	$push61=, 1
+	i64.eq  	$push31=, $0, $pop61
+	br_if   	1, $pop31       # 1: down to label23
+# %bb.34:                               #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$push63=, 4
+	i32.add 	$15=, $15, $pop63
 .LBB2_35:                               # %for.inc
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label24:
-	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
+	i32.const	$push65=, 1
+	i32.add 	$7=, $7, $pop65
+	i32.const	$push64=, 10000
+	i32.lt_u	$push32=, $7, $pop64
+	br_if   	1, $pop32       # 1: up to label8
 .LBB2_36:                               # %cleanup
 	end_block                       # label23:
 	end_loop
@@ -435,7 +410,7 @@ facts:                                  # @facts
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push5=, 134217727
 	i32.const	$push4=, -1
 	i32.const	$push3=, 3
@@ -447,19 +422,19 @@ main:                                   # @main
 	i32.const	$push7=, 7
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label28
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push15=, 0
 	i32.load	$push0=, factab+4($pop15)
 	i32.const	$push9=, 73
 	i32.ne  	$push10=, $pop0, $pop9
 	br_if   	0, $pop10       # 0: down to label28
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$push1=, factab+8($pop16)
 	i32.const	$push11=, 262657
 	i32.ne  	$push12=, $pop1, $pop11
 	br_if   	0, $pop12       # 0: down to label28
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push13=, 0
 	call    	exit@FUNCTION, $pop13
 	unreachable
@@ -481,6 +456,6 @@ factab:
 	.size	factab, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5ab254cab..cf578920c 100644
--- a/test/torture-s/920501-6.c.s
+++ b/test/torture-s/920501-6.c.s
@@ -8,41 +8,40 @@ str2llu:                                # @str2llu
 	.param  	i32
 	.result 	i64
 	.local  	i32, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load8_s	$push1=, 0($0)
-	i64.const	$push10=, -48
-	i64.add 	$2=, $pop1, $pop10
+	i64.const	$push8=, -48
+	i64.add 	$2=, $pop1, $pop8
+	i32.load8_u	$1=, 1($0)
 	block   	
-	i32.load8_u	$push9=, 1($0)
-	tee_local	$push8=, $1=, $pop9
-	i32.eqz 	$push16=, $pop8
-	br_if   	0, $pop16       # 0: down to label0
-# BB#1:                                 # %if.end.preheader
+	i32.eqz 	$push14=, $1
+	br_if   	0, $pop14       # 0: down to label0
+# %bb.1:                                # %if.end.preheader
 	i32.const	$push2=, 2
 	i32.add 	$0=, $0, $pop2
 .LBB0_2:                                # %if.end
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i64.const	$push15=, 10
-	i64.mul 	$push3=, $2, $pop15
+	i64.const	$push13=, 10
+	i64.mul 	$push3=, $2, $pop13
 	i64.extend_u/i32	$push4=, $1
-	i64.const	$push14=, 56
-	i64.shl 	$push5=, $pop4, $pop14
-	i64.const	$push13=, 56
-	i64.shr_s	$push6=, $pop5, $pop13
+	i64.const	$push12=, 56
+	i64.shl 	$push5=, $pop4, $pop12
+	i64.const	$push11=, 56
+	i64.shr_s	$push6=, $pop5, $pop11
 	i64.add 	$push7=, $pop3, $pop6
-	i64.const	$push12=, -48
-	i64.add 	$2=, $pop7, $pop12
+	i64.const	$push10=, -48
+	i64.add 	$2=, $pop7, $pop10
 	i32.load8_u	$1=, 0($0)
-	i32.const	$push11=, 1
-	i32.add 	$push0=, $0, $pop11
+	i32.const	$push9=, 1
+	i32.add 	$push0=, $0, $pop9
 	copy_local	$0=, $pop0
 	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push17=, $2
-                                        # fallthrough-return: $pop17
+	copy_local	$push15=, $2
+                                        # fallthrough-return: $pop15
 	.endfunc
 .Lfunc_end0:
 	.size	str2llu, .Lfunc_end0-str2llu
@@ -55,47 +54,43 @@ sqrtllu:                                # @sqrtllu
 	.param  	i64
 	.result 	i32
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	copy_local	$1=, $0
-	i64.const	$2=, 0
+# %bb.0:                                # %entry
+	copy_local	$2=, $0
+	i64.const	$1=, 0
 .LBB1_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i64.const	$push14=, 1
-	i64.add 	$2=, $2, $pop14
-	i64.const	$push13=, 1
-	i64.shr_u	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
+	i64.const	$push12=, 1
+	i64.add 	$1=, $1, $pop12
+	i64.const	$push11=, 1
+	i64.shr_u	$2=, $2, $pop11
 	i64.const	$push10=, 0
-	i64.ne  	$push0=, $pop11, $pop10
+	i64.ne  	$push0=, $2, $pop10
 	br_if   	0, $pop0        # 0: up to label2
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
+	i64.const	$push16=, 1
+	i64.const	$push15=, 1
+	i64.shr_u	$push4=, $1, $pop15
+	i64.shl 	$2=, $pop16, $pop4
 	i64.const	$push2=, 0
-	i64.const	$push20=, 1
-	i64.and 	$push1=, $2, $pop20
+	i64.const	$push14=, 1
+	i64.and 	$push1=, $1, $pop14
 	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=, $pop16, $pop15
+	i64.const	$push13=, 1
+	i64.shr_u	$push5=, $2, $pop13
 	i64.and 	$push6=, $pop3, $pop5
 	i64.add 	$2=, $pop6, $2
 .LBB1_3:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i64.div_u	$push25=, $0, $2
-	tee_local	$push24=, $1=, $pop25
+	i64.div_u	$1=, $0, $2
 	i64.add 	$push7=, $1, $2
-	i64.const	$push23=, 1
-	i64.shr_u	$push22=, $pop7, $pop23
-	tee_local	$push21=, $2=, $pop22
-	i64.lt_u	$push8=, $pop24, $pop21
+	i64.const	$push17=, 1
+	i64.shr_u	$2=, $pop7, $pop17
+	i64.lt_u	$push8=, $1, $2
 	br_if   	0, $pop8        # 0: up to label3
-# BB#4:                                 # %do.end
+# %bb.4:                                # %do.end
 	end_loop
 	i32.wrap/i64	$push9=, $2
                                         # fallthrough-return: $pop9
@@ -110,73 +105,68 @@ sqrtllu:                                # @sqrtllu
 plist:                                  # @plist
 	.param  	i64, i64, i32
 	.result 	i32
-	.local  	i32, i32, i64, i64, i32
-# BB#0:                                 # %entry
-	copy_local	$4=, $2
+	.local  	i32, i64, i32, i64, i32
+# %bb.0:                                # %entry
+	copy_local	$5=, $2
 	block   	
 	i64.gt_u	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label4
-# BB#1:                                 # %for.body.preheader
-	copy_local	$4=, $2
+# %bb.1:                                # %for.body.preheader
+	copy_local	$5=, $2
 .LBB2_2:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
                                         #     Child Loop BB2_5 Depth 2
                                         #     Child Loop BB2_8 Depth 2
 	loop    	                # label5:
-	copy_local	$5=, $0
-	i64.const	$6=, 0
+	copy_local	$6=, $0
+	i64.const	$4=, 0
 .LBB2_3:                                # %for.cond.i
                                         #   Parent Loop BB2_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label6:
-	i64.const	$push23=, 1
-	i64.add 	$6=, $6, $pop23
-	i64.const	$push22=, 1
-	i64.shr_u	$push21=, $5, $pop22
-	tee_local	$push20=, $5=, $pop21
+	i64.const	$push21=, 1
+	i64.add 	$4=, $4, $pop21
+	i64.const	$push20=, 1
+	i64.shr_u	$6=, $6, $pop20
 	i64.const	$push19=, 0
-	i64.ne  	$push1=, $pop20, $pop19
+	i64.ne  	$push1=, $6, $pop19
 	br_if   	0, $pop1        # 0: up to label6
-# BB#4:                                 # %for.end.i
+# %bb.4:                                # %for.end.i
                                         #   in Loop: Header=BB2_2 Depth=1
 	end_loop
-	i64.const	$push30=, 0
-	i64.const	$push29=, 1
-	i64.and 	$push2=, $6, $pop29
-	i64.sub 	$push3=, $pop30, $pop2
-	i64.const	$push28=, 1
-	i64.const	$push27=, 1
-	i64.shr_u	$push4=, $6, $pop27
-	i64.shl 	$push26=, $pop28, $pop4
-	tee_local	$push25=, $6=, $pop26
-	i64.const	$push24=, 1
-	i64.shr_u	$push5=, $pop25, $pop24
+	i64.const	$push26=, 1
+	i64.const	$push25=, 1
+	i64.shr_u	$push4=, $4, $pop25
+	i64.shl 	$6=, $pop26, $pop4
+	i64.const	$push24=, 0
+	i64.const	$push23=, 1
+	i64.and 	$push2=, $4, $pop23
+	i64.sub 	$push3=, $pop24, $pop2
+	i64.const	$push22=, 1
+	i64.shr_u	$push5=, $6, $pop22
 	i64.and 	$push6=, $pop3, $pop5
 	i64.add 	$6=, $pop6, $6
 .LBB2_5:                                # %do.body.i
                                         #   Parent Loop BB2_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label7:
-	i64.div_u	$push35=, $0, $6
-	tee_local	$push34=, $5=, $pop35
-	i64.add 	$push7=, $5, $6
-	i64.const	$push33=, 1
-	i64.shr_u	$push32=, $pop7, $pop33
-	tee_local	$push31=, $6=, $pop32
-	i64.lt_u	$push8=, $pop34, $pop31
+	i64.div_u	$4=, $0, $6
+	i64.add 	$push7=, $4, $6
+	i64.const	$push27=, 1
+	i64.shr_u	$6=, $pop7, $pop27
+	i64.lt_u	$push8=, $4, $6
 	br_if   	0, $pop8        # 0: up to label7
-# BB#6:                                 # %sqrtllu.exit
+# %bb.6:                                # %sqrtllu.exit
                                         #   in Loop: Header=BB2_2 Depth=1
 	end_loop
+	i32.wrap/i64	$3=, $6
 	block   	
 	block   	
-	i32.wrap/i64	$push38=, $6
-	tee_local	$push37=, $3=, $pop38
-	i32.const	$push36=, 3
-	i32.lt_u	$push9=, $pop37, $pop36
+	i32.const	$push28=, 3
+	i32.lt_u	$push9=, $3, $pop28
 	br_if   	0, $pop9        # 0: down to label9
-# BB#7:                                 # %for.body3.preheader
+# %bb.7:                                # %for.body3.preheader
                                         #   in Loop: Header=BB2_2 Depth=1
 	i32.const	$7=, 3
 .LBB2_8:                                # %for.body3
@@ -187,34 +177,32 @@ plist:                                  # @plist
 	i64.rem_u	$push11=, $0, $pop10
 	i64.eqz 	$push12=, $pop11
 	br_if   	2, $pop12       # 2: down to label8
-# BB#9:                                 # %for.cond1
+# %bb.9:                                # %for.cond1
                                         #   in Loop: Header=BB2_8 Depth=2
-	i32.const	$push41=, 2
-	i32.add 	$push40=, $7, $pop41
-	tee_local	$push39=, $7=, $pop40
-	i32.le_u	$push13=, $pop39, $3
+	i32.const	$push29=, 2
+	i32.add 	$7=, $7, $pop29
+	i32.le_u	$push13=, $7, $3
 	br_if   	0, $pop13       # 0: up to label10
 .LBB2_10:                               # %for.end
                                         #   in Loop: Header=BB2_2 Depth=1
 	end_loop
 	end_block                       # label9:
-	i64.store	0($4), $0
-	i32.const	$push42=, 8
-	i32.add 	$4=, $4, $pop42
+	i64.store	0($5), $0
+	i32.const	$push30=, 8
+	i32.add 	$5=, $5, $pop30
 .LBB2_11:                               # %for.inc6
                                         #   in Loop: Header=BB2_2 Depth=1
 	end_block                       # label8:
-	i64.const	$push45=, 2
-	i64.add 	$push44=, $0, $pop45
-	tee_local	$push43=, $0=, $pop44
-	i64.le_u	$push14=, $pop43, $1
+	i64.const	$push31=, 2
+	i64.add 	$0=, $0, $pop31
+	i64.le_u	$push14=, $0, $1
 	br_if   	0, $pop14       # 0: up to label5
 .LBB2_12:                               # %for.end8
 	end_loop
 	end_block                       # label4:
 	i64.const	$push15=, 0
-	i64.store	0($4), $pop15
-	i32.sub 	$push16=, $4, $2
+	i64.store	0($5), $pop15
+	i32.sub 	$push16=, $5, $2
 	i32.const	$push17=, 3
 	i32.shr_s	$push18=, $pop16, $pop17
                                         # fallthrough-return: $pop18
@@ -229,76 +217,70 @@ plist:                                  # @plist
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i64, i64, i64, i32, i32
-# BB#0:                                 # %for.body.lr.ph.i
-	i32.const	$push30=, 0
+	.local  	i32, i64, i32, i64, i64, i32, i32
+# %bb.0:                                # %for.body.lr.ph.i
 	i32.const	$push28=, 0
 	i32.load	$push27=, __stack_pointer($pop28)
 	i32.const	$push29=, 80
-	i32.sub 	$push32=, $pop27, $pop29
-	tee_local	$push31=, $8=, $pop32
-	i32.store	__stack_pointer($pop30), $pop31
-	i64.const	$4=, 1234111111
-	copy_local	$3=, $8
+	i32.sub 	$8=, $pop27, $pop29
+	i32.const	$push30=, 0
+	i32.store	__stack_pointer($pop30), $8
+	i64.const	$5=, 1234111111
+	copy_local	$4=, $8
 .LBB3_1:                                # %for.body.i
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB3_2 Depth 2
                                         #     Child Loop BB3_4 Depth 2
                                         #     Child Loop BB3_7 Depth 2
 	loop    	                # label11:
-	copy_local	$5=, $4
-	i64.const	$6=, 0
+	copy_local	$6=, $5
+	i64.const	$3=, 0
 .LBB3_2:                                # %for.cond.i.i
                                         #   Parent Loop BB3_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label12:
-	i64.const	$push37=, 1
-	i64.add 	$6=, $6, $pop37
-	i64.const	$push36=, 1
-	i64.shr_u	$push35=, $5, $pop36
-	tee_local	$push34=, $5=, $pop35
-	i64.const	$push33=, 0
-	i64.ne  	$push0=, $pop34, $pop33
+	i64.const	$push33=, 1
+	i64.add 	$3=, $3, $pop33
+	i64.const	$push32=, 1
+	i64.shr_u	$6=, $6, $pop32
+	i64.const	$push31=, 0
+	i64.ne  	$push0=, $6, $pop31
 	br_if   	0, $pop0        # 0: up to label12
-# BB#3:                                 # %for.end.i.i
+# %bb.3:                                # %for.end.i.i
                                         #   in Loop: Header=BB3_1 Depth=1
 	end_loop
-	i64.const	$push44=, 0
-	i64.const	$push43=, 1
-	i64.and 	$push1=, $6, $pop43
-	i64.sub 	$push2=, $pop44, $pop1
-	i64.const	$push42=, 1
-	i64.const	$push41=, 1
-	i64.shr_u	$push3=, $6, $pop41
-	i64.shl 	$push40=, $pop42, $pop3
-	tee_local	$push39=, $6=, $pop40
 	i64.const	$push38=, 1
-	i64.shr_u	$push4=, $pop39, $pop38
+	i64.const	$push37=, 1
+	i64.shr_u	$push3=, $3, $pop37
+	i64.shl 	$6=, $pop38, $pop3
+	i64.const	$push36=, 0
+	i64.const	$push35=, 1
+	i64.and 	$push1=, $3, $pop35
+	i64.sub 	$push2=, $pop36, $pop1
+	i64.const	$push34=, 1
+	i64.shr_u	$push4=, $6, $pop34
 	i64.and 	$push5=, $pop2, $pop4
 	i64.add 	$6=, $pop5, $6
 .LBB3_4:                                # %do.body.i.i
                                         #   Parent Loop BB3_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label13:
-	i64.div_u	$push49=, $4, $6
-	tee_local	$push48=, $5=, $pop49
-	i64.add 	$push6=, $5, $6
-	i64.const	$push47=, 1
-	i64.shr_u	$push46=, $pop6, $pop47
-	tee_local	$push45=, $6=, $pop46
-	i64.lt_u	$push7=, $pop48, $pop45
+	i64.div_u	$3=, $5, $6
+	i64.add 	$push6=, $3, $6
+	i64.const	$push39=, 1
+	i64.shr_u	$6=, $pop6, $pop39
+	i64.lt_u	$push7=, $3, $6
 	br_if   	0, $pop7        # 0: up to label13
-# BB#5:                                 # %sqrtllu.exit.i
+# %bb.5:                                # %sqrtllu.exit.i
                                         #   in Loop: Header=BB3_1 Depth=1
 	end_loop
+	i32.wrap/i64	$2=, $6
 	block   	
 	block   	
-	i32.wrap/i64	$push52=, $6
-	tee_local	$push51=, $2=, $pop52
-	i32.const	$push50=, 3
-	i32.lt_u	$push8=, $pop51, $pop50
+	i32.const	$push40=, 3
+	i32.lt_u	$push8=, $2, $pop40
 	br_if   	0, $pop8        # 0: down to label15
-# BB#6:                                 # %for.body3.i.preheader
+# %bb.6:                                # %for.body3.i.preheader
                                         #   in Loop: Header=BB3_1 Depth=1
 	i32.const	$7=, 3
 .LBB3_7:                                # %for.body3.i
@@ -306,57 +288,55 @@ main:                                   # @main
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label16:
 	i64.extend_u/i32	$push9=, $7
-	i64.rem_u	$push10=, $4, $pop9
+	i64.rem_u	$push10=, $5, $pop9
 	i64.eqz 	$push11=, $pop10
 	br_if   	2, $pop11       # 2: down to label14
-# BB#8:                                 # %for.cond1.i
+# %bb.8:                                # %for.cond1.i
                                         #   in Loop: Header=BB3_7 Depth=2
-	i32.const	$push55=, 2
-	i32.add 	$push54=, $7, $pop55
-	tee_local	$push53=, $7=, $pop54
-	i32.le_u	$push12=, $pop53, $2
+	i32.const	$push41=, 2
+	i32.add 	$7=, $7, $pop41
+	i32.le_u	$push12=, $7, $2
 	br_if   	0, $pop12       # 0: up to label16
 .LBB3_9:                                # %for.end.i
                                         #   in Loop: Header=BB3_1 Depth=1
 	end_loop
 	end_block                       # label15:
-	i64.store	0($3), $4
-	i32.const	$push56=, 8
-	i32.add 	$3=, $3, $pop56
+	i64.store	0($4), $5
+	i32.const	$push42=, 8
+	i32.add 	$4=, $4, $pop42
 .LBB3_10:                               # %for.inc6.i
                                         #   in Loop: Header=BB3_1 Depth=1
 	end_block                       # label14:
-	i64.const	$push60=, 2
-	i64.add 	$push59=, $4, $pop60
-	tee_local	$push58=, $4=, $pop59
-	i64.const	$push57=, 1234111128
-	i64.lt_u	$push13=, $pop58, $pop57
+	i64.const	$push44=, 2
+	i64.add 	$5=, $5, $pop44
+	i64.const	$push43=, 1234111128
+	i64.lt_u	$push13=, $5, $pop43
 	br_if   	0, $pop13       # 0: up to label11
-# BB#11:                                # %plist.exit
+# %bb.11:                               # %plist.exit
 	end_loop
 	i64.const	$push14=, 0
-	i64.store	0($3), $pop14
+	i64.store	0($4), $pop14
 	block   	
 	i64.load	$push16=, 0($8)
 	i64.const	$push15=, 1234111117
 	i64.ne  	$push17=, $pop16, $pop15
 	br_if   	0, $pop17       # 0: down to label17
-# BB#12:                                # %lor.lhs.false
+# %bb.12:                               # %lor.lhs.false
 	i64.load	$push19=, 8($8)
 	i64.const	$push18=, 1234111121
 	i64.ne  	$push20=, $pop19, $pop18
 	br_if   	0, $pop20       # 0: down to label17
-# BB#13:                                # %lor.lhs.false5
+# %bb.13:                               # %lor.lhs.false5
 	i64.load	$push22=, 16($8)
 	i64.const	$push21=, 1234111127
 	i64.ne  	$push23=, $pop22, $pop21
 	br_if   	0, $pop23       # 0: down to label17
-# BB#14:                                # %lor.lhs.false8
+# %bb.14:                               # %lor.lhs.false8
 	i64.load	$push24=, 24($8)
 	i64.eqz 	$push25=, $pop24
-	i32.eqz 	$push61=, $pop25
-	br_if   	0, $pop61       # 0: down to label17
-# BB#15:                                # %if.end
+	i32.eqz 	$push45=, $pop25
+	br_if   	0, $pop45       # 0: down to label17
+# %bb.15:                               # %if.end
 	i32.const	$push26=, 0
 	call    	exit@FUNCTION, $pop26
 	unreachable
@@ -369,6 +349,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5679cb2b2..dcd0bb511 100644
--- a/test/torture-s/920501-8.c.s
+++ b/test/torture-s/920501-8.c.s
@@ -8,14 +8,13 @@ va:                                     # @va
 	.param  	i32, f64, i32, i32
 	.result 	i32
 	.local  	i32, i64, i64, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
+# %bb.0:                                # %entry
 	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.sub 	$10=, $pop20, $pop22
+	i32.const	$push23=, 0
+	i32.store	__stack_pointer($pop23), $10
 	i32.store	76($10), $3
 	i32.load	$4=, 48($3)
 	i64.load	$5=, 8($3):p2align=2
@@ -60,8 +59,8 @@ va:                                     # @va
 	i32.const	$push24=, 80
 	i32.add 	$push25=, $10, $pop24
 	i32.store	__stack_pointer($pop26), $pop25
-	copy_local	$push30=, $10
-                                        # fallthrough-return: $pop30
+	copy_local	$push28=, $10
+                                        # fallthrough-return: $pop28
 	.endfunc
 .Lfunc_end0:
 	.size	va, .Lfunc_end0-va
@@ -73,14 +72,13 @@ va:                                     # @va
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
+# %bb.0:                                # %entry
 	i32.const	$push25=, 0
 	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 64
-	i32.sub 	$push29=, $pop24, $pop26
-	tee_local	$push28=, $0=, $pop29
-	i32.store	__stack_pointer($pop27), $pop28
+	i32.sub 	$0=, $pop24, $pop26
+	i32.const	$push27=, 0
+	i32.store	__stack_pointer($pop27), $0
 	i32.const	$push0=, 48
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 15
@@ -114,7 +112,7 @@ main:                                   # @main
 	i32.const	$push20=, buf
 	i32.call	$push22=, strcmp@FUNCTION, $pop21, $pop20
 	br_if   	0, $pop22       # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push23=, 0
 	call    	exit@FUNCTION, $pop23
 	unreachable
@@ -147,7 +145,7 @@ buf:
 	.size	.L.str.1, 45
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d82709b02..56d3be511 100644
--- a/test/torture-s/920501-9.c.s
+++ b/test/torture-s/920501-9.c.s
@@ -6,7 +6,7 @@
 	.type	proc1,@function
 proc1:                                  # @proc1
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ proc1:                                  # @proc1
 	.type	proc2,@function
 proc2:                                  # @proc2
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 305419896
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ proc2:                                  # @proc2
 	.type	proc3,@function
 proc3:                                  # @proc3
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -6144092016751651208
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ proc3:                                  # @proc3
 	.type	proc4,@function
 proc4:                                  # @proc4
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -58,7 +58,7 @@ proc4:                                  # @proc4
 	.type	proc5,@function
 proc5:                                  # @proc5
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2864434397
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -73,24 +73,22 @@ print_longlong:                         # @print_longlong
 	.param  	i64, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 32
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $4=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
+	i32.sub 	$4=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $4
+	i64.const	$push0=, 32
+	i64.shr_u	$push1=, $0, $pop0
+	i32.wrap/i64	$2=, $pop1
 	i32.wrap/i64	$3=, $0
 	block   	
 	block   	
-	i64.const	$push0=, 32
-	i64.shr_u	$push1=, $0, $pop0
-	i32.wrap/i64	$push14=, $pop1
-	tee_local	$push13=, $2=, $pop14
-	i32.eqz 	$push17=, $pop13
-	br_if   	0, $pop17       # 0: down to label1
-# BB#1:                                 # %if.then
+	i32.eqz 	$push13=, $2
+	br_if   	0, $pop13       # 0: down to label1
+# %bb.1:                                # %if.then
 	i32.store	20($4), $3
 	i32.store	16($4), $2
 	i32.const	$push2=, .L.str
@@ -109,8 +107,8 @@ print_longlong:                         # @print_longlong
 	i32.const	$push8=, 32
 	i32.add 	$push9=, $4, $pop8
 	i32.store	__stack_pointer($pop10), $pop9
-	copy_local	$push18=, $4
-                                        # fallthrough-return: $pop18
+	copy_local	$push14=, $4
+                                        # fallthrough-return: $pop14
 	.endfunc
 .Lfunc_end5:
 	.size	print_longlong, .Lfunc_end5-print_longlong
@@ -122,14 +120,13 @@ print_longlong:                         # @print_longlong
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	i32.const	$push18=, 0
 	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 192
-	i32.sub 	$push51=, $pop17, $pop19
-	tee_local	$push50=, $0=, $pop51
-	i32.store	__stack_pointer($pop20), $pop50
+	i32.sub 	$0=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $0
 	i32.const	$push0=, 1
 	i32.store	64($0), $pop0
 	i32.const	$push21=, 80
@@ -144,49 +141,49 @@ main:                                   # @main
 	i32.add 	$push26=, $0, $pop25
 	i32.call	$push2=, strcmp@FUNCTION, $pop1, $pop26
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 305419896
 	i32.store	48($0), $pop3
 	i32.const	$push27=, 80
 	i32.add 	$push28=, $0, $pop27
-	i32.const	$push52=, .L.str.1
+	i32.const	$push50=, .L.str.1
 	i32.const	$push29=, 48
 	i32.add 	$push30=, $0, $pop29
-	i32.call	$drop=, sprintf@FUNCTION, $pop28, $pop52, $pop30
+	i32.call	$drop=, sprintf@FUNCTION, $pop28, $pop50, $pop30
 	i32.const	$push4=, .L.str.3
 	i32.const	$push31=, 80
 	i32.add 	$push32=, $0, $pop31
 	i32.call	$push5=, strcmp@FUNCTION, $pop4, $pop32
 	br_if   	0, $pop5        # 0: down to label2
-# BB#2:                                 # %if.end11
+# %bb.2:                                # %if.end11
 	i64.const	$push6=, 1311768467732155613
 	i64.store	32($0), $pop6
 	i32.const	$push33=, 80
 	i32.add 	$push34=, $0, $pop33
-	i32.const	$push53=, .L.str
+	i32.const	$push51=, .L.str
 	i32.const	$push35=, 32
 	i32.add 	$push36=, $0, $pop35
-	i32.call	$drop=, sprintf@FUNCTION, $pop34, $pop53, $pop36
+	i32.call	$drop=, sprintf@FUNCTION, $pop34, $pop51, $pop36
 	i32.const	$push7=, .L.str.4
 	i32.const	$push37=, 80
 	i32.add 	$push38=, $0, $pop37
 	i32.call	$push8=, strcmp@FUNCTION, $pop7, $pop38
 	br_if   	0, $pop8        # 0: down to label2
-# BB#3:                                 # %if.end19
+# %bb.3:                                # %if.end19
 	i64.const	$push9=, -1
 	i64.store	16($0), $pop9
 	i32.const	$push39=, 80
 	i32.add 	$push40=, $0, $pop39
-	i32.const	$push54=, .L.str
+	i32.const	$push52=, .L.str
 	i32.const	$push41=, 16
 	i32.add 	$push42=, $0, $pop41
-	i32.call	$drop=, sprintf@FUNCTION, $pop40, $pop54, $pop42
+	i32.call	$drop=, sprintf@FUNCTION, $pop40, $pop52, $pop42
 	i32.const	$push10=, .L.str.5
 	i32.const	$push43=, 80
 	i32.add 	$push44=, $0, $pop43
 	i32.call	$push11=, strcmp@FUNCTION, $pop10, $pop44
 	br_if   	0, $pop11       # 0: down to label2
-# BB#4:                                 # %if.end27
+# %bb.4:                                # %if.end27
 	i32.const	$push12=, -1430532899
 	i32.store	0($0), $pop12
 	i32.const	$push45=, 80
@@ -198,7 +195,7 @@ main:                                   # @main
 	i32.add 	$push48=, $0, $pop47
 	i32.call	$push15=, strcmp@FUNCTION, $pop14, $pop48
 	br_if   	0, $pop15       # 0: down to label2
-# BB#5:                                 # %if.end35
+# %bb.5:                                # %if.end35
 	i32.const	$push16=, 0
 	call    	exit@FUNCTION, $pop16
 	unreachable
@@ -247,7 +244,7 @@ main:                                   # @main
 	.size	.L.str.6, 9
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 bf228a3d9..d32fb7d25 100644
--- a/test/torture-s/920506-1.c.s
+++ b/test/torture-s/920506-1.c.s
@@ -6,12 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, l($pop1)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %sw.bb
+# %bb.1:                                # %sw.bb
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -34,6 +34,6 @@ l:
 	.size	l, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 796d590dc..0fa827b54 100644
--- a/test/torture-s/920520-1.c.s
+++ b/test/torture-s/920520-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.store	0($0), $pop0
 	copy_local	$push1=, $0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	bugger,@function
 bugger:                                 # @bugger
 	.result 	i32
-# BB#0:                                 # %sw.epilog
+# %bb.0:                                # %sw.epilog
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ bugger:                                 # @bugger
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920603-1.c.s b/test/torture-s/920603-1.c.s
index 9ae38eb73..3fd9360e8 100644
--- a/test/torture-s/920603-1.c.s
+++ b/test/torture-s/920603-1.c.s
@@ -7,12 +7,12 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 65535
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -37,6 +37,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f6a597811..3256b6b8e 100644
--- a/test/torture-s/920604-1.c.s
+++ b/test/torture-s/920604-1.c.s
@@ -7,7 +7,7 @@
 mod:                                    # @mod
 	.param  	i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.rem_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ mod:                                    # @mod
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920612-1.c.s b/test/torture-s/920612-1.c.s
index 7dc8a6fe1..bbc34443b 100644
--- a/test/torture-s/920612-1.c.s
+++ b/test/torture-s/920612-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$push1=, $0, $pop0
 	i32.const	$push2=, 1
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/920618-1.c.s b/test/torture-s/920618-1.c.s
index 04062f4fe..3f419c1f6 100644
--- a/test/torture-s/920618-1.c.s
+++ b/test/torture-s/920618-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920625-1.c.s b/test/torture-s/920625-1.c.s
index 4192ec9a8..991ef9456 100644
--- a/test/torture-s/920625-1.c.s
+++ b/test/torture-s/920625-1.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
 	i32.const	$push19=, 0
 	i32.load	$push18=, __stack_pointer($pop19)
 	i32.const	$push20=, 128
-	i32.sub 	$push64=, $pop18, $pop20
-	tee_local	$push63=, $0=, $pop64
-	i32.store	__stack_pointer($pop21), $pop63
+	i32.sub 	$0=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $0
 	i32.const	$push22=, 112
 	i32.add 	$push23=, $0, $pop22
 	i32.const	$push2=, 8
@@ -107,22 +106,20 @@ main:                                   # @main
 va1:                                    # @va1
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push44=, 0
+# %bb.0:                                # %entry
 	i32.const	$push42=, 0
 	i32.load	$push41=, __stack_pointer($pop42)
 	i32.const	$push43=, 16
-	i32.sub 	$push52=, $pop41, $pop43
-	tee_local	$push51=, $2=, $pop52
-	i32.store	__stack_pointer($pop44), $pop51
+	i32.sub 	$2=, $pop41, $pop43
+	i32.const	$push44=, 0
+	i32.store	__stack_pointer($pop44), $2
 	i32.store	12($2), $1
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push50=, $pop1, $pop2
-	tee_local	$push49=, $1=, $pop50
+	i32.and 	$1=, $pop1, $pop2
 	i32.const	$push3=, 16
-	i32.add 	$push4=, $pop49, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.store	12($2), $pop4
 	block   	
 	i32.const	$push48=, 0
@@ -130,64 +127,64 @@ va1:                                    # @va1
 	f64.load	$push5=, 0($1)
 	f64.ne  	$push7=, $pop6, $pop5
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push53=, 0
-	f64.load	$push9=, pts+8($pop53)
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push49=, 0
+	f64.load	$push9=, pts+8($pop49)
 	f64.load	$push8=, 8($1)
 	f64.ne  	$push10=, $pop9, $pop8
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
 	i32.const	$push11=, 32
 	i32.add 	$push12=, $1, $pop11
 	i32.store	12($2), $pop12
-	i32.const	$push54=, 0
-	f64.load	$push16=, pts+16($pop54)
+	i32.const	$push50=, 0
+	f64.load	$push16=, pts+16($pop50)
 	i32.const	$push13=, 16
 	i32.add 	$push14=, $1, $pop13
 	f64.load	$push15=, 0($pop14)
 	f64.ne  	$push17=, $pop16, $pop15
 	br_if   	0, $pop17       # 0: down to label0
-# BB#3:                                 # %lor.lhs.false.1
-	i32.const	$push55=, 0
-	f64.load	$push19=, pts+24($pop55)
+# %bb.3:                                # %lor.lhs.false.1
+	i32.const	$push51=, 0
+	f64.load	$push19=, pts+24($pop51)
 	f64.load	$push18=, 24($1)
 	f64.ne  	$push20=, $pop19, $pop18
 	br_if   	0, $pop20       # 0: down to label0
-# BB#4:                                 # %for.cond.1
+# %bb.4:                                # %for.cond.1
 	i32.const	$push21=, 48
 	i32.add 	$push22=, $1, $pop21
 	i32.store	12($2), $pop22
-	i32.const	$push56=, 0
-	f64.load	$push26=, pts+32($pop56)
+	i32.const	$push52=, 0
+	f64.load	$push26=, pts+32($pop52)
 	i32.const	$push23=, 32
 	i32.add 	$push24=, $1, $pop23
 	f64.load	$push25=, 0($pop24)
 	f64.ne  	$push27=, $pop26, $pop25
 	br_if   	0, $pop27       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false.2
-	i32.const	$push57=, 0
-	f64.load	$push29=, pts+40($pop57)
+# %bb.5:                                # %lor.lhs.false.2
+	i32.const	$push53=, 0
+	f64.load	$push29=, pts+40($pop53)
 	f64.load	$push28=, 40($1)
 	f64.ne  	$push30=, $pop29, $pop28
 	br_if   	0, $pop30       # 0: down to label0
-# BB#6:                                 # %for.cond.2
+# %bb.6:                                # %for.cond.2
 	i32.const	$push31=, 64
 	i32.add 	$push32=, $1, $pop31
 	i32.store	12($2), $pop32
-	i32.const	$push58=, 0
-	f64.load	$push36=, pts+48($pop58)
+	i32.const	$push54=, 0
+	f64.load	$push36=, pts+48($pop54)
 	i32.const	$push33=, 48
 	i32.add 	$push34=, $1, $pop33
 	f64.load	$push35=, 0($pop34)
 	f64.ne  	$push37=, $pop36, $pop35
 	br_if   	0, $pop37       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false.3
-	i32.const	$push59=, 0
-	f64.load	$push39=, pts+56($pop59)
+# %bb.7:                                # %lor.lhs.false.3
+	i32.const	$push55=, 0
+	f64.load	$push39=, pts+56($pop55)
 	f64.load	$push38=, 56($1)
 	f64.ne  	$push40=, $pop39, $pop38
 	br_if   	0, $pop40       # 0: down to label0
-# BB#8:                                 # %for.cond.3
+# %bb.8:                                # %for.cond.3
 	i32.const	$push47=, 0
 	i32.const	$push45=, 16
 	i32.add 	$push46=, $2, $pop45
@@ -206,14 +203,13 @@ va1:                                    # @va1
 va2:                                    # @va2
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push41=, 0
+# %bb.0:                                # %entry
 	i32.const	$push39=, 0
 	i32.load	$push38=, __stack_pointer($pop39)
 	i32.const	$push40=, 16
-	i32.sub 	$push47=, $pop38, $pop40
-	tee_local	$push46=, $2=, $pop47
-	i32.store	__stack_pointer($pop41), $pop46
+	i32.sub 	$2=, $pop38, $pop40
+	i32.const	$push41=, 0
+	i32.store	__stack_pointer($pop41), $2
 	i32.store	12($2), $1
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $1, $pop0
@@ -224,64 +220,64 @@ va2:                                    # @va2
 	i32.load	$push3=, 0($1)
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push48=, 0
-	i32.load	$push6=, ipts+4($pop48)
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push46=, 0
+	i32.load	$push6=, ipts+4($pop46)
 	i32.load	$push5=, 4($1)
 	i32.ne  	$push7=, $pop6, $pop5
 	br_if   	0, $pop7        # 0: down to label1
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $1, $pop8
 	i32.store	12($2), $pop9
-	i32.const	$push49=, 0
-	i32.load	$push13=, ipts+8($pop49)
+	i32.const	$push47=, 0
+	i32.load	$push13=, ipts+8($pop47)
 	i32.const	$push10=, 8
 	i32.add 	$push11=, $1, $pop10
 	i32.load	$push12=, 0($pop11)
 	i32.ne  	$push14=, $pop13, $pop12
 	br_if   	0, $pop14       # 0: down to label1
-# BB#3:                                 # %lor.lhs.false.1
-	i32.const	$push50=, 0
-	i32.load	$push16=, ipts+12($pop50)
+# %bb.3:                                # %lor.lhs.false.1
+	i32.const	$push48=, 0
+	i32.load	$push16=, ipts+12($pop48)
 	i32.load	$push15=, 12($1)
 	i32.ne  	$push17=, $pop16, $pop15
 	br_if   	0, $pop17       # 0: down to label1
-# BB#4:                                 # %for.cond.1
+# %bb.4:                                # %for.cond.1
 	i32.const	$push18=, 24
 	i32.add 	$push19=, $1, $pop18
 	i32.store	12($2), $pop19
-	i32.const	$push51=, 0
-	i32.load	$push23=, ipts+16($pop51)
+	i32.const	$push49=, 0
+	i32.load	$push23=, ipts+16($pop49)
 	i32.const	$push20=, 16
 	i32.add 	$push21=, $1, $pop20
 	i32.load	$push22=, 0($pop21)
 	i32.ne  	$push24=, $pop23, $pop22
 	br_if   	0, $pop24       # 0: down to label1
-# BB#5:                                 # %lor.lhs.false.2
-	i32.const	$push52=, 0
-	i32.load	$push26=, ipts+20($pop52)
+# %bb.5:                                # %lor.lhs.false.2
+	i32.const	$push50=, 0
+	i32.load	$push26=, ipts+20($pop50)
 	i32.load	$push25=, 20($1)
 	i32.ne  	$push27=, $pop26, $pop25
 	br_if   	0, $pop27       # 0: down to label1
-# BB#6:                                 # %for.cond.2
+# %bb.6:                                # %for.cond.2
 	i32.const	$push28=, 32
 	i32.add 	$push29=, $1, $pop28
 	i32.store	12($2), $pop29
-	i32.const	$push53=, 0
-	i32.load	$push33=, ipts+24($pop53)
+	i32.const	$push51=, 0
+	i32.load	$push33=, ipts+24($pop51)
 	i32.const	$push30=, 24
 	i32.add 	$push31=, $1, $pop30
 	i32.load	$push32=, 0($pop31)
 	i32.ne  	$push34=, $pop33, $pop32
 	br_if   	0, $pop34       # 0: down to label1
-# BB#7:                                 # %lor.lhs.false.3
-	i32.const	$push54=, 0
-	i32.load	$push36=, ipts+28($pop54)
+# %bb.7:                                # %lor.lhs.false.3
+	i32.const	$push52=, 0
+	i32.load	$push36=, ipts+28($pop52)
 	i32.load	$push35=, 28($1)
 	i32.ne  	$push37=, $pop36, $pop35
 	br_if   	0, $pop37       # 0: down to label1
-# BB#8:                                 # %for.cond.3
+# %bb.8:                                # %for.cond.3
 	i32.const	$push44=, 0
 	i32.const	$push42=, 16
 	i32.add 	$push43=, $2, $pop42
@@ -328,6 +324,6 @@ ipts:
 	.size	ipts, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7ac085b41..7c6e5be62 100644
--- a/test/torture-s/920710-1.c.s
+++ b/test/torture-s/920710-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920711-1.c.s b/test/torture-s/920711-1.c.s
index 3cded62e4..34abed03b 100644
--- a/test/torture-s/920711-1.c.s
+++ b/test/torture-s/920711-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/920721-1.c.s b/test/torture-s/920721-1.c.s
index 08e7dc640..c65275ab3 100644
--- a/test/torture-s/920721-1.c.s
+++ b/test/torture-s/920721-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.div_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.else
+# %bb.0:                                # %if.else
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920721-2.c.s b/test/torture-s/920721-2.c.s
index 9d704d8a7..0a3425dfb 100644
--- a/test/torture-s/920721-2.c.s
+++ b/test/torture-s/920721-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920721-3.c.s b/test/torture-s/920721-3.c.s
index 3707b2070..68d1f3dba 100644
--- a/test/torture-s/920721-3.c.s
+++ b/test/torture-s/920721-3.c.s
@@ -7,14 +7,14 @@
 ru:                                     # @ru
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push8=, 65535
 	i32.and 	$push0=, $0, $pop8
 	i32.const	$push1=, 5
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, 2
 	i32.add 	$push4=, $0, $pop3
 	i32.const	$push9=, 65535
@@ -22,7 +22,7 @@ ru:                                     # @ru
 	i32.const	$push6=, 7
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end8
+# %bb.2:                                # %if.end8
 	return  	$0
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -39,14 +39,14 @@ ru:                                     # @ru
 rs:                                     # @rs
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 65535
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 5
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end8
+# %bb.1:                                # %if.end8
 	return  	$0
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
@@ -62,7 +62,7 @@ rs:                                     # @rs
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -71,6 +71,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 80bdbbfe1..552f711d4 100644
--- a/test/torture-s/920726-1.c.s
+++ b/test/torture-s/920726-1.c.s
@@ -8,53 +8,50 @@ first:                                  # @first
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop5, $pop7
-	tee_local	$push12=, $3=, $pop13
-	i32.store	__stack_pointer($pop8), $pop12
+	i32.sub 	$3=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $3
 	i32.store	12($3), $2
 .LBB0_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
+	i32.load8_u	$2=, 0($1)
 	block   	
-	i32.load8_u	$push21=, 0($1)
-	tee_local	$push20=, $2=, $pop21
-	i32.const	$push19=, 105
-	i32.ne  	$push0=, $pop20, $pop19
+	i32.const	$push15=, 105
+	i32.ne  	$push0=, $2, $pop15
 	br_if   	0, $pop0        # 0: down to label1
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.load	$push18=, 12($3)
-	tee_local	$push17=, $2=, $pop18
-	i32.const	$push16=, 4
-	i32.add 	$push1=, $pop17, $pop16
+	i32.load	$2=, 12($3)
+	i32.const	$push14=, 4
+	i32.add 	$push1=, $2, $pop14
 	i32.store	12($3), $pop1
 	i32.load	$push2=, 0($2)
 	i32.store	0($3), $pop2
-	i32.const	$push15=, .L.str
-	i32.call	$drop=, sprintf@FUNCTION, $0, $pop15, $3
+	i32.const	$push13=, .L.str
+	i32.call	$drop=, sprintf@FUNCTION, $0, $pop13, $3
 	i32.call	$push3=, strlen@FUNCTION, $0
 	i32.add 	$0=, $0, $pop3
-	i32.const	$push14=, 1
-	i32.add 	$1=, $1, $pop14
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
 	br      	1               # 1: up to label0
 .LBB0_3:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
 	block   	
-	i32.eqz 	$push24=, $2
-	br_if   	0, $pop24       # 0: down to label2
-# BB#4:                                 # %if.else
+	i32.eqz 	$push18=, $2
+	br_if   	0, $pop18       # 0: down to label2
+# %bb.4:                                # %if.else
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.store8	0($0), $2
-	i32.const	$push23=, 1
-	i32.add 	$0=, $0, $pop23
-	i32.const	$push22=, 1
-	i32.add 	$1=, $1, $pop22
+	i32.const	$push17=, 1
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push16=, 1
+	i32.add 	$1=, $1, $pop16
 	br      	1               # 1: up to label0
 .LBB0_5:                                # %for.end
 	end_block                       # label2:
@@ -65,8 +62,8 @@ first:                                  # @first
 	i32.const	$push9=, 16
 	i32.add 	$push10=, $3, $pop9
 	i32.store	__stack_pointer($pop11), $pop10
-	copy_local	$push25=, $0
-                                        # fallthrough-return: $pop25
+	copy_local	$push19=, $0
+                                        # fallthrough-return: $pop19
 	.endfunc
 .Lfunc_end0:
 	.size	first, .Lfunc_end0-first
@@ -79,53 +76,50 @@ second:                                 # @second
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop5, $pop7
-	tee_local	$push12=, $3=, $pop13
-	i32.store	__stack_pointer($pop8), $pop12
+	i32.sub 	$3=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $3
 	i32.store	12($3), $2
 .LBB1_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
+	i32.load8_u	$2=, 0($1)
 	block   	
-	i32.load8_u	$push21=, 0($1)
-	tee_local	$push20=, $2=, $pop21
-	i32.const	$push19=, 105
-	i32.ne  	$push0=, $pop20, $pop19
+	i32.const	$push15=, 105
+	i32.ne  	$push0=, $2, $pop15
 	br_if   	0, $pop0        # 0: down to label4
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$push18=, 12($3)
-	tee_local	$push17=, $2=, $pop18
-	i32.const	$push16=, 4
-	i32.add 	$push1=, $pop17, $pop16
+	i32.load	$2=, 12($3)
+	i32.const	$push14=, 4
+	i32.add 	$push1=, $2, $pop14
 	i32.store	12($3), $pop1
 	i32.load	$push2=, 0($2)
 	i32.store	0($3), $pop2
-	i32.const	$push15=, .L.str
-	i32.call	$drop=, sprintf@FUNCTION, $0, $pop15, $3
+	i32.const	$push13=, .L.str
+	i32.call	$drop=, sprintf@FUNCTION, $0, $pop13, $3
 	i32.call	$push3=, strlen@FUNCTION, $0
 	i32.add 	$0=, $0, $pop3
-	i32.const	$push14=, 1
-	i32.add 	$1=, $1, $pop14
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
 	br      	1               # 1: up to label3
 .LBB1_3:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label4:
 	block   	
-	i32.eqz 	$push24=, $2
-	br_if   	0, $pop24       # 0: down to label5
-# BB#4:                                 # %if.else
+	i32.eqz 	$push18=, $2
+	br_if   	0, $pop18       # 0: down to label5
+# %bb.4:                                # %if.else
                                         #   in Loop: Header=BB1_1 Depth=1
 	i32.store8	0($0), $2
-	i32.const	$push23=, 1
-	i32.add 	$0=, $0, $pop23
-	i32.const	$push22=, 1
-	i32.add 	$1=, $1, $pop22
+	i32.const	$push17=, 1
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push16=, 1
+	i32.add 	$1=, $1, $pop16
 	br      	1               # 1: up to label3
 .LBB1_5:                                # %for.end
 	end_block                       # label5:
@@ -136,8 +130,8 @@ second:                                 # @second
 	i32.const	$push9=, 16
 	i32.add 	$push10=, $3, $pop9
 	i32.store	__stack_pointer($pop11), $pop10
-	copy_local	$push25=, $0
-                                        # fallthrough-return: $pop25
+	copy_local	$push19=, $0
+                                        # fallthrough-return: $pop19
 	.endfunc
 .Lfunc_end1:
 	.size	second, .Lfunc_end1-second
@@ -149,14 +143,13 @@ second:                                 # @second
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 256
-	i32.sub 	$push23=, $pop5, $pop7
-	tee_local	$push22=, $0=, $pop23
-	i32.store	__stack_pointer($pop8), $pop22
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i64.const	$push0=, 85899345925
 	i64.store	16($0), $pop0
 	i32.const	$push9=, 144
@@ -177,13 +170,13 @@ main:                                   # @main
 	i32.add 	$push16=, $0, $pop15
 	i32.call	$push2=, strcmp@FUNCTION, $pop19, $pop16
 	br_if   	0, $pop2        # 0: down to label6
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push24=, .L.str.2
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push22=, .L.str.2
 	i32.const	$push17=, 32
 	i32.add 	$push18=, $0, $pop17
-	i32.call	$push3=, strcmp@FUNCTION, $pop24, $pop18
+	i32.call	$push3=, strcmp@FUNCTION, $pop22, $pop18
 	br_if   	0, $pop3        # 0: down to label6
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -212,7 +205,7 @@ main:                                   # @main
 	.size	.L.str.2, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f6d893cb8..d9b6f8045 100644
--- a/test/torture-s/920730-1.c.s
+++ b/test/torture-s/920730-1.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -58,7 +58,7 @@ f4:                                     # @f4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -67,5 +67,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920731-1.c.s b/test/torture-s/920731-1.c.s
index 0fa9390f0..aae33adfd 100644
--- a/test/torture-s/920731-1.c.s
+++ b/test/torture-s/920731-1.c.s
@@ -8,37 +8,35 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	block   	
-	i32.const	$push3=, 1
-	i32.and 	$push0=, $0, $pop3
+	i32.const	$push2=, 1
+	i32.and 	$push0=, $0, $pop2
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.inc.preheader
-	i32.const	$1=, 0
+# %bb.1:                                # %for.inc.preheader
+	i32.const	$2=, 0
 .LBB0_2:                                # %for.inc
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	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
+	i32.const	$push4=, 1
+	i32.add 	$2=, $2, $pop4
+	i32.const	$push3=, 7
+	i32.gt_u	$push1=, $2, $pop3
+	br_if   	1, $pop1        # 1: down to label0
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
-	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
+	i32.const	$push6=, 2
+	i32.and 	$1=, $0, $pop6
+	i32.const	$push5=, 1
+	i32.shr_s	$0=, $0, $pop5
+	i32.eqz 	$push7=, $1
+	br_if   	0, $pop7        # 0: up to label1
 .LBB0_4:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push11=, $2
-                                        # fallthrough-return: $pop11
+	copy_local	$push8=, $2
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -49,7 +47,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -58,5 +56,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920810-1.c.s b/test/torture-s/920810-1.c.s
index 9c7ca8a24..1982464e0 100644
--- a/test/torture-s/920810-1.c.s
+++ b/test/torture-s/920810-1.c.s
@@ -8,17 +8,16 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$push0=, malloc@FUNCTION, $1
 	i32.load	$push1=, 8($0)
-	i32.call	$push4=, memcpy@FUNCTION, $pop0, $0, $pop1
-	tee_local	$push3=, $2=, $pop4
+	i32.call	$2=, memcpy@FUNCTION, $pop0, $0, $pop1
 	i32.const	$push2=, 0
-	i32.store	4($pop3), $pop2
+	i32.store	4($2), $pop2
 	i32.store	0($2), $0
 	i32.store	8($2), $1
-	copy_local	$push5=, $2
-                                        # fallthrough-return: $pop5
+	copy_local	$push3=, $2
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -29,7 +28,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -38,6 +37,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8a1fa1080..0dd8d4bf0 100644
--- a/test/torture-s/920812-1.c.s
+++ b/test/torture-s/920812-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.eq  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920829-1.c.s b/test/torture-s/920829-1.c.s
index ff772b21e..d9aeae1b0 100644
--- a/test/torture-s/920829-1.c.s
+++ b/test/torture-s/920829-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push6=, 0
 	i64.load	$push0=, c($pop6)
@@ -16,7 +16,7 @@ main:                                   # @main
 	i64.load	$push3=, c3($pop5)
 	i64.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 0
 	call    	exit@FUNCTION, $pop7
 	unreachable
@@ -47,6 +47,6 @@ c3:
 	.size	c3, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e0f211cf0..11278ca4b 100644
--- a/test/torture-s/920908-1.c.s
+++ b/test/torture-s/920908-1.c.s
@@ -8,38 +8,36 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop8, $pop10
-	tee_local	$push17=, $3=, $pop18
-	i32.store	__stack_pointer($pop11), $pop17
+	i32.sub 	$3=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $3
 	i32.const	$push0=, 4
-	i32.add 	$push16=, $1, $pop0
-	tee_local	$push15=, $2=, $pop16
-	i32.store	12($3), $pop15
+	i32.add 	$2=, $1, $pop0
+	i32.store	12($3), $2
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 10
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 8
 	i32.add 	$push5=, $1, $pop4
 	i32.store	12($3), $pop5
 	i32.load	$push6=, 0($2)
-	i32.const	$push19=, 20
-	i32.ne  	$push7=, $pop6, $pop19
+	i32.const	$push15=, 20
+	i32.ne  	$push7=, $pop6, $pop15
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end7
+# %bb.2:                                # %if.end7
 	i32.const	$push14=, 0
 	i32.const	$push12=, 16
 	i32.add 	$push13=, $3, $pop12
 	i32.store	__stack_pointer($pop14), $pop13
-	i32.const	$push20=, 20
-	return  	$pop20
+	i32.const	$push16=, 20
+	return  	$pop16
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -55,14 +53,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop2, $pop4
-	tee_local	$push6=, $0=, $pop7
-	i32.store	__stack_pointer($pop5), $pop6
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i64.const	$push0=, 85899345930
 	i64.store	0($0), $pop0
 	i32.call	$drop=, f@FUNCTION, $0, $0
@@ -74,6 +71,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 147d9e50e..3adbfee69 100644
--- a/test/torture-s/920908-2.c.s
+++ b/test/torture-s/920908-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 16
 	i32.shl 	$push2=, $pop0, $pop1
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920909-1.c.s b/test/torture-s/920909-1.c.s
index 8dccba5b4..29826225a 100644
--- a/test/torture-s/920909-1.c.s
+++ b/test/torture-s/920909-1.c.s
@@ -7,15 +7,14 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1026
-	i32.add 	$push10=, $0, $pop0
-	tee_local	$push9=, $0=, $pop10
+	i32.add 	$0=, $0, $pop0
+	block   	
 	i32.const	$push1=, 5
-	i32.gt_u	$push2=, $pop9, $pop1
+	i32.gt_u	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %switch.lookup
+# %bb.1:                                # %switch.lookup
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $0, $pop4
 	i32.const	$push6=, .Lswitch.table.f
@@ -36,7 +35,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -57,5 +56,5 @@ main:                                   # @main
 	.size	.Lswitch.table.f, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920922-1.c.s b/test/torture-s/920922-1.c.s
index de515e602..ddc48f3c3 100644
--- a/test/torture-s/920922-1.c.s
+++ b/test/torture-s/920922-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 22
 	i32.shr_u	$push2=, $pop0, $pop1
@@ -27,7 +27,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -36,5 +36,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/920929-1.c.s b/test/torture-s/920929-1.c.s
index ea8e0a4b9..3b45ff17a 100644
--- a/test/torture-s/920929-1.c.s
+++ b/test/torture-s/920929-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921006-1.c.s b/test/torture-s/921006-1.c.s
index 09fee2f01..082267520 100644
--- a/test/torture-s/921006-1.c.s
+++ b/test/torture-s/921006-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921007-1.c.s b/test/torture-s/921007-1.c.s
index e776017d4..c50674439 100644
--- a/test/torture-s/921007-1.c.s
+++ b/test/torture-s/921007-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921013-1.c.s b/test/torture-s/921013-1.c.s
index 37762dad5..6d37b939d 100644
--- a/test/torture-s/921013-1.c.s
+++ b/test/torture-s/921013-1.c.s
@@ -7,11 +7,11 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push9=, $3
-	br_if   	0, $pop9        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+	i32.eqz 	$push7=, $3
+	br_if   	0, $pop7        # 0: down to label0
+# %bb.1:                                # %while.body.preheader
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
@@ -19,21 +19,20 @@ f:                                      # @f
 	f32.load	$push0=, 0($2)
 	f32.eq  	$push2=, $pop1, $pop0
 	i32.store	0($0), $pop2
-	i32.const	$push8=, 4
-	i32.add 	$0=, $0, $pop8
-	i32.const	$push7=, 4
-	i32.add 	$2=, $2, $pop7
 	i32.const	$push6=, 4
-	i32.add 	$1=, $1, $pop6
-	i32.const	$push5=, -1
-	i32.add 	$push4=, $3, $pop5
-	tee_local	$push3=, $3=, $pop4
-	br_if   	0, $pop3        # 0: up to label1
+	i32.add 	$0=, $0, $pop6
+	i32.const	$push5=, 4
+	i32.add 	$2=, $2, $pop5
+	i32.const	$push4=, 4
+	i32.add 	$1=, $1, $pop4
+	i32.const	$push3=, -1
+	i32.add 	$3=, $3, $pop3
+	br_if   	0, $3           # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push10=, $0
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $3
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -44,7 +43,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond.3
+# %bb.0:                                # %for.cond.3
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -53,5 +52,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921016-1.c.s b/test/torture-s/921016-1.c.s
index 2a7d1f767..b028ed563 100644
--- a/test/torture-s/921016-1.c.s
+++ b/test/torture-s/921016-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921019-1.c.s b/test/torture-s/921019-1.c.s
index 89e4a5862..33b87a3da 100644
--- a/test/torture-s/921019-1.c.s
+++ b/test/torture-s/921019-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 0
 	i32.load	$push0=, foo($pop4)
@@ -14,7 +14,7 @@ main:                                   # @main
 	i32.const	$push2=, 88
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
 	unreachable
@@ -42,6 +42,6 @@ foo:
 	.size	foo, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 876856d65..3fb8506dd 100644
--- a/test/torture-s/921019-2.c.s
+++ b/test/torture-s/921019-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921029-1.c.s b/test/torture-s/921029-1.c.s
index 54778a250..06c41a11f 100644
--- a/test/torture-s/921029-1.c.s
+++ b/test/torture-s/921029-1.c.s
@@ -8,23 +8,20 @@ build:                                  # @build
 	.param  	i32, i32
 	.result 	i64
 	.local  	i64, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i64.extend_u/i32	$2=, $1
 	i32.const	$push0=, 0
-	i64.extend_u/i32	$push10=, $1
-	tee_local	$push9=, $2=, $pop10
-	i64.store	lpart($pop0), $pop9
-	i32.const	$push8=, 0
+	i64.store	lpart($pop0), $2
 	i64.extend_u/i32	$push1=, $0
 	i64.const	$push2=, 32
-	i64.shl 	$push7=, $pop1, $pop2
-	tee_local	$push6=, $3=, $pop7
-	i64.store	hpart($pop8), $pop6
-	i32.const	$push5=, 0
-	i64.or  	$push4=, $3, $2
-	tee_local	$push3=, $2=, $pop4
-	i64.store	back($pop5), $pop3
-	copy_local	$push11=, $2
-                                        # fallthrough-return: $pop11
+	i64.shl 	$3=, $pop1, $pop2
+	i32.const	$push4=, 0
+	i64.store	hpart($pop4), $3
+	i64.or  	$2=, $3, $2
+	i32.const	$push3=, 0
+	i64.store	back($pop3), $2
+	copy_local	$push5=, $2
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	build, .Lfunc_end0-build
@@ -35,7 +32,7 @@ build:                                  # @build
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end44
+# %bb.0:                                # %if.end44
 	i32.const	$push1=, 0
 	i64.const	$push0=, 4294967294
 	i64.store	lpart($pop1), $pop0
@@ -80,5 +77,5 @@ back:
 	.size	back, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921104-1.c.s b/test/torture-s/921104-1.c.s
index 6d1f004d2..ef7467da9 100644
--- a/test/torture-s/921104-1.c.s
+++ b/test/torture-s/921104-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921110-1.c.s b/test/torture-s/921110-1.c.s
index 8dc1d1769..c6f5080f3 100644
--- a/test/torture-s/921110-1.c.s
+++ b/test/torture-s/921110-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -24,6 +24,6 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c372047b4..164e6afd8 100644
--- a/test/torture-s/921112-1.c.s
+++ b/test/torture-s/921112-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	8($0), $pop0
 	copy_local	$push1=, $0
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i64.const	$push1=, 8589934593
 	i64.store	x+8($pop2), $pop1
@@ -32,12 +32,12 @@ main:                                   # @main
 	block   	
 	i32.const	$push5=, 0
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i64.const	$push0=, 8589934592
 	i64.const	$push8=, 8589934592
 	i64.ne  	$push3=, $pop0, $pop8
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -68,6 +68,6 @@ v:
 	.size	v, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e2a597729..1005aa367 100644
--- a/test/torture-s/921113-1.c.s
+++ b/test/torture-s/921113-1.c.s
@@ -8,7 +8,7 @@ w:                                      # @w
 	.param  	f32, f32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $2
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,16 +23,16 @@ f1:                                     # @f1
 	.param  	f32, f32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.const	$push2=, 0x0p0
 	f32.ne  	$push0=, $0, $pop2
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f32.const	$push3=, 0x0p0
 	f32.ne  	$push1=, $1, $pop3
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return  	$2
 .LBB1_3:                                # %if.then
 	end_block                       # label0:
@@ -50,16 +50,16 @@ f2:                                     # @f2
 	.param  	f32, f32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.const	$push2=, 0x1p0
 	f32.ne  	$push0=, $0, $pop2
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f32.const	$push3=, 0x1p0
 	f32.ne  	$push1=, $1, $pop3
 	br_if   	0, $pop1        # 0: down to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return  	$2
 .LBB2_3:                                # %if.then
 	end_block                       # label1:
@@ -77,54 +77,51 @@ gitter:                                 # @gitter
 	.param  	i32, i32, i32, i32, i32, f32
 	.result 	i32
 	.local  	f32, f64, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f32.load	$push1=, 0($4)
 	f32.const	$push23=, 0x0p0
 	f32.ne  	$push2=, $pop1, $pop23
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f32.load	$push0=, 4($4)
 	f32.const	$push24=, 0x0p0
 	f32.ne  	$push3=, $pop0, $pop24
 	br_if   	0, $pop3        # 0: down to label2
-# BB#2:                                 # %f1.exit
+# %bb.2:                                # %f1.exit
 	f32.load	$push5=, 8($4)
 	f32.const	$push25=, 0x1p0
 	f32.ne  	$push6=, $pop5, $pop25
 	br_if   	0, $pop6        # 0: down to label2
-# BB#3:                                 # %f1.exit
+# %bb.3:                                # %f1.exit
 	i32.const	$push7=, 12
 	i32.add 	$push8=, $4, $pop7
 	f32.load	$push4=, 0($pop8)
 	f32.const	$push26=, 0x1p0
 	f32.ne  	$push9=, $pop4, $pop26
 	br_if   	0, $pop9        # 0: down to label2
-# BB#4:                                 # %f2.exit
+# %bb.4:                                # %f2.exit
 	i32.const	$push10=, 0
 	i32.store	0($3), $pop10
+	f32.load	$6=, 0($1)
 	block   	
-	f32.load	$push28=, 0($1)
-	tee_local	$push27=, $6=, $pop28
 	f32.const	$push11=, 0x0p0
-	f32.gt  	$push12=, $pop27, $pop11
+	f32.gt  	$push12=, $6, $pop11
 	f32.ne  	$push13=, $6, $6
 	i32.or  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label3
-# BB#5:                                 # %if.then
+# %bb.5:                                # %if.then
 	f64.promote/f32	$push15=, $5
 	f64.const	$push16=, 0x1p-1
-	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.mul 	$7=, $pop15, $pop16
+	f64.promote/f32	$8=, $6
+	f64.lt  	$push17=, $7, $8
 	f64.ne  	$push18=, $7, $7
 	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
+# %bb.6:                                # %if.then15
 	i32.const	$push22=, 1065353216
 	i32.store	0($2), $pop22
 .LBB3_7:                                # %if.end18
@@ -145,14 +142,13 @@ gitter:                                 # @gitter
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push13=, $pop4, $pop6
-	tee_local	$push12=, $0=, $pop13
-	i32.store	__stack_pointer($pop7), $pop12
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push2=, pos
 	i32.const	$push8=, 8
 	i32.add 	$push9=, $0, $pop8
@@ -189,6 +185,6 @@ limit:
 	.size	limit, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 45737f623..1216e7232 100644
--- a/test/torture-s/921117-1.c.s
+++ b/test/torture-s/921117-1.c.s
@@ -8,14 +8,14 @@ check:                                  # @check
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 1
 	block   	
 	i32.load	$push0=, 12($0)
 	i32.const	$push1=, 99
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push3=, .L.str
 	i32.call	$1=, strcmp@FUNCTION, $0, $pop3
 .LBB0_2:                                # %return
@@ -32,7 +32,7 @@ check:                                  # @check
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %check.exit
+# %bb.0:                                # %check.exit
 	i32.const	$push13=, 0
 	i32.const	$push0=, 99
 	i32.store	cell+12($pop13), $pop0
@@ -53,7 +53,7 @@ main:                                   # @main
 	i32.const	$push4=, .L.str
 	i32.call	$push6=, strcmp@FUNCTION, $pop5, $pop4
 	br_if   	0, $pop6        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push14=, 0
 	call    	exit@FUNCTION, $pop14
 	unreachable
@@ -81,7 +81,7 @@ cell:
 	.size	cell, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d94fab15d..5eeb4628f 100644
--- a/test/torture-s/921123-1.c.s
+++ b/test/torture-s/921123-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load16_u	$push0=, 0($0)
 	i32.const	$push1=, -1
 	i32.add 	$push2=, $pop0, $pop1
@@ -26,7 +26,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -35,5 +35,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921123-2.c.s b/test/torture-s/921123-2.c.s
index 002a9713f..4957b16b4 100644
--- a/test/torture-s/921123-2.c.s
+++ b/test/torture-s/921123-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load16_u	$push0=, 4($0)
 	i32.store	b($pop1), $pop0
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 38
 	i32.store	a($pop1), $pop0
@@ -66,5 +66,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921124-1.c.s b/test/torture-s/921124-1.c.s
index 4d5c8fb18..31d362b41 100644
--- a/test/torture-s/921124-1.c.s
+++ b/test/torture-s/921124-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, f64, f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,24 +21,24 @@ f:                                      # @f
 g:                                      # @g
 	.param  	i32, i32, f64, f64, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, 0x1p0
 	f64.ne  	$push1=, $2, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.const	$push2=, 0x1p1
 	f64.ne  	$push3=, $3, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $4, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return  	$4
 .LBB1_5:                                # %if.then
 	end_block                       # label0:
@@ -54,7 +54,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %g.exit
+# %bb.0:                                # %g.exit
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -63,6 +63,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0bfbd9ef4..06f8d3695 100644
--- a/test/torture-s/921202-1.c.s
+++ b/test/torture-s/921202-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond
+# %bb.0:                                # %for.cond
 	i32.call	$drop=, exxit@FUNCTION
 	unreachable
 	.endfunc
@@ -20,7 +20,7 @@ main:                                   # @main
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ foo:                                    # @foo
 mpn_mul_1:                              # @mpn_mul_1
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -48,7 +48,7 @@ mpn_mul_1:                              # @mpn_mul_1
 mpn_print:                              # @mpn_print
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -62,7 +62,7 @@ mpn_print:                              # @mpn_print
 mpn_random2:                            # @mpn_random2
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -76,7 +76,7 @@ mpn_random2:                            # @mpn_random2
 mpn_cmp:                                # @mpn_cmp
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -89,7 +89,7 @@ mpn_cmp:                                # @mpn_cmp
 	.type	exxit,@function
 exxit:                                  # @exxit
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -98,5 +98,5 @@ exxit:                                  # @exxit
 	.size	exxit, .Lfunc_end6-exxit
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921202-2.c.s b/test/torture-s/921202-2.c.s
index c1b9a783d..f239c12f3 100644
--- a/test/torture-s/921202-2.c.s
+++ b/test/torture-s/921202-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.wrap/i64	$push0=, $0
 	i32.const	$push1=, 8
 	i32.shr_u	$push2=, $pop0, $pop1
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921204-1.c.s b/test/torture-s/921204-1.c.s
index 3d1ae8b92..ac819a6e0 100644
--- a/test/torture-s/921204-1.c.s
+++ b/test/torture-s/921204-1.c.s
@@ -6,11 +6,10 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push8=, 0($1)
-	tee_local	$push7=, $1=, $pop8
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($1)
 	i32.const	$push4=, 1310720
-	i32.or  	$push5=, $pop7, $pop4
+	i32.or  	$push5=, $1, $pop4
 	i32.const	$push2=, -1310721
 	i32.and 	$push3=, $1, $pop2
 	i32.const	$push0=, 1
@@ -28,7 +27,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -37,5 +36,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921207-1.c.s b/test/torture-s/921207-1.c.s
index 09b0455f3..fe9497169 100644
--- a/test/torture-s/921207-1.c.s
+++ b/test/torture-s/921207-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921208-1.c.s b/test/torture-s/921208-1.c.s
index 024c21c3c..5b9c6d54f 100644
--- a/test/torture-s/921208-1.c.s
+++ b/test/torture-s/921208-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.mul 	$push0=, $0, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f:                                      # @f
 Int:                                    # @Int
 	.param  	i32, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.call_indirect	$push0=, $1, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ Int:                                    # @Int
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -43,5 +43,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921208-2.c.s b/test/torture-s/921208-2.c.s
index f5f896497..c5b83b0fa 100644
--- a/test/torture-s/921208-2.c.s
+++ b/test/torture-s/921208-2.c.s
@@ -7,7 +7,7 @@
 g:                                      # @g
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ g:                                      # @g
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -43,5 +43,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921218-1.c.s b/test/torture-s/921218-1.c.s
index a78a80a19..a53a63809 100644
--- a/test/torture-s/921218-1.c.s
+++ b/test/torture-s/921218-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 255
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/921218-2.c.s b/test/torture-s/921218-2.c.s
index d86b7ccfc..2576593a6 100644
--- a/test/torture-s/921218-2.c.s
+++ b/test/torture-s/921218-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930106-1.c.s b/test/torture-s/930106-1.c.s
index 2e808200d..18046051f 100644
--- a/test/torture-s/930106-1.c.s
+++ b/test/torture-s/930106-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x1p0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,5 +41,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930111-1.c.s b/test/torture-s/930111-1.c.s
index 3b8c31855..876127784 100644
--- a/test/torture-s/930111-1.c.s
+++ b/test/torture-s/930111-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -21,23 +21,22 @@ main:                                   # @main
 wwrite:                                 # @wwrite
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i64.const	$push1=, -3
-	i64.add 	$push6=, $0, $pop1
-	tee_local	$push5=, $0=, $pop6
+	i64.add 	$0=, $0, $pop1
+	block   	
 	i64.const	$push2=, 44
-	i64.gt_u	$push3=, $pop5, $pop2
+	i64.gt_u	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	i32.wrap/i64	$push0=, $0
 	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	$push7=, 0
-	return  	$pop7
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB1_3:                                # %sw.default
 	end_block                       # label0:
 	i32.const	$push4=, 123
@@ -47,5 +46,5 @@ wwrite:                                 # @wwrite
 	.size	wwrite, .Lfunc_end1-wwrite
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930123-1.c.s b/test/torture-s/930123-1.c.s
index 50055aa4b..42458c5c4 100644
--- a/test/torture-s/930123-1.c.s
+++ b/test/torture-s/930123-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
 	copy_local	$push1=, $0
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930126-1.c.s b/test/torture-s/930126-1.c.s
index 2ae241c14..7c19506f7 100644
--- a/test/torture-s/930126-1.c.s
+++ b/test/torture-s/930126-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, -1099511627521
 	i64.and 	$push2=, $pop0, $pop1
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i64.load	$push1=, main.i($pop7)
@@ -48,5 +48,5 @@ main.i:
 	.size	main.i, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930208-1.c.s b/test/torture-s/930208-1.c.s
index 54484d5fa..79c83f294 100644
--- a/test/torture-s/930208-1.c.s
+++ b/test/torture-s/930208-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_u	$push0=, 3($0)
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $pop0, $pop1
@@ -34,7 +34,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -43,5 +43,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930406-1.c.s b/test/torture-s/930406-1.c.s
index c5e513e11..37862339d 100644
--- a/test/torture-s/930406-1.c.s
+++ b/test/torture-s/930406-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f@FUNCTION
 	unreachable
 	.endfunc
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930408-1.c.s b/test/torture-s/930408-1.c.s
index 2a6b65351..e560dcf4b 100644
--- a/test/torture-s/930408-1.c.s
+++ b/test/torture-s/930408-1.c.s
@@ -6,7 +6,7 @@
 	.type	p,@function
 p:                                      # @p
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -20,13 +20,13 @@ p:                                      # @p
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push1=, s($pop0)
 	i32.eqz 	$push2=, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %sw.epilog
+# %bb.1:                                # %sw.epilog
 	return  	$0
 .LBB1_2:                                # %sw.bb
 	end_block                       # label0:
@@ -42,7 +42,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	s($pop1), $pop0
@@ -64,6 +64,6 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 935fabe88..45208752d 100644
--- a/test/torture-s/930429-1.c.s
+++ b/test/torture-s/930429-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930429-2.c.s b/test/torture-s/930429-2.c.s
index 32e063fe2..6bb44d182 100644
--- a/test/torture-s/930429-2.c.s
+++ b/test/torture-s/930429-2.c.s
@@ -7,12 +7,10 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
-	i32.shr_s	$push1=, $0, $pop0
-	i32.const	$push2=, 0
-	i32.gt_s	$push3=, $pop1, $pop2
-                                        # fallthrough-return: $pop3
+	i32.gt_s	$push1=, $0, $pop0
+                                        # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -23,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -32,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930513-1.c.s b/test/torture-s/930513-1.c.s
index 714a0df07..48f3ff582 100644
--- a/test/torture-s/930513-1.c.s
+++ b/test/torture-s/930513-1.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop3, $pop5
-	tee_local	$push10=, $1=, $pop11
-	i32.store	__stack_pointer($pop6), $pop10
+	i32.sub 	$1=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $1
 	i64.const	$push0=, 4617315517961601024
 	i64.store	0($1), $pop0
 	i32.const	$push2=, buf
@@ -25,8 +24,8 @@ f:                                      # @f
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $1, $pop7
 	i32.store	__stack_pointer($pop9), $pop8
-	copy_local	$push12=, $1
-                                        # fallthrough-return: $pop12
+	copy_local	$push10=, $1
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -38,14 +37,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push16=, $pop10, $pop12
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop13), $pop15
+	i32.sub 	$0=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $0
 	i64.const	$push1=, 4617315517961601024
 	i64.store	0($0), $pop1
 	i32.const	$push3=, buf
@@ -57,13 +55,13 @@ main:                                   # @main
 	i32.const	$push5=, 53
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push17=, 0
-	i32.load8_u	$push0=, buf+1($pop17)
+# %bb.1:                                # %entry
+	i32.const	$push15=, 0
+	i32.load8_u	$push0=, buf+1($pop15)
 	i32.const	$push7=, 255
 	i32.and 	$push8=, $pop0, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -90,7 +88,7 @@ buf:
 	.size	.L.str, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 dc2e60d33..8408e8365 100644
--- a/test/torture-s/930513-2.c.s
+++ b/test/torture-s/930513-2.c.s
@@ -8,7 +8,7 @@ sub3:                                   # @sub3
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -22,13 +22,13 @@ sub3:                                   # @sub3
 eq:                                     # @eq
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 0
 	i32.load	$push0=, eq.i($pop4)
 	i32.ne  	$push1=, $pop0, $0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $0, $pop2
@@ -48,12 +48,12 @@ eq:                                     # @eq
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, eq.i($pop2)
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %eq.exit.3
+# %bb.1:                                # %eq.exit.3
 	i32.const	$push4=, 0
 	i32.const	$push1=, 4
 	i32.store	eq.i($pop4), $pop1
@@ -76,6 +76,6 @@ eq.i:
 	.size	eq.i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b7076d5ee..4e3575921 100644
--- a/test/torture-s/930518-1.c.s
+++ b/test/torture-s/930518-1.c.s
@@ -8,53 +8,50 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push8=, 0
+	i32.load	$2=, bar($pop8)
 	block   	
-	i32.const	$push10=, 0
-	i32.load	$push9=, bar($pop10)
-	tee_local	$push8=, $2=, $pop9
 	i32.const	$push7=, 1
-	i32.gt_s	$push0=, $pop8, $pop7
+	i32.gt_s	$push0=, $2, $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
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push12=, 2
+	i32.sub 	$1=, $pop12, $2
+	i32.store	0($0), $1
+	i32.const	$push11=, 0
+	i32.const	$push10=, 1
+	i32.store	bar($pop11), $pop10
+	i32.const	$push9=, 2
+	i32.lt_s	$push1=, $1, $pop9
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %while.body.preheader
-	i32.const	$push17=, 4
-	i32.add 	$0=, $0, $pop17
+# %bb.2:                                # %while.body.preheader
+	i32.const	$push13=, 4
+	i32.add 	$0=, $0, $pop13
 	i32.const	$push2=, 3
 	i32.sub 	$2=, $pop2, $2
 .LBB0_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push23=, -2
-	i32.add 	$push3=, $2, $pop23
+	i32.const	$push17=, -2
+	i32.add 	$push3=, $2, $pop17
 	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
+	i32.const	$push16=, 4
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, -1
+	i32.add 	$2=, $2, $pop15
+	i32.const	$push14=, 2
+	i32.gt_s	$push4=, $2, $pop14
 	br_if   	0, $pop4        # 0: up to label1
-# BB#4:                                 # %while.end.loopexit
+# %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	$push24=, $0
-                                        # fallthrough-return: $pop24
+	copy_local	$push18=, $2
+                                        # fallthrough-return: $pop18
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -66,69 +63,65 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	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($pop15), $pop22
+	i32.sub 	$3=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $3
 	i64.const	$push0=, 0
 	i64.store	8($3):p2align=2, $pop0
+	i32.const	$push19=, 0
+	i32.load	$0=, bar($pop19)
 	block   	
-	i32.const	$push21=, 0
-	i32.load	$push20=, bar($pop21)
-	tee_local	$push19=, $0=, $pop20
 	i32.const	$push18=, 1
-	i32.gt_s	$push1=, $pop19, $pop18
+	i32.gt_s	$push1=, $0, $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
+# %bb.1:                                # %while.body.lr.ph.i
+	i32.const	$push23=, 0
+	i32.const	$push22=, 1
+	i32.store	bar($pop23), $pop22
+	i32.const	$push21=, 2
+	i32.sub 	$2=, $pop21, $0
+	i32.store	8($3), $2
+	i32.const	$push20=, 2
+	i32.lt_s	$push2=, $2, $pop20
 	br_if   	0, $pop2        # 0: down to label2
-# BB#2:                                 # %while.body.i.preheader
+# %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
+	i32.const	$push24=, 4
+	i32.add 	$1=, $pop17, $pop24
 .LBB1_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push36=, -2
-	i32.add 	$push4=, $2, $pop36
+	i32.const	$push28=, -2
+	i32.add 	$push4=, $2, $pop28
 	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
+	i32.const	$push27=, 4
+	i32.add 	$1=, $1, $pop27
+	i32.const	$push26=, -1
+	i32.add 	$2=, $2, $pop26
+	i32.const	$push25=, 2
+	i32.gt_s	$push5=, $2, $pop25
 	br_if   	0, $pop5        # 0: up to label3
-# BB#4:                                 # %f.exit
+# %bb.4:                                # %f.exit
 	end_loop
 	i32.const	$push7=, 0
-	i32.const	$push37=, 1
-	i32.store	bar($pop7), $pop37
+	i32.const	$push29=, 1
+	i32.store	bar($pop7), $pop29
 	br_if   	0, $0           # 0: down to label2
-# BB#5:                                 # %f.exit
+# %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
+	i32.const	$push30=, 1
+	i32.ne  	$push10=, $pop6, $pop30
 	br_if   	0, $pop10       # 0: down to label2
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	i32.const	$push11=, 0
 	call    	exit@FUNCTION, $pop11
 	unreachable
@@ -150,6 +143,6 @@ bar:
 	.size	bar, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8b73030cf..54121f8db 100644
--- a/test/torture-s/930526-1.c.s
+++ b/test/torture-s/930526-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930527-1.c.s b/test/torture-s/930527-1.c.s
index cb26a5126..eca588828 100644
--- a/test/torture-s/930527-1.c.s
+++ b/test/torture-s/930527-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.shr_u	$push1=, $0, $pop0
 	i32.const	$push2=, 175
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -32,5 +32,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930529-1.c.s b/test/torture-s/930529-1.c.s
index 808d27f1c..b58021d06 100644
--- a/test/torture-s/930529-1.c.s
+++ b/test/torture-s/930529-1.c.s
@@ -7,7 +7,7 @@
 dd:                                     # @dd
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.div_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,14 +20,16 @@ dd:                                     # @dd
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	call    	exit@FUNCTION, $pop0
-	unreachable
+# %bb.0:                                # %entry
+.LBB1_1:                                # %if.end44
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	i32             # label0:
+	br      	0               # 0: up to label0
+.LBB1_2:
+	end_loop
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
-	.functype	exit, void, i32
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/930603-1.c.s b/test/torture-s/930603-1.c.s
index a7425cd5d..0faed24a8 100644
--- a/test/torture-s/930603-1.c.s
+++ b/test/torture-s/930603-1.c.s
@@ -7,7 +7,7 @@
 fx:                                     # @fx
 	.param  	f64
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push4=, 0x1.8p1
 	f32.demote/f64	$push0=, $0
 	f64.promote/f32	$push1=, $pop0
@@ -28,7 +28,7 @@ fx:                                     # @fx
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -42,7 +42,7 @@ main:                                   # @main
 	.type	inita,@function
 inita:                                  # @inita
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.const	$push0=, 0x1.8p1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -55,7 +55,7 @@ inita:                                  # @inita
 	.type	initc,@function
 initc:                                  # @initc
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.const	$push0=, 0x1p2
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -69,7 +69,7 @@ initc:                                  # @initc
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -77,5 +77,5 @@ f:                                      # @f
 	.size	f, .Lfunc_end4-f
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930603-2.c.s b/test/torture-s/930603-2.c.s
index ddb66a2ef..812346901 100644
--- a/test/torture-s/930603-2.c.s
+++ b/test/torture-s/930603-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %for.inc.1.1
+# %bb.0:                                # %for.inc.1.1
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	w+12($pop1), $pop0
@@ -26,7 +26,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.const	$push0=, 1
 	i32.store	w+12($pop8), $pop0
@@ -40,7 +40,7 @@ main:                                   # @main
 	i32.load	$push1=, w+8($pop4)
 	i32.or  	$push3=, $pop2, $pop1
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -62,6 +62,6 @@ w:
 	.size	w, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 355021faf..130ecf6e4 100644
--- a/test/torture-s/930603-3.c.s
+++ b/test/torture-s/930603-3.c.s
@@ -8,18 +8,18 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 1
 	block   	
 	block   	
 	i32.const	$push0=, 100
 	i32.eq  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 107
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	1, $pop3        # 1: down to label0
-# BB#2:                                 # %sw.bb3
+# %bb.2:                                # %sw.bb3
 	i32.const	$push4=, 3
 	i32.add 	$0=, $0, $pop4
 	i32.const	$2=, 4
@@ -42,7 +42,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -51,6 +51,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 58a361b34..27f586c92 100644
--- a/test/torture-s/930608-1.c.s
+++ b/test/torture-s/930608-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	f64
 	.result 	f64
 	.local  	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,5 +39,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930614-1.c.s b/test/torture-s/930614-1.c.s
index 9f1fffd1d..690daac10 100644
--- a/test/torture-s/930614-1.c.s
+++ b/test/torture-s/930614-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -4616189618054758400
 	i64.store	0($0), $pop0
 	copy_local	$push1=, $0
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930614-2.c.s b/test/torture-s/930614-2.c.s
index 8d701a926..7de0831f2 100644
--- a/test/torture-s/930614-2.c.s
+++ b/test/torture-s/930614-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930621-1.c.s b/test/torture-s/930621-1.c.s
index cee504883..9ecd054cc 100644
--- a/test/torture-s/930621-1.c.s
+++ b/test/torture-s/930621-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 20
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930622-1.c.s b/test/torture-s/930622-1.c.s
index b01c75bb4..43ce95cc8 100644
--- a/test/torture-s/930622-1.c.s
+++ b/test/torture-s/930622-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ h:                                      # @h
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ h:                                      # @h
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	a($pop0), $pop2
@@ -50,7 +50,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	a($pop0), $pop2
@@ -80,5 +80,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930622-2.c.s b/test/torture-s/930622-2.c.s
index 8e295ce4d..fe2714bba 100644
--- a/test/torture-s/930622-2.c.s
+++ b/test/torture-s/930622-2.c.s
@@ -7,27 +7,24 @@
 ll_to_ld:                               # @ll_to_ld
 	.param  	i32, i64
 	.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 	$push14=, $pop5, $pop7
-	tee_local	$push13=, $2=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
+	i32.const	$push6=, 16
+	i32.sub 	$2=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $2
 	call    	__floatditf@FUNCTION, $2, $1
 	i32.const	$push0=, 8
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push12=, 8
-	i32.add 	$push2=, $2, $pop12
-	i64.load	$push3=, 0($pop2)
-	i64.store	0($pop1), $pop3
-	i64.load	$push4=, 0($2)
-	i64.store	0($0), $pop4
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $2, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
+	i32.add 	$push1=, $2, $pop0
+	i64.load	$push2=, 0($pop1)
+	i64.store	8($0), $pop2
+	i64.load	$push3=, 0($2)
+	i64.store	0($0), $pop3
+	i32.const	$push10=, 0
+	i32.const	$push8=, 16
+	i32.add 	$push9=, $2, $pop8
+	i32.store	__stack_pointer($pop10), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -40,7 +37,7 @@ ll_to_ld:                               # @ll_to_ld
 ld_to_ll:                               # @ld_to_ll
 	.param  	i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.call	$push0=, __fixtfdi@FUNCTION, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -53,7 +50,7 @@ ld_to_ll:                               # @ld_to_ll
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -62,5 +59,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930628-1.c.s b/test/torture-s/930628-1.c.s
index 7f04299c8..2cf2b265d 100644
--- a/test/torture-s/930628-1.c.s
+++ b/test/torture-s/930628-1.c.s
@@ -7,11 +7,11 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eq  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,107 +28,103 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$1=, -1
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
+	i32.const	$1=, 0
 .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:                                 # %if.else
+	i32.eqz 	$push17=, $0
+	br_if   	0, $pop17       # 0: down to label3
+# %bb.2:                                # %if.else
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.eqz 	$push26=, $0
-	br_if   	2, $pop26       # 2: down to label1
-.LBB1_3:                                # %if.end.1.1
+	i32.eqz 	$push18=, $0
+	br_if   	2, $pop18       # 2: down to label1
+.LBB1_3:                                # %for.inc36.1.1
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label3:
-	i32.const	$push9=, -64
-	i32.add 	$0=, $0, $pop9
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $1, $pop8
-	tee_local	$push6=, $1=, $pop7
-	i32.const	$push5=, 3
-	i32.lt_u	$push0=, $pop6, $pop5
+	i32.const	$push7=, -64
+	i32.add 	$0=, $0, $pop7
+	i32.const	$push6=, 1
+	i32.add 	$1=, $1, $pop6
+	i32.const	$push5=, 4
+	i32.lt_u	$push0=, $1, $pop5
 	br_if   	0, $pop0        # 0: up to label2
-# BB#4:                                 # %for.inc45
+# %bb.4:                                # %for.inc45
 	end_loop
 	i32.const	$0=, 0
-	i32.const	$1=, 0
+	i32.const	$1=, 1
 .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:                                 # %if.else.1
+	i32.eqz 	$push19=, $0
+	br_if   	0, $pop19       # 0: down to label5
+# %bb.6:                                # %if.else.1
                                         #   in Loop: Header=BB1_5 Depth=1
-	i32.eqz 	$push28=, $0
-	br_if   	2, $pop28       # 2: down to label1
-.LBB1_7:                                # %if.end.1.1.1
+	i32.eqz 	$push20=, $0
+	br_if   	2, $pop20       # 2: down to label1
+.LBB1_7:                                # %for.inc36.1.1.1
                                         #   in Loop: Header=BB1_5 Depth=1
 	end_block                       # label5:
-	i32.const	$push14=, -64
-	i32.add 	$0=, $0, $pop14
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.const	$push10=, 3
-	i32.lt_u	$push1=, $pop11, $pop10
+	i32.const	$push10=, -64
+	i32.add 	$0=, $0, $pop10
+	i32.const	$push9=, 1
+	i32.add 	$1=, $1, $pop9
+	i32.const	$push8=, 4
+	i32.lt_u	$push1=, $1, $pop8
 	br_if   	0, $pop1        # 0: up to label4
-# BB#8:                                 # %for.inc45.1
+# %bb.8:                                # %for.inc45.1
 	end_loop
+	i32.const	$1=, 2
 	i32.const	$0=, 0
-	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:                                # %if.else.2
+	i32.eqz 	$push21=, $0
+	br_if   	0, $pop21       # 0: down to label7
+# %bb.10:                               # %if.else.2
                                         #   in Loop: Header=BB1_9 Depth=1
-	i32.eqz 	$push30=, $0
-	br_if   	2, $pop30       # 2: down to label1
-.LBB1_11:                               # %if.end.1.1.2
+	i32.eqz 	$push22=, $0
+	br_if   	2, $pop22       # 2: down to label1
+.LBB1_11:                               # %for.inc36.1.1.2
                                         #   in Loop: Header=BB1_9 Depth=1
 	end_block                       # label7:
-	i32.const	$push19=, -64
-	i32.add 	$0=, $0, $pop19
-	i32.const	$push18=, 1
-	i32.add 	$push17=, $1, $pop18
-	tee_local	$push16=, $1=, $pop17
-	i32.const	$push15=, 3
-	i32.lt_u	$push2=, $pop16, $pop15
+	i32.const	$push13=, -64
+	i32.add 	$0=, $0, $pop13
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
+	i32.const	$push11=, 4
+	i32.lt_u	$push2=, $1, $pop11
 	br_if   	0, $pop2        # 0: up to label6
-# BB#12:                                # %for.inc45.2
+# %bb.12:                               # %for.inc45.2
 	end_loop
-	i32.const	$1=, 2
+	i32.const	$1=, 3
 	i32.const	$0=, 0
 .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:                                # %if.else.3
+	i32.eqz 	$push23=, $0
+	br_if   	0, $pop23       # 0: down to label9
+# %bb.14:                               # %if.else.3
                                         #   in Loop: Header=BB1_13 Depth=1
-	i32.eqz 	$push32=, $0
-	br_if   	2, $pop32       # 2: down to label1
-.LBB1_15:                               # %if.end.1.1.3
+	i32.eqz 	$push24=, $0
+	br_if   	2, $pop24       # 2: down to label1
+.LBB1_15:                               # %for.inc36.1.1.3
                                         #   in Loop: Header=BB1_13 Depth=1
 	end_block                       # label9:
-	i32.const	$push24=, -64
-	i32.add 	$0=, $0, $pop24
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $1, $pop23
-	tee_local	$push21=, $1=, $pop22
-	i32.const	$push20=, 3
-	i32.lt_u	$push3=, $pop21, $pop20
+	i32.const	$push16=, -64
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$1=, $1, $pop15
+	i32.const	$push14=, 4
+	i32.lt_u	$push3=, $1, $pop14
 	br_if   	0, $pop3        # 0: up to label8
-# BB#16:                                # %for.inc45.3
+# %bb.16:                               # %for.inc45.3
 	end_loop
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
@@ -142,6 +138,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c2c870bb2..87325bcd0 100644
--- a/test/torture-s/930630-1.c.s
+++ b/test/torture-s/930630-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -21,12 +21,12 @@ main:                                   # @main
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 7
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -37,6 +37,6 @@ f:                                      # @f
 	.size	f, .Lfunc_end1-f
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 153e0446d..41428f97c 100644
--- a/test/torture-s/930702-1.c.s
+++ b/test/torture-s/930702-1.c.s
@@ -7,16 +7,16 @@
 fp:                                     # @fp
 	.param  	f64, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, 0x1.08p5
 	f64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 11
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return  	$1
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -32,7 +32,7 @@ fp:                                     # @fp
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,6 +41,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 470315739..c4469f320 100644
--- a/test/torture-s/930713-1.c.s
+++ b/test/torture-s/930713-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 17
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930718-1.c.s b/test/torture-s/930718-1.c.s
index 9bae59cde..7a93b8c1b 100644
--- a/test/torture-s/930718-1.c.s
+++ b/test/torture-s/930718-1.c.s
@@ -5,7 +5,7 @@
 	.globl	f2
 	.type	f2,@function
 f2:                                     # @f2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -18,7 +18,7 @@ f2:                                     # @f2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %lor.lhs.false
+# %bb.0:                                # %lor.lhs.false
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -27,6 +27,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 eea024e30..2c4bcab2f 100644
--- a/test/torture-s/930719-1.c.s
+++ b/test/torture-s/930719-1.c.s
@@ -7,16 +7,16 @@
 f:                                      # @f
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	br_if   	0, $0           # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	1, $pop1        # 1: down to label1
-# BB#2:                                 # %sw.bb.split
+# %bb.2:                                # %sw.bb.split
 	i32.eqz 	$push3=, $2
 	br_if   	2, $pop3        # 2: down to label0
 .LBB0_3:                                # %cleanup
@@ -43,7 +43,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -52,5 +52,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930725-1.c.s b/test/torture-s/930725-1.c.s
index 19e707cde..837d4608b 100644
--- a/test/torture-s/930725-1.c.s
+++ b/test/torture-s/930725-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, .L.str.1
 	i32.const	$push2=, .L.str
 	i32.const	$push0=, 0
@@ -36,7 +36,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	v($pop1), $pop0
@@ -69,5 +69,5 @@ v:
 	.size	.L.str.1, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930818-1.c.s b/test/torture-s/930818-1.c.s
index 2b4aaf562..f4c3f6571 100644
--- a/test/torture-s/930818-1.c.s
+++ b/test/torture-s/930818-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930916-1.c.s b/test/torture-s/930916-1.c.s
index 783de5195..5826cf4a7 100644
--- a/test/torture-s/930916-1.c.s
+++ b/test/torture-s/930916-1.c.s
@@ -7,12 +7,12 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -37,6 +37,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fa776d7f9..77cf0f7cf 100644
--- a/test/torture-s/930921-1.c.s
+++ b/test/torture-s/930921-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.extend_u/i32	$push0=, $0
 	i64.const	$push1=, 2863311531
 	i64.mul 	$push2=, $pop0, $pop1
@@ -26,7 +26,7 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	i64.const	$0=, 0
 .LBB1_1:                                # %for.body
@@ -40,17 +40,16 @@ main:                                   # @main
 	i32.wrap/i64	$push2=, $pop1
 	i32.ne  	$push3=, $pop0, $pop2
 	br_if   	1, $pop3        # 1: down to label0
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	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	$push10=, 1
+	i32.add 	$1=, $1, $pop10
+	i64.const	$push9=, 2863311531
+	i64.add 	$0=, $0, $pop9
 	i32.const	$push8=, 9999
-	i32.le_u	$push4=, $pop9, $pop8
+	i32.le_u	$push4=, $1, $pop8
 	br_if   	0, $pop4        # 0: up to label1
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
@@ -64,6 +63,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 993e6977f..308ddcc5d 100644
--- a/test/torture-s/930929-1.c.s
+++ b/test/torture-s/930929-1.c.s
@@ -7,7 +7,7 @@
 sub1:                                   # @sub1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, -5
@@ -24,7 +24,7 @@ sub1:                                   # @sub1
 sub2:                                   # @sub2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 5
@@ -41,7 +41,7 @@ sub2:                                   # @sub2
 sub3:                                   # @sub3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -5
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -55,7 +55,7 @@ sub3:                                   # @sub3
 sub4:                                   # @sub4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 5
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -68,7 +68,7 @@ sub4:                                   # @sub4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -77,5 +77,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/930930-1.c.s b/test/torture-s/930930-1.c.s
index ac62e3fdc..f78ea1ebd 100644
--- a/test/torture-s/930930-1.c.s
+++ b/test/torture-s/930930-1.c.s
@@ -8,40 +8,37 @@ f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.lt_u	$push0=, $3, $4
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %if.end.preheader
+# %bb.1:                                # %if.end.preheader
 	copy_local	$6=, $0
 .LBB0_2:                                # %if.end
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
+	i32.load	$5=, 0($3)
 	block   	
-	i32.load	$push6=, 0($3)
-	tee_local	$push5=, $5=, $pop6
-	i32.ge_u	$push1=, $pop5, $2
+	i32.ge_u	$push1=, $5, $2
 	br_if   	0, $pop1        # 0: down to label3
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.lt_u	$push2=, $5, $1
 	br_if   	0, $pop2        # 0: down to label3
-# BB#4:                                 # %if.then3
+# %bb.4:                                # %if.then3
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push9=, -4
-	i32.add 	$push8=, $6, $pop9
-	tee_local	$push7=, $6=, $pop8
-	i32.store	0($pop7), $5
+	i32.const	$push5=, -4
+	i32.add 	$6=, $6, $pop5
+	i32.store	0($6), $5
 .LBB0_5:                                # %if.end4
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
-	i32.const	$push12=, -4
-	i32.add 	$push11=, $3, $pop12
-	tee_local	$push10=, $3=, $pop11
-	i32.ge_u	$push3=, $pop10, $4
+	i32.const	$push6=, -4
+	i32.add 	$3=, $3, $pop6
+	i32.ge_u	$push3=, $3, $4
 	br_if   	0, $pop3        # 0: up to label2
-# BB#6:                                 # %out
+# %bb.6:                                # %out
 	end_loop
 	i32.ne  	$push4=, $6, $0
 	br_if   	1, $pop4        # 1: down to label0
@@ -62,7 +59,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, mem
 	i32.store	mem+396($pop1), $pop0
@@ -116,6 +113,6 @@ wm_SPB:
 	.size	wm_SPB, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d1289e52b..a21bea805 100644
--- a/test/torture-s/930930-2.c.s
+++ b/test/torture-s/930930-2.c.s
@@ -6,7 +6,7 @@
 	.type	test_endianness,@function
 test_endianness:                        # @test_endianness
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,14 +20,13 @@ test_endianness:                        # @test_endianness
 test_endianness_vol:                    # @test_endianness_vol
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push8=, $pop4, $pop6
-	tee_local	$push7=, $0=, $pop8
+	i32.sub 	$0=, $pop4, $pop6
 	i64.const	$push0=, 4621819117588971520
-	i64.store	8($pop7), $pop0
+	i64.store	8($0), $pop0
 	i32.load	$push2=, 8($0)
 	i32.const	$push1=, 0
 	i32.ne  	$push3=, $pop2, $pop1
@@ -43,20 +42,19 @@ test_endianness_vol:                    # @test_endianness_vol
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $0=, $pop8
-	i32.store	__stack_pointer($pop6), $pop7
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i64.const	$push0=, 4621819117588971520
 	i64.store	8($0), $pop0
 	block   	
 	i32.load	$push1=, 8($0)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -69,6 +67,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 271f51f2f..b10698f78 100644
--- a/test/torture-s/931004-1.c.s
+++ b/test/torture-s/931004-1.c.s
@@ -7,24 +7,24 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 10
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 11
 	i32.ne  	$push3=, $2, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push4=, 12
 	i32.ne  	$push5=, $3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %if.end10
+# %bb.3:                                # %if.end10
 	i32.const	$push6=, 123
 	i32.ne  	$push7=, $4, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#4:                                 # %if.end13
+# %bb.4:                                # %if.end13
 	return  	$2
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -40,7 +40,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -49,6 +49,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e0cde6274..2bcfd1b08 100644
--- a/test/torture-s/931004-10.c.s
+++ b/test/torture-s/931004-10.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push17=, 0
+# %bb.0:                                # %entry
 	i32.const	$push15=, 0
 	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
-	i32.sub 	$push24=, $pop14, $pop16
-	tee_local	$push23=, $4=, $pop24
-	i32.store	__stack_pointer($pop17), $pop23
+	i32.sub 	$4=, $pop14, $pop16
+	i32.const	$push17=, 0
+	i32.store	__stack_pointer($pop17), $4
 	i32.const	$push22=, 4
 	i32.add 	$push1=, $1, $pop22
 	i32.store	12($4), $pop1
@@ -24,7 +23,7 @@ f:                                      # @f
 	i32.const	$push21=, 1
 	i32.lt_s	$push2=, $0, $pop21
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -32,26 +31,26 @@ f:                                      # @f
 	i32.load8_s	$push3=, 0($1)
 	i32.ne  	$push4=, $2, $pop3
 	br_if   	2, $pop4        # 2: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push26=, 10
-	i32.add 	$push5=, $2, $pop26
-	i32.const	$push25=, 1
-	i32.add 	$push6=, $1, $pop25
+	i32.const	$push24=, 10
+	i32.add 	$push5=, $2, $pop24
+	i32.const	$push23=, 1
+	i32.add 	$push6=, $1, $pop23
 	i32.load8_s	$push7=, 0($pop6)
 	i32.ne  	$push8=, $pop5, $pop7
 	br_if   	2, $pop8        # 2: down to label0
-# BB#4:                                 # %for.cond
+# %bb.4:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push30=, 8
-	i32.add 	$push9=, $1, $pop30
+	i32.const	$push28=, 8
+	i32.add 	$push9=, $1, $pop28
 	i32.store	12($4), $pop9
-	i32.const	$push29=, 4
-	i32.add 	$1=, $1, $pop29
-	i32.const	$push28=, -9
-	i32.add 	$3=, $2, $pop28
-	i32.const	$push27=, 1
-	i32.add 	$push0=, $2, $pop27
+	i32.const	$push27=, 4
+	i32.add 	$1=, $1, $pop27
+	i32.const	$push26=, -9
+	i32.add 	$3=, $2, $pop26
+	i32.const	$push25=, 1
+	i32.add 	$push0=, $2, $pop25
 	copy_local	$2=, $pop0
 	i32.lt_s	$push10=, $3, $0
 	br_if   	0, $pop10       # 0: up to label2
@@ -62,7 +61,7 @@ f:                                      # @f
 	i32.const	$push12=, 123
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#6:                                 # %if.end16
+# %bb.6:                                # %if.end16
 	i32.const	$push20=, 0
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $4, $pop18
@@ -83,14 +82,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $0
 	i32.const	$push0=, 5130
 	i32.store16	24($0), $pop0
 	i32.const	$push1=, 369890571
@@ -122,6 +120,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 87a107793..f593580a6 100644
--- a/test/torture-s/931004-11.c.s
+++ b/test/torture-s/931004-11.c.s
@@ -7,57 +7,57 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($1)
 	i32.const	$push1=, 10
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load8_u	$push3=, 1($1)
 	i32.const	$push4=, 20
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.load8_u	$push6=, 2($1)
 	i32.const	$push7=, 30
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.load8_u	$push9=, 0($2)
 	i32.const	$push10=, 11
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end17
+# %bb.4:                                # %if.end17
 	i32.load8_u	$push12=, 1($2)
 	i32.const	$push13=, 21
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %if.end23
+# %bb.5:                                # %if.end23
 	i32.load8_u	$push15=, 2($2)
 	i32.const	$push16=, 31
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %if.end29
+# %bb.6:                                # %if.end29
 	i32.load8_u	$push18=, 0($3)
 	i32.const	$push19=, 12
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#7:                                 # %if.end35
+# %bb.7:                                # %if.end35
 	i32.load8_u	$push21=, 1($3)
 	i32.const	$push22=, 22
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#8:                                 # %if.end41
+# %bb.8:                                # %if.end41
 	i32.load8_u	$push24=, 2($3)
 	i32.const	$push25=, 32
 	i32.ne  	$push26=, $pop24, $pop25
 	br_if   	0, $pop26       # 0: down to label0
-# BB#9:                                 # %if.end47
+# %bb.9:                                # %if.end47
 	i32.const	$push27=, 123
 	i32.ne  	$push28=, $4, $pop27
 	br_if   	0, $pop28       # 0: down to label0
-# BB#10:                                # %if.end51
+# %bb.10:                               # %if.end51
 	return  	$2
 .LBB0_11:                               # %if.then
 	end_block                       # label0:
@@ -74,14 +74,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $0
 	i32.const	$push0=, 186520586
 	i32.store	16($0), $pop0
 	i32.const	$push22=, 12
@@ -132,6 +131,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 48bfc7320..ac0906f29 100644
--- a/test/torture-s/931004-12.c.s
+++ b/test/torture-s/931004-12.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $3
 	i32.const	$push26=, 4
 	i32.add 	$push1=, $1, $pop26
 	i32.store	12($3), $pop1
@@ -24,45 +23,44 @@ f:                                      # @f
 	i32.const	$push25=, 1
 	i32.lt_s	$push2=, $0, $pop25
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push29=, 10
-	i32.add 	$push3=, $2, $pop29
+	i32.const	$push27=, 10
+	i32.add 	$push3=, $2, $pop27
 	i32.load8_s	$push4=, 0($1)
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	2, $pop5        # 2: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push31=, 20
-	i32.add 	$push7=, $2, $pop31
-	i32.const	$push30=, 1
-	i32.add 	$push8=, $1, $pop30
+	i32.const	$push29=, 20
+	i32.add 	$push7=, $2, $pop29
+	i32.const	$push28=, 1
+	i32.add 	$push8=, $1, $pop28
 	i32.load8_s	$push9=, 0($pop8)
 	i32.ne  	$push10=, $pop7, $pop9
 	br_if   	2, $pop10       # 2: down to label0
-# BB#4:                                 # %if.end9
+# %bb.4:                                # %if.end9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push33=, 30
-	i32.add 	$push11=, $2, $pop33
-	i32.const	$push32=, 2
-	i32.add 	$push6=, $1, $pop32
+	i32.const	$push31=, 30
+	i32.add 	$push11=, $2, $pop31
+	i32.const	$push30=, 2
+	i32.add 	$push6=, $1, $pop30
 	i32.load8_s	$push0=, 0($pop6)
 	i32.ne  	$push12=, $pop11, $pop0
 	br_if   	2, $pop12       # 2: down to label0
-# BB#5:                                 # %for.cond
+# %bb.5:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push38=, 8
-	i32.add 	$push13=, $1, $pop38
+	i32.const	$push34=, 1
+	i32.add 	$2=, $2, $pop34
+	i32.const	$push33=, 8
+	i32.add 	$push13=, $1, $pop33
 	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
+	i32.const	$push32=, 4
+	i32.add 	$1=, $1, $pop32
+	i32.lt_s	$push14=, $2, $0
 	br_if   	0, $pop14       # 0: up to label2
 .LBB0_6:                                # %for.end
 	end_loop
@@ -71,7 +69,7 @@ f:                                      # @f
 	i32.const	$push16=, 123
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#7:                                 # %if.end22
+# %bb.7:                                # %if.end22
 	i32.const	$push24=, 0
 	i32.const	$push22=, 16
 	i32.add 	$push23=, $3, $pop22
@@ -92,14 +90,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push22=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop19, $pop21
+	i32.const	$push22=, 0
+	i32.store	__stack_pointer($pop22), $0
 	i32.const	$push0=, 186520586
 	i32.store	32($0), $pop0
 	i32.const	$push23=, 28
@@ -155,6 +152,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1bd14a12d..4badc95b8 100644
--- a/test/torture-s/931004-13.c.s
+++ b/test/torture-s/931004-13.c.s
@@ -7,72 +7,72 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($1)
 	i32.const	$push1=, 10
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load8_u	$push3=, 1($1)
 	i32.const	$push4=, 20
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.load8_u	$push6=, 2($1)
 	i32.const	$push7=, 30
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.load8_u	$push9=, 3($1)
 	i32.const	$push10=, 40
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.load8_u	$push12=, 0($2)
 	i32.const	$push13=, 11
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %if.end22
+# %bb.5:                                # %if.end22
 	i32.load8_u	$push15=, 1($2)
 	i32.const	$push16=, 21
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %if.end28
+# %bb.6:                                # %if.end28
 	i32.load8_u	$push18=, 2($2)
 	i32.const	$push19=, 31
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#7:                                 # %if.end34
+# %bb.7:                                # %if.end34
 	i32.load8_u	$push21=, 3($2)
 	i32.const	$push22=, 41
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#8:                                 # %if.end40
+# %bb.8:                                # %if.end40
 	i32.load8_u	$push24=, 0($3)
 	i32.const	$push25=, 12
 	i32.ne  	$push26=, $pop24, $pop25
 	br_if   	0, $pop26       # 0: down to label0
-# BB#9:                                 # %if.end46
+# %bb.9:                                # %if.end46
 	i32.load8_u	$push27=, 1($3)
 	i32.const	$push28=, 22
 	i32.ne  	$push29=, $pop27, $pop28
 	br_if   	0, $pop29       # 0: down to label0
-# BB#10:                                # %if.end52
+# %bb.10:                               # %if.end52
 	i32.load8_u	$push30=, 2($3)
 	i32.const	$push31=, 32
 	i32.ne  	$push32=, $pop30, $pop31
 	br_if   	0, $pop32       # 0: down to label0
-# BB#11:                                # %if.end58
+# %bb.11:                               # %if.end58
 	i32.load8_u	$push33=, 3($3)
 	i32.const	$push34=, 42
 	i32.ne  	$push35=, $pop33, $pop34
 	br_if   	0, $pop35       # 0: down to label0
-# BB#12:                                # %if.end64
+# %bb.12:                               # %if.end64
 	i32.const	$push36=, 123
 	i32.ne  	$push37=, $4, $pop36
 	br_if   	0, $pop37       # 0: down to label0
-# BB#13:                                # %if.end68
+# %bb.13:                               # %if.end68
 	return  	$2
 .LBB0_14:                               # %if.then
 	end_block                       # label0:
@@ -89,14 +89,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i64.const	$push0=, 2963110217494959114
 	i64.store	16($0), $pop0
 	i32.const	$push1=, 706745868
@@ -123,6 +122,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9be722a36..ce689a209 100644
--- a/test/torture-s/931004-14.c.s
+++ b/test/torture-s/931004-14.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push25=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop22, $pop24
+	i32.const	$push25=, 0
+	i32.store	__stack_pointer($pop25), $3
 	i32.const	$push30=, 4
 	i32.add 	$push2=, $1, $pop30
 	i32.store	12($3), $pop2
@@ -24,54 +23,53 @@ f:                                      # @f
 	i32.const	$push29=, 1
 	i32.lt_s	$push3=, $0, $pop29
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push33=, 10
-	i32.add 	$push4=, $2, $pop33
+	i32.const	$push31=, 10
+	i32.add 	$push4=, $2, $pop31
 	i32.load8_s	$push5=, 0($1)
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	2, $pop6        # 2: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push35=, 20
-	i32.add 	$push9=, $2, $pop35
-	i32.const	$push34=, 1
-	i32.add 	$push10=, $1, $pop34
+	i32.const	$push33=, 20
+	i32.add 	$push9=, $2, $pop33
+	i32.const	$push32=, 1
+	i32.add 	$push10=, $1, $pop32
 	i32.load8_s	$push11=, 0($pop10)
 	i32.ne  	$push12=, $pop9, $pop11
 	br_if   	2, $pop12       # 2: down to label0
-# BB#4:                                 # %if.end9
+# %bb.4:                                # %if.end9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push37=, 30
-	i32.add 	$push13=, $2, $pop37
-	i32.const	$push36=, 2
-	i32.add 	$push8=, $1, $pop36
+	i32.const	$push35=, 30
+	i32.add 	$push13=, $2, $pop35
+	i32.const	$push34=, 2
+	i32.add 	$push8=, $1, $pop34
 	i32.load8_s	$push0=, 0($pop8)
 	i32.ne  	$push14=, $pop13, $pop0
 	br_if   	2, $pop14       # 2: down to label0
-# BB#5:                                 # %if.end15
+# %bb.5:                                # %if.end15
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push39=, 40
-	i32.add 	$push15=, $2, $pop39
-	i32.const	$push38=, 3
-	i32.add 	$push7=, $1, $pop38
+	i32.const	$push37=, 40
+	i32.add 	$push15=, $2, $pop37
+	i32.const	$push36=, 3
+	i32.add 	$push7=, $1, $pop36
 	i32.load8_s	$push1=, 0($pop7)
 	i32.ne  	$push16=, $pop15, $pop1
 	br_if   	2, $pop16       # 2: down to label0
-# BB#6:                                 # %for.cond
+# %bb.6:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push44=, 8
-	i32.add 	$push17=, $1, $pop44
+	i32.const	$push40=, 1
+	i32.add 	$2=, $2, $pop40
+	i32.const	$push39=, 8
+	i32.add 	$push17=, $1, $pop39
 	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
+	i32.const	$push38=, 4
+	i32.add 	$1=, $1, $pop38
+	i32.lt_s	$push18=, $2, $0
 	br_if   	0, $pop18       # 0: up to label2
 .LBB0_7:                                # %for.end
 	end_loop
@@ -80,7 +78,7 @@ f:                                      # @f
 	i32.const	$push20=, 123
 	i32.ne  	$push21=, $pop19, $pop20
 	br_if   	0, $pop21       # 0: down to label0
-# BB#8:                                 # %if.end28
+# %bb.8:                                # %if.end28
 	i32.const	$push28=, 0
 	i32.const	$push26=, 16
 	i32.add 	$push27=, $3, $pop26
@@ -101,14 +99,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $0
 	i64.const	$push0=, 2963110217494959114
 	i64.store	32($0), $pop0
 	i32.const	$push1=, 706745868
@@ -140,6 +137,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9e4a5d8d5..4fd5e27ec 100644
--- a/test/torture-s/931004-2.c.s
+++ b/test/torture-s/931004-2.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop10, $pop12
-	tee_local	$push19=, $5=, $pop20
-	i32.store	__stack_pointer($pop13), $pop19
+	i32.sub 	$5=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $5
 	i32.const	$push18=, 4
 	i32.add 	$push2=, $1, $pop18
 	i32.store	12($5), $pop2
@@ -25,7 +24,7 @@ f:                                      # @f
 	i32.const	$push17=, 1
 	i32.lt_s	$push3=, $0, $pop17
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push4=, 8
 	i32.add 	$1=, $1, $pop4
 	i32.const	$3=, 10
@@ -34,19 +33,19 @@ f:                                      # @f
 	loop    	                # label2:
 	i32.ne  	$push5=, $3, $4
 	br_if   	2, $pop5        # 2: down to label0
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.store	12($5), $1
-	i32.const	$push24=, -9
-	i32.add 	$2=, $3, $pop24
-	i32.const	$push23=, -4
-	i32.add 	$push7=, $1, $pop23
+	i32.const	$push22=, -9
+	i32.add 	$2=, $3, $pop22
+	i32.const	$push21=, -4
+	i32.add 	$push7=, $1, $pop21
 	i32.load	$4=, 0($pop7)
-	i32.const	$push22=, 1
-	i32.add 	$push1=, $3, $pop22
+	i32.const	$push20=, 1
+	i32.add 	$push1=, $3, $pop20
 	copy_local	$3=, $pop1
-	i32.const	$push21=, 4
-	i32.add 	$push0=, $1, $pop21
+	i32.const	$push19=, 4
+	i32.add 	$push0=, $1, $pop19
 	copy_local	$1=, $pop0
 	i32.lt_s	$push6=, $2, $0
 	br_if   	0, $pop6        # 0: up to label2
@@ -56,7 +55,7 @@ f:                                      # @f
 	i32.const	$push8=, 123
 	i32.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#5:                                 # %if.end8
+# %bb.5:                                # %if.end8
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
 	i32.add 	$push15=, $5, $pop14
@@ -77,14 +76,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop4, $pop6
-	tee_local	$push8=, $0=, $pop9
-	i32.store	__stack_pointer($pop7), $pop8
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push0=, 528280977420
 	i64.store	8($0), $pop0
 	i64.const	$push1=, 47244640266
@@ -99,6 +97,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 eee259749..67285dd5c 100644
--- a/test/torture-s/931004-3.c.s
+++ b/test/torture-s/931004-3.c.s
@@ -7,30 +7,30 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push12=, 65535
 	i32.and 	$push0=, $1, $pop12
 	i32.const	$push1=, 10
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push13=, 65535
 	i32.and 	$push3=, $2, $pop13
 	i32.const	$push4=, 11
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end9
+# %bb.2:                                # %if.end9
 	i32.const	$push6=, 65535
 	i32.and 	$push7=, $3, $pop6
 	i32.const	$push8=, 12
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#3:                                 # %if.end15
+# %bb.3:                                # %if.end15
 	i32.const	$push10=, 123
 	i32.ne  	$push11=, $4, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end19
+# %bb.4:                                # %if.end19
 	return  	$2
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -46,7 +46,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -55,6 +55,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 68ed0c569..6e2cda34f 100644
--- a/test/torture-s/931004-4.c.s
+++ b/test/torture-s/931004-4.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop10, $pop12
-	tee_local	$push19=, $4=, $pop20
-	i32.store	__stack_pointer($pop13), $pop19
+	i32.sub 	$4=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $4
 	i32.const	$push18=, 4
 	i32.add 	$push1=, $1, $pop18
 	i32.store	12($4), $pop1
@@ -24,7 +23,7 @@ f:                                      # @f
 	i32.const	$push17=, 1
 	i32.lt_s	$push2=, $0, $pop17
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -32,17 +31,17 @@ f:                                      # @f
 	i32.load16_s	$push3=, 0($1)
 	i32.ne  	$push4=, $3, $pop3
 	br_if   	2, $pop4        # 2: down to label0
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push24=, 8
-	i32.add 	$push5=, $1, $pop24
+	i32.const	$push22=, 8
+	i32.add 	$push5=, $1, $pop22
 	i32.store	12($4), $pop5
-	i32.const	$push23=, 4
-	i32.add 	$1=, $1, $pop23
-	i32.const	$push22=, -9
-	i32.add 	$2=, $3, $pop22
-	i32.const	$push21=, 1
-	i32.add 	$push0=, $3, $pop21
+	i32.const	$push21=, 4
+	i32.add 	$1=, $1, $pop21
+	i32.const	$push20=, -9
+	i32.add 	$2=, $3, $pop20
+	i32.const	$push19=, 1
+	i32.add 	$push0=, $3, $pop19
 	copy_local	$3=, $pop0
 	i32.lt_s	$push6=, $2, $0
 	br_if   	0, $pop6        # 0: up to label2
@@ -53,7 +52,7 @@ f:                                      # @f
 	i32.const	$push8=, 123
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#5:                                 # %if.end10
+# %bb.5:                                # %if.end10
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
 	i32.add 	$push15=, $4, $pop14
@@ -74,14 +73,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop4, $pop6
-	tee_local	$push8=, $0=, $pop9
-	i32.store	__stack_pointer($pop7), $pop8
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push0=, 528280977420
 	i64.store	8($0), $pop0
 	i64.const	$push1=, 47244640266
@@ -96,6 +94,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 be32c8598..40de49778 100644
--- a/test/torture-s/931004-5.c.s
+++ b/test/torture-s/931004-5.c.s
@@ -7,42 +7,42 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load16_u	$push0=, 0($1)
 	i32.const	$push1=, 10
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load16_u	$push3=, 2($1)
 	i32.const	$push4=, 20
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.load16_u	$push6=, 0($2)
 	i32.const	$push7=, 11
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end12
+# %bb.3:                                # %if.end12
 	i32.load16_u	$push9=, 2($2)
 	i32.const	$push10=, 21
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end18
+# %bb.4:                                # %if.end18
 	i32.load16_u	$push12=, 0($3)
 	i32.const	$push13=, 12
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %if.end24
+# %bb.5:                                # %if.end24
 	i32.load16_u	$push15=, 2($3)
 	i32.const	$push16=, 22
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %if.end30
+# %bb.6:                                # %if.end30
 	i32.const	$push18=, 123
 	i32.ne  	$push19=, $4, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#7:                                 # %if.end34
+# %bb.7:                                # %if.end34
 	return  	$2
 .LBB0_8:                                # %if.then
 	end_block                       # label0:
@@ -59,14 +59,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i64.const	$push0=, 6192501028618251
 	i64.store	20($0):p2align=2, $pop0
 	i32.const	$push1=, 1310730
@@ -93,6 +92,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3d325f7ec..8e2d069f0 100644
--- a/test/torture-s/931004-6.c.s
+++ b/test/torture-s/931004-6.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push17=, 0
+# %bb.0:                                # %entry
 	i32.const	$push15=, 0
 	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
-	i32.sub 	$push24=, $pop14, $pop16
-	tee_local	$push23=, $4=, $pop24
-	i32.store	__stack_pointer($pop17), $pop23
+	i32.sub 	$4=, $pop14, $pop16
+	i32.const	$push17=, 0
+	i32.store	__stack_pointer($pop17), $4
 	i32.const	$push22=, 4
 	i32.add 	$push1=, $1, $pop22
 	i32.store	12($4), $pop1
@@ -24,7 +23,7 @@ f:                                      # @f
 	i32.const	$push21=, 1
 	i32.lt_s	$push2=, $0, $pop21
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -32,26 +31,26 @@ f:                                      # @f
 	i32.load16_s	$push3=, 0($1)
 	i32.ne  	$push4=, $2, $pop3
 	br_if   	2, $pop4        # 2: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push26=, 10
-	i32.add 	$push5=, $2, $pop26
-	i32.const	$push25=, 2
-	i32.add 	$push6=, $1, $pop25
+	i32.const	$push24=, 10
+	i32.add 	$push5=, $2, $pop24
+	i32.const	$push23=, 2
+	i32.add 	$push6=, $1, $pop23
 	i32.load16_s	$push7=, 0($pop6)
 	i32.ne  	$push8=, $pop5, $pop7
 	br_if   	2, $pop8        # 2: down to label0
-# BB#4:                                 # %for.cond
+# %bb.4:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push30=, 8
-	i32.add 	$push9=, $1, $pop30
+	i32.const	$push28=, 8
+	i32.add 	$push9=, $1, $pop28
 	i32.store	12($4), $pop9
-	i32.const	$push29=, 4
-	i32.add 	$1=, $1, $pop29
-	i32.const	$push28=, -9
-	i32.add 	$3=, $2, $pop28
-	i32.const	$push27=, 1
-	i32.add 	$push0=, $2, $pop27
+	i32.const	$push27=, 4
+	i32.add 	$1=, $1, $pop27
+	i32.const	$push26=, -9
+	i32.add 	$3=, $2, $pop26
+	i32.const	$push25=, 1
+	i32.add 	$push0=, $2, $pop25
 	copy_local	$2=, $pop0
 	i32.lt_s	$push10=, $3, $0
 	br_if   	0, $pop10       # 0: up to label2
@@ -62,7 +61,7 @@ f:                                      # @f
 	i32.const	$push12=, 123
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#6:                                 # %if.end16
+# %bb.6:                                # %if.end16
 	i32.const	$push20=, 0
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $4, $pop18
@@ -83,14 +82,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $0
 	i64.const	$push0=, 6192501028618251
 	i64.store	36($0):p2align=2, $pop0
 	i32.const	$push1=, 1310730
@@ -122,6 +120,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c6a0a7764..ced2db94e 100644
--- a/test/torture-s/931004-7.c.s
+++ b/test/torture-s/931004-7.c.s
@@ -7,30 +7,30 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push12=, 255
 	i32.and 	$push0=, $1, $pop12
 	i32.const	$push1=, 10
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push13=, 255
 	i32.and 	$push3=, $2, $pop13
 	i32.const	$push4=, 11
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end9
+# %bb.2:                                # %if.end9
 	i32.const	$push6=, 255
 	i32.and 	$push7=, $3, $pop6
 	i32.const	$push8=, 12
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#3:                                 # %if.end15
+# %bb.3:                                # %if.end15
 	i32.const	$push10=, 123
 	i32.ne  	$push11=, $4, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end19
+# %bb.4:                                # %if.end19
 	return  	$2
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -46,7 +46,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -55,6 +55,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b4b339291..3a35843de 100644
--- a/test/torture-s/931004-8.c.s
+++ b/test/torture-s/931004-8.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop10, $pop12
-	tee_local	$push19=, $4=, $pop20
-	i32.store	__stack_pointer($pop13), $pop19
+	i32.sub 	$4=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $4
 	i32.const	$push18=, 4
 	i32.add 	$push1=, $1, $pop18
 	i32.store	12($4), $pop1
@@ -24,7 +23,7 @@ f:                                      # @f
 	i32.const	$push17=, 1
 	i32.lt_s	$push2=, $0, $pop17
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 10
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -32,17 +31,17 @@ f:                                      # @f
 	i32.load8_s	$push3=, 0($1)
 	i32.ne  	$push4=, $3, $pop3
 	br_if   	2, $pop4        # 2: down to label0
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push24=, 8
-	i32.add 	$push5=, $1, $pop24
+	i32.const	$push22=, 8
+	i32.add 	$push5=, $1, $pop22
 	i32.store	12($4), $pop5
-	i32.const	$push23=, 4
-	i32.add 	$1=, $1, $pop23
-	i32.const	$push22=, -9
-	i32.add 	$2=, $3, $pop22
-	i32.const	$push21=, 1
-	i32.add 	$push0=, $3, $pop21
+	i32.const	$push21=, 4
+	i32.add 	$1=, $1, $pop21
+	i32.const	$push20=, -9
+	i32.add 	$2=, $3, $pop20
+	i32.const	$push19=, 1
+	i32.add 	$push0=, $3, $pop19
 	copy_local	$3=, $pop0
 	i32.lt_s	$push6=, $2, $0
 	br_if   	0, $pop6        # 0: up to label2
@@ -53,7 +52,7 @@ f:                                      # @f
 	i32.const	$push8=, 123
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#5:                                 # %if.end10
+# %bb.5:                                # %if.end10
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
 	i32.add 	$push15=, $4, $pop14
@@ -74,14 +73,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop4, $pop6
-	tee_local	$push8=, $0=, $pop9
-	i32.store	__stack_pointer($pop7), $pop8
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push0=, 528280977420
 	i64.store	8($0), $pop0
 	i64.const	$push1=, 47244640266
@@ -96,6 +94,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9ac6a5313..355ccc736 100644
--- a/test/torture-s/931004-9.c.s
+++ b/test/torture-s/931004-9.c.s
@@ -7,42 +7,42 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($1)
 	i32.const	$push1=, 10
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load8_u	$push3=, 1($1)
 	i32.const	$push4=, 20
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.load8_u	$push6=, 0($2)
 	i32.const	$push7=, 11
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end12
+# %bb.3:                                # %if.end12
 	i32.load8_u	$push9=, 1($2)
 	i32.const	$push10=, 21
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end18
+# %bb.4:                                # %if.end18
 	i32.load8_u	$push12=, 0($3)
 	i32.const	$push13=, 12
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %if.end24
+# %bb.5:                                # %if.end24
 	i32.load8_u	$push15=, 1($3)
 	i32.const	$push16=, 22
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %if.end30
+# %bb.6:                                # %if.end30
 	i32.const	$push18=, 123
 	i32.ne  	$push19=, $4, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#7:                                 # %if.end34
+# %bb.7:                                # %if.end34
 	return  	$2
 .LBB0_8:                                # %if.then
 	end_block                       # label0:
@@ -59,14 +59,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $0
 	i32.const	$push0=, 5130
 	i32.store16	8($0), $pop0
 	i32.const	$push1=, 369890571
@@ -93,6 +92,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fce2ae08d..7e3e8e435 100644
--- a/test/torture-s/931005-1.c.s
+++ b/test/torture-s/931005-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931009-1.c.s b/test/torture-s/931009-1.c.s
index b0bf3356b..349ad7cba 100644
--- a/test/torture-s/931009-1.c.s
+++ b/test/torture-s/931009-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -21,7 +21,7 @@ main:                                   # @main
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,5 +29,5 @@ f:                                      # @f
 	.size	f, .Lfunc_end1-f
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931012-1.c.s b/test/torture-s/931012-1.c.s
index aa12e3196..d20a1a50e 100644
--- a/test/torture-s/931012-1.c.s
+++ b/test/torture-s/931012-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.select	$push1=, $pop0, $0, $1
 	i32.const	$push2=, 1
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931017-1.c.s b/test/torture-s/931017-1.c.s
index 050a83d9b..f28e839e0 100644
--- a/test/torture-s/931017-1.c.s
+++ b/test/torture-s/931017-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ main:                                   # @main
 	.type	h1,@function
 h1:                                     # @h1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,12 +34,12 @@ h1:                                     # @h1
 h2:                                     # @h2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, v
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB2_2:                                # %if.then
@@ -57,7 +57,7 @@ h2:                                     # @h2
 g:                                      # @g
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -71,7 +71,7 @@ g:                                      # @g
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -88,6 +88,6 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 05c8a251b..ff0201c24 100644
--- a/test/torture-s/931018-1.c.s
+++ b/test/torture-s/931018-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -21,12 +21,12 @@ main:                                   # @main
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -559038737
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -55,6 +55,6 @@ a:
 	.size	a, 16384
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 936678a96..766163ad9 100644
--- a/test/torture-s/931031-1.c.s
+++ b/test/torture-s/931031-1.c.s
@@ -7,12 +7,11 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$0=, 4($0)
 	i32.const	$push2=, 1
-	i32.load	$push7=, 4($0)
-	tee_local	$push6=, $0=, $pop7
 	i32.const	$push5=, 1
-	i32.add 	$push3=, $pop6, $pop5
+	i32.add 	$push3=, $0, $pop5
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
 	i32.select	$push4=, $pop2, $pop3, $pop1
@@ -27,7 +26,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -36,5 +35,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931102-1.c.s b/test/torture-s/931102-1.c.s
index 06a007620..c3bdec1c1 100644
--- a/test/torture-s/931102-1.c.s
+++ b/test/torture-s/931102-1.c.s
@@ -7,34 +7,34 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$1=, 0
+	.local  	i32, i32
+# %bb.0:                                # %entry
+	i32.const	$2=, 0
 	block   	
 	i32.const	$push3=, 1
-	i32.and 	$push0=, $0, $pop3
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
-	i32.const	$1=, 0
+	i32.and 	$push1=, $0, $pop3
+	br_if   	0, $pop1        # 0: down to label0
+# %bb.1:                                # %while.body.preheader
+	i32.const	$2=, 0
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push9=, 1
-	i32.add 	$1=, $1, $pop9
-	i32.const	$push8=, 24
-	i32.shl 	$push1=, $0, $pop8
-	i32.const	$push7=, 25
-	i32.shr_s	$push6=, $pop1, $pop7
-	tee_local	$push5=, $0=, $pop6
-	i32.const	$push4=, 1
-	i32.and 	$push2=, $pop5, $pop4
-	i32.eqz 	$push10=, $pop2
-	br_if   	0, $pop10       # 0: up to label1
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
+	i32.const	$push6=, 2
+	i32.and 	$1=, $0, $pop6
+	i32.const	$push5=, 24
+	i32.shl 	$push2=, $0, $pop5
+	i32.const	$push4=, 25
+	i32.shr_s	$push0=, $pop2, $pop4
+	copy_local	$0=, $pop0
+	i32.eqz 	$push8=, $1
+	br_if   	0, $pop8        # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push11=, $1
-                                        # fallthrough-return: $pop11
+	copy_local	$push9=, $2
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -45,7 +45,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -54,5 +54,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931102-2.c.s b/test/torture-s/931102-2.c.s
index a5dde0c3c..66057f2a5 100644
--- a/test/torture-s/931102-2.c.s
+++ b/test/torture-s/931102-2.c.s
@@ -7,34 +7,34 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$1=, 0
+	.local  	i32, i32
+# %bb.0:                                # %entry
+	i32.const	$2=, 0
 	block   	
 	i32.const	$push3=, 1
-	i32.and 	$push0=, $0, $pop3
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
-	i32.const	$1=, 0
+	i32.and 	$push1=, $0, $pop3
+	br_if   	0, $pop1        # 0: down to label0
+# %bb.1:                                # %while.body.preheader
+	i32.const	$2=, 0
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push9=, 1
-	i32.add 	$1=, $1, $pop9
-	i32.const	$push8=, 16
-	i32.shl 	$push1=, $0, $pop8
-	i32.const	$push7=, 17
-	i32.shr_s	$push6=, $pop1, $pop7
-	tee_local	$push5=, $0=, $pop6
-	i32.const	$push4=, 1
-	i32.and 	$push2=, $pop5, $pop4
-	i32.eqz 	$push10=, $pop2
-	br_if   	0, $pop10       # 0: up to label1
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
+	i32.const	$push6=, 2
+	i32.and 	$1=, $0, $pop6
+	i32.const	$push5=, 16
+	i32.shl 	$push2=, $0, $pop5
+	i32.const	$push4=, 17
+	i32.shr_s	$push0=, $pop2, $pop4
+	copy_local	$0=, $pop0
+	i32.eqz 	$push8=, $1
+	br_if   	0, $pop8        # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push11=, $1
-                                        # fallthrough-return: $pop11
+	copy_local	$push9=, $2
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -45,7 +45,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -54,5 +54,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931110-1.c.s b/test/torture-s/931110-1.c.s
index 288ff52b4..8b2fe75b2 100644
--- a/test/torture-s/931110-1.c.s
+++ b/test/torture-s/931110-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push50=, 0
 	i32.load16_u	$push1=, x+4($pop50)
@@ -84,5 +84,5 @@ x:
 	.size	x, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931110-2.c.s b/test/torture-s/931110-2.c.s
index d572f847d..8d84d0343 100644
--- a/test/torture-s/931110-2.c.s
+++ b/test/torture-s/931110-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931208-1.c.s b/test/torture-s/931208-1.c.s
index 43de2e643..ee69f0a6b 100644
--- a/test/torture-s/931208-1.c.s
+++ b/test/torture-s/931208-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 498
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/931228-1.c.s b/test/torture-s/931228-1.c.s
index 6b10f2005..3955123bd 100644
--- a/test/torture-s/931228-1.c.s
+++ b/test/torture-s/931228-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8184
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/940115-1.c.s b/test/torture-s/940115-1.c.s
index d7ed7a084..b5fc5c6a4 100644
--- a/test/torture-s/940115-1.c.s
+++ b/test/torture-s/940115-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.lt_u	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/940122-1.c.s b/test/torture-s/940122-1.c.s
index 92f841f96..91f571a2c 100644
--- a/test/torture-s/940122-1.c.s
+++ b/test/torture-s/940122-1.c.s
@@ -8,7 +8,7 @@ g:                                      # @g
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push3=, a($pop0)
@@ -20,7 +20,7 @@ g:                                      # @g
 	i32.ne  	$push2=, $pop1, $pop6
 	i32.ne  	$push5=, $pop4, $pop2
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$1
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -38,7 +38,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push3=, a($pop0)
@@ -50,7 +50,7 @@ f:                                      # @f
 	i32.ne  	$push2=, $pop1, $pop6
 	i32.ne  	$push5=, $pop4, $pop2
 	br_if   	0, $pop5        # 0: down to label1
-# BB#1:                                 # %g.exit
+# %bb.1:                                # %g.exit
 	return  	$1
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -66,7 +66,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 100
 	i32.call	$drop=, f@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -95,6 +95,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4c5b44595..6735161b9 100644
--- a/test/torture-s/941014-1.c.s
+++ b/test/torture-s/941014-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $2
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941014-2.c.s b/test/torture-s/941014-2.c.s
index 8cceaa8d5..cd6e0675d 100644
--- a/test/torture-s/941014-2.c.s
+++ b/test/torture-s/941014-2.c.s
@@ -6,7 +6,7 @@
 	.type	a1,@function
 a1:                                     # @a1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,23 +19,21 @@ a1:                                     # @a1
 f:                                      # @f
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push17=, $pop7, $pop9
-	tee_local	$push16=, $1=, $pop17
-	i32.store	__stack_pointer($pop10), $pop16
-	block   	
+	i32.sub 	$1=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $1
 	i32.const	$push0=, 4
-	i32.call	$push15=, malloc@FUNCTION, $pop0
-	tee_local	$push14=, $0=, $pop15
-	i32.load16_u	$push1=, 0($pop14)
+	i32.call	$0=, malloc@FUNCTION, $pop0
+	block   	
+	i32.load16_u	$push1=, 0($0)
 	i32.const	$push2=, 4096
 	i32.lt_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.load16_u	$push4=, 0($0)
 	i32.store	0($1), $pop4
 	i32.const	$push5=, .L.str
@@ -48,8 +46,8 @@ f:                                      # @f
 	i32.const	$push11=, 16
 	i32.add 	$push12=, $1, $pop11
 	i32.store	__stack_pointer($pop13), $pop12
-	copy_local	$push18=, $0
-                                        # fallthrough-return: $pop18
+	copy_local	$push14=, $0
+                                        # fallthrough-return: $pop14
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
@@ -61,23 +59,21 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push17=, $pop10, $pop12
-	tee_local	$push16=, $1=, $pop17
-	i32.store	__stack_pointer($pop13), $pop16
-	block   	
+	i32.sub 	$1=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $1
 	i32.const	$push0=, 4
-	i32.call	$push15=, malloc@FUNCTION, $pop0
-	tee_local	$push14=, $0=, $pop15
-	i32.load16_u	$push1=, 0($pop14)
+	i32.call	$0=, malloc@FUNCTION, $pop0
+	block   	
+	i32.load16_u	$push1=, 0($0)
 	i32.const	$push2=, 4096
 	i32.lt_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.then.i
+# %bb.1:                                # %if.then.i
 	i32.load16_u	$push4=, 0($0)
 	i32.store	0($1), $pop4
 	i32.const	$push5=, .L.str
@@ -88,10 +84,10 @@ main:                                   # @main
 	i32.store16	2($0), $pop6
 	block   	
 	i32.load16_u	$push7=, 2($0)
-	i32.const	$push18=, 256
-	i32.ne  	$push8=, $pop7, $pop18
+	i32.const	$push14=, 256
+	i32.ne  	$push8=, $pop7, $pop14
 	br_if   	0, $pop8        # 0: down to label2
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -110,7 +106,7 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7f9178f52..08f855a27 100644
--- a/test/torture-s/941015-1.c.s
+++ b/test/torture-s/941015-1.c.s
@@ -7,7 +7,7 @@
 foo1:                                   # @foo1
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 1
 	i32.const	$push2=, 2
 	i64.const	$push0=, -4611686016279904256
@@ -25,7 +25,7 @@ foo1:                                   # @foo1
 foo2:                                   # @foo2
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 1
 	i32.const	$push2=, 2
 	i64.const	$push0=, -4611686016279904256
@@ -42,7 +42,7 @@ foo2:                                   # @foo2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -51,5 +51,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941021-1.c.s b/test/torture-s/941021-1.c.s
index da5732c4e..0a354fa20 100644
--- a/test/torture-s/941021-1.c.s
+++ b/test/torture-s/941021-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, glob_dbl
 	i32.select	$push1=, $0, $pop0, $0
 	f64.store	0($pop1), $1
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, 4632951452917877965
 	i64.store	glob_dbl($pop1), $pop0
@@ -44,5 +44,5 @@ glob_dbl:
 	.size	glob_dbl, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941025-1.c.s b/test/torture-s/941025-1.c.s
index 5c2752cb5..7246c6027 100644
--- a/test/torture-s/941025-1.c.s
+++ b/test/torture-s/941025-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.and 	$push2=, $1, $pop0
 	i32.const	$push4=, 1
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941031-1.c.s b/test/torture-s/941031-1.c.s
index 7027cb7c9..ac2b07612 100644
--- a/test/torture-s/941031-1.c.s
+++ b/test/torture-s/941031-1.c.s
@@ -8,11 +8,10 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
-	i32.shr_s	$push4=, $1, $pop0
-	tee_local	$push3=, $2=, $pop4
-	i32.add 	$push1=, $1, $pop3
+	i32.shr_s	$2=, $1, $pop0
+	i32.add 	$push1=, $1, $2
 	i32.xor 	$push2=, $pop1, $2
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -25,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -34,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941101-1.c.s b/test/torture-s/941101-1.c.s
index 3051386a7..bcdd722ba 100644
--- a/test/torture-s/941101-1.c.s
+++ b/test/torture-s/941101-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941110-1.c.s b/test/torture-s/941110-1.c.s
index 244a115e3..23af5181e 100644
--- a/test/torture-s/941110-1.c.s
+++ b/test/torture-s/941110-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/941202-1.c.s b/test/torture-s/941202-1.c.s
index 3624b14de..4a3315bad 100644
--- a/test/torture-s/941202-1.c.s
+++ b/test/torture-s/941202-1.c.s
@@ -7,12 +7,12 @@
 g:                                      # @g
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 3
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -37,6 +37,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 78ee48817..04486bbb0 100644
--- a/test/torture-s/950221-1.c.s
+++ b/test/torture-s/950221-1.c.s
@@ -8,7 +8,7 @@ g1:                                     # @g1
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $2
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -22,12 +22,12 @@ g1:                                     # @g1
 g2:                                     # @g2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -559038737
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -46,19 +46,18 @@ g2:                                     # @g2
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push2=, 0
+	i32.load	$push1=, parsefile($pop2)
+	i32.load	$0=, 0($pop1)
 	block   	
-	i32.const	$push4=, 0
-	i32.load	$push1=, parsefile($pop4)
-	i32.load	$push3=, 0($pop1)
-	tee_local	$push2=, $0=, $pop3
-	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
-	i32.const	$push5=, 0
-	i32.load	$push0=, el($pop5)
-	i32.eqz 	$push6=, $pop0
-	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %if.end
+	br_if   	0, $0           # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$push0=, el($pop3)
+	i32.eqz 	$push4=, $pop0
+	br_if   	0, $pop4        # 0: down to label1
+# %bb.2:                                # %if.end
 	return  	$0
 .LBB2_3:                                # %alabel
 	end_block                       # label1:
@@ -74,7 +73,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %alabel.i
+# %bb.0:                                # %alabel.i
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.store	el($pop0), $pop5
@@ -122,10 +121,10 @@ el:
 	.globl	filler
 	.p2align	4
 filler:
-	.skip	522240
-	.size	filler, 522240
+	.skip	262144
+	.size	filler, 262144
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b06442ef2..f54589400 100644
--- a/test/torture-s/950322-1.c.s
+++ b/test/torture-s/950322-1.c.s
@@ -8,15 +8,13 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_u	$push1=, 0($0)
 	i32.load8_u	$push0=, 1($0)
-	i32.sub 	$push11=, $pop1, $pop0
-	tee_local	$push10=, $0=, $pop11
+	i32.sub 	$0=, $pop1, $pop0
 	i32.const	$push2=, 31
-	i32.shr_s	$push9=, $0, $pop2
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push3=, $pop10, $pop8
+	i32.shr_s	$1=, $0, $pop2
+	i32.add 	$push3=, $0, $1
 	i32.xor 	$push4=, $pop3, $1
 	i32.const	$push7=, 31
 	i32.shr_u	$push5=, $0, $pop7
@@ -32,7 +30,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950426-1.c.s b/test/torture-s/950426-1.c.s
index d389e79bd..900888813 100644
--- a/test/torture-s/950426-1.c.s
+++ b/test/torture-s/950426-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	i32.const	$push1=, 0
 	i32.const	$push0=, s1
 	i32.store	p1($pop1), $pop0
@@ -33,7 +33,7 @@ main:                                   # @main
 func1:                                  # @func1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($0)
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -48,7 +48,7 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -89,5 +89,5 @@ i:
 	.size	.L.str.1, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950426-2.c.s b/test/torture-s/950426-2.c.s
index 03975e7ff..07945d6f0 100644
--- a/test/torture-s/950426-2.c.s
+++ b/test/torture-s/950426-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950503-1.c.s b/test/torture-s/950503-1.c.s
index 5fac3c0a5..283407d6f 100644
--- a/test/torture-s/950503-1.c.s
+++ b/test/torture-s/950503-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950511-1.c.s b/test/torture-s/950511-1.c.s
index beea4980b..b4f56dfb1 100644
--- a/test/torture-s/950511-1.c.s
+++ b/test/torture-s/950511-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950512-1.c.s b/test/torture-s/950512-1.c.s
index 88399d3dc..fcab27e46 100644
--- a/test/torture-s/950512-1.c.s
+++ b/test/torture-s/950512-1.c.s
@@ -7,7 +7,7 @@
 f1:                                     # @f1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 2147483647
 	i32.const	$push0=, 2147483646
 	i32.select	$push2=, $pop1, $pop0, $0
@@ -23,7 +23,7 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push1=, 9223372036854775807
 	i64.const	$push0=, 9223372036854775806
 	i64.select	$push2=, $pop1, $pop0, $0
@@ -38,7 +38,7 @@ f2:                                     # @f2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end12
+# %bb.0:                                # %if.end12
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -47,5 +47,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950605-1.c.s b/test/torture-s/950605-1.c.s
index cd4ed79a1..5d66171c1 100644
--- a/test/torture-s/950605-1.c.s
+++ b/test/torture-s/950605-1.c.s
@@ -7,14 +7,14 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 255
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push3=, 255
 	i32.ne  	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,7 +30,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,6 +39,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0ceebe9bd..c201fdc39 100644
--- a/test/torture-s/950607-1.c.s
+++ b/test/torture-s/950607-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950607-2.c.s b/test/torture-s/950607-2.c.s
index 178e1eb2a..d508a6684 100644
--- a/test/torture-s/950607-2.c.s
+++ b/test/torture-s/950607-2.c.s
@@ -8,18 +8,14 @@ f:                                      # @f
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i64
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
-	i32.const	$push19=, 2
+# %bb.0:                                # %entry
+	i32.load	$3=, 4($0)
+	i32.load	$0=, 0($0)
 	i32.load	$push10=, 4($2)
-	i32.load	$push28=, 4($0)
-	tee_local	$push27=, $3=, $pop28
-	i32.sub 	$push11=, $pop10, $pop27
+	i32.sub 	$push11=, $pop10, $3
 	i64.extend_s/i32	$push12=, $pop11
 	i32.load	$push7=, 0($1)
-	i32.load	$push26=, 0($0)
-	tee_local	$push25=, $0=, $pop26
-	i32.sub 	$push8=, $pop7, $pop25
+	i32.sub 	$push8=, $pop7, $0
 	i64.extend_s/i32	$push9=, $pop8
 	i64.mul 	$push13=, $pop12, $pop9
 	i32.load	$push3=, 0($2)
@@ -29,10 +25,11 @@ f:                                      # @f
 	i32.sub 	$push1=, $pop0, $3
 	i64.extend_s/i32	$push2=, $pop1
 	i64.mul 	$push6=, $pop5, $pop2
-	i64.sub 	$push24=, $pop13, $pop6
-	tee_local	$push23=, $4=, $pop24
+	i64.sub 	$4=, $pop13, $pop6
+	i32.const	$push21=, 0
+	i32.const	$push19=, 2
 	i64.const	$push16=, 63
-	i64.shr_u	$push17=, $pop23, $pop16
+	i64.shr_u	$push17=, $4, $pop16
 	i32.wrap/i64	$push18=, $pop17
 	i32.sub 	$push20=, $pop19, $pop18
 	i64.const	$push14=, 0
@@ -49,7 +46,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -58,5 +55,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950612-1.c.s b/test/torture-s/950612-1.c.s
index a12e366cc..b2a6d0332 100644
--- a/test/torture-s/950612-1.c.s
+++ b/test/torture-s/950612-1.c.s
@@ -8,11 +8,10 @@ f1:                                     # @f1
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
-	i32.shr_s	$push4=, $0, $pop0
-	tee_local	$push3=, $1=, $pop4
-	i32.add 	$push1=, $0, $pop3
+	i32.shr_s	$1=, $0, $pop0
+	i32.add 	$push1=, $0, $1
 	i32.xor 	$push2=, $pop1, $1
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -27,11 +26,10 @@ f2:                                     # @f2
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
-	i32.shr_s	$push4=, $0, $pop0
-	tee_local	$push3=, $1=, $pop4
-	i32.add 	$push1=, $0, $pop3
+	i32.shr_s	$1=, $0, $pop0
+	i32.add 	$push1=, $0, $1
 	i32.xor 	$push2=, $pop1, $1
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -46,11 +44,10 @@ f3:                                     # @f3
 	.param  	i64
 	.result 	i64
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 63
-	i64.shr_s	$push4=, $0, $pop0
-	tee_local	$push3=, $1=, $pop4
-	i64.add 	$push1=, $0, $pop3
+	i64.shr_s	$1=, $0, $pop0
+	i64.add 	$push1=, $0, $1
 	i64.xor 	$push2=, $pop1, $1
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -65,11 +62,10 @@ f4:                                     # @f4
 	.param  	i64
 	.result 	i64
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 63
-	i64.shr_s	$push4=, $0, $pop0
-	tee_local	$push3=, $1=, $pop4
-	i64.add 	$push1=, $0, $pop3
+	i64.shr_s	$1=, $0, $pop0
+	i64.add 	$push1=, $0, $1
 	i64.xor 	$push2=, $pop1, $1
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -82,14 +78,53 @@ f4:                                     # @f4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.const	$push0=, 0
-	call    	exit@FUNCTION, $pop0
+	.local  	i32, i64, i64, i32, i32
+# %bb.0:                                # %entry
+	i64.const	$1=, 0
+	i32.const	$0=, 0
+	i64.const	$2=, 0
+	i32.const	$3=, 0
+.LBB4_1:                                # %if.end
+                                        # =>This Inner Loop Header: Depth=1
+	block   	
+	loop    	                # label1:
+	i64.eqz 	$4=, $2
+	i32.select	$push0=, $0, $3, $4
+	i64.extend_u/i32	$push1=, $pop0
+	i64.ne  	$push2=, $2, $pop1
+	br_if   	1, $pop2        # 1: down to label0
+# %bb.2:                                # %if.end20
+                                        #   in Loop: Header=BB4_1 Depth=1
+	i64.select	$push3=, $1, $2, $4
+	i64.ne  	$push4=, $2, $pop3
+	br_if   	1, $pop4        # 1: down to label0
+# %bb.3:                                # %for.cond
+                                        #   in Loop: Header=BB4_1 Depth=1
+	i64.const	$push11=, 1
+	i64.add 	$2=, $2, $pop11
+	i32.const	$push10=, -1
+	i32.add 	$0=, $0, $pop10
+	i64.const	$push9=, -1
+	i64.add 	$1=, $1, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$3=, $3, $pop8
+	i64.const	$push7=, 10
+	i64.le_u	$push5=, $2, $pop7
+	br_if   	0, $pop5        # 0: up to label1
+# %bb.4:                                # %for.end
+	end_loop
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
+	unreachable
+.LBB4_5:                                # %if.then4
+	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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
+	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/950621-1.c.s b/test/torture-s/950621-1.c.s
index 905af4a60..ae4275a51 100644
--- a/test/torture-s/950621-1.c.s
+++ b/test/torture-s/950621-1.c.s
@@ -7,12 +7,12 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.eqz 	$push7=, $0
 	br_if   	0, $pop7        # 0: down to label1
-# BB#1:                                 # %land.lhs.true
+# %bb.1:                                # %land.lhs.true
 	i32.load	$push0=, 0($0)
 	i32.const	$push4=, -1
 	i32.eq  	$push1=, $pop0, $pop4
@@ -37,7 +37,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -46,5 +46,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950628-1.c.s b/test/torture-s/950628-1.c.s
index 08ac3dacd..785951d94 100644
--- a/test/torture-s/950628-1.c.s
+++ b/test/torture-s/950628-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.store8	2($0), $pop0
 	i32.const	$push1=, 513
@@ -24,7 +24,7 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.store8	2($0), $pop0
 	i32.const	$push1=, 513
@@ -42,7 +42,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -51,5 +51,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950704-1.c.s b/test/torture-s/950704-1.c.s
index d0f73dffc..ebfba992d 100644
--- a/test/torture-s/950704-1.c.s
+++ b/test/torture-s/950704-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i64, i64
 	.result 	i64
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push11=, 0
 	i32.store	errflag($pop0), $pop11
@@ -19,11 +19,11 @@ f:                                      # @f
 	i64.const	$push10=, 0
 	i64.lt_s	$push1=, $0, $pop10
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i64.const	$push12=, 0
 	i64.lt_s	$push5=, $1, $pop12
 	br_if   	2, $pop5        # 2: down to label0
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
 	i64.const	$push6=, -1
 	i64.le_s	$push7=, $2, $pop6
 	br_if   	1, $pop7        # 1: down to label1
@@ -33,7 +33,7 @@ f:                                      # @f
 	i64.const	$push13=, 0
 	i64.gt_s	$push2=, $1, $pop13
 	br_if   	1, $pop2        # 1: down to label0
-# BB#4:                                 # %if.else
+# %bb.4:                                # %if.else
 	i64.const	$push3=, 0
 	i64.lt_s	$push4=, $2, $pop3
 	br_if   	1, $pop4        # 1: down to label0
@@ -57,7 +57,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end28
+# %bb.0:                                # %if.end28
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	errflag($pop0), $pop2
@@ -78,5 +78,5 @@ errflag:
 	.size	errflag, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950706-1.c.s b/test/torture-s/950706-1.c.s
index 73dc02270..23e717c95 100644
--- a/test/torture-s/950706-1.c.s
+++ b/test/torture-s/950706-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.gt_s	$push3=, $0, $pop2
 	i32.const	$push0=, 31
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950710-1.c.s b/test/torture-s/950710-1.c.s
index adeafcee1..b7c23ee9d 100644
--- a/test/torture-s/950710-1.c.s
+++ b/test/torture-s/950710-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	f@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -30,32 +30,29 @@ main:                                   # @main
 	.section	.text.f,"ax",@progbits
 	.type	f,@function             # -- Begin function f
 f:                                      # @f
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	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.sub 	$2=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $2
 	i32.const	$push12=, 16
-	i32.add 	$push13=, $1, $pop12
-	i32.sub 	$push17=, $1, $pop13
-	tee_local	$push16=, $0=, $pop17
+	i32.add 	$push13=, $2, $pop12
+	i32.sub 	$0=, $2, $pop13
 	i32.const	$push0=, 31
-	i32.shr_s	$push15=, $0, $pop0
-	tee_local	$push14=, $0=, $pop15
-	i32.add 	$push1=, $pop16, $pop14
-	i32.xor 	$push2=, $pop1, $0
+	i32.shr_s	$1=, $0, $pop0
+	block   	
+	i32.add 	$push1=, $0, $1
+	i32.xor 	$push2=, $pop1, $1
 	i32.const	$push3=, 11
 	i32.le_u	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push11=, 0
 	i32.const	$push9=, 32
-	i32.add 	$push10=, $1, $pop9
+	i32.add 	$push10=, $2, $pop9
 	i32.store	__stack_pointer($pop11), $pop10
 	return
 .LBB2_2:                                # %if.then
@@ -67,6 +64,6 @@ f:                                      # @f
 	.size	f, .Lfunc_end2-f
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 338d88e2a..35a88498f 100644
--- a/test/torture-s/950714-1.c.s
+++ b/test/torture-s/950714-1.c.s
@@ -7,117 +7,82 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %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.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	block   	
 	loop    	                # label2:
-	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
+	i32.eq  	$push0=, $0, $9
+	br_if   	1, $pop0        # 1: down to label1
+# %bb.2:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push1=, $1, $9
+	br_if   	1, $pop1        # 1: down to label1
+# %bb.3:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push2=, $2, $9
+	br_if   	1, $pop2        # 1: down to label1
+# %bb.4:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push3=, $3, $9
+	br_if   	1, $pop3        # 1: down to label1
+# %bb.5:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push4=, $4, $9
+	br_if   	1, $pop4        # 1: down to label1
+# %bb.6:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push5=, $5, $9
+	br_if   	1, $pop5        # 1: down to label1
+# %bb.7:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push6=, $6, $9
+	br_if   	1, $pop6        # 1: down to label1
+# %bb.8:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push7=, $7, $9
+	br_if   	1, $pop7        # 1: down to label1
+# %bb.9:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.eq  	$push8=, $8, $9
+	br_if   	1, $pop8        # 1: down to label1
+# %bb.10:                               # %for.cond1.8
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.const	$push23=, 1
+	i32.add 	$9=, $9, $pop23
+	i32.const	$push22=, 10
+	i32.lt_u	$push9=, $9, $pop22
+	br_if   	0, $pop9        # 0: up to label2
 	br      	2               # 2: down to label0
 .LBB0_11:                               # %label
 	end_loop
 	end_block                       # label1:
-	br_if   	0, $9           # 0: down to label0
-# BB#12:                                # %if.end9
-	i32.const	$push29=, 0
-	call    	exit@FUNCTION, $pop29
+	i32.const	$push10=, 1
+	i32.ne  	$push11=, $9, $pop10
+	br_if   	0, $pop11       # 0: down to label0
+# %bb.12:                               # %if.end9
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
 .LBB0_13:                               # %if.then8
 	end_block                       # label0:
@@ -146,6 +111,6 @@ array:
 	.size	array, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d2f255bda..376b8a511 100644
--- a/test/torture-s/950809-1.c.s
+++ b/test/torture-s/950809-1.c.s
@@ -8,15 +8,13 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
-	i32.add 	$push5=, $0, $pop0
-	tee_local	$push4=, $1=, $pop5
-	i32.load	$2=, 0($pop4)
+	i32.add 	$1=, $0, $pop0
+	i32.load	$2=, 0($1)
 	i32.load	$3=, 12($0)
-	i32.load	$push3=, 8($0)
-	tee_local	$push2=, $4=, $pop3
-	i32.load	$5=, 8($pop2)
+	i32.load	$4=, 8($0)
+	i32.load	$5=, 8($4)
 	i32.load	$push1=, 0($4)
 	i32.store	8($4), $pop1
 	i32.store	0($4), $2
@@ -25,8 +23,8 @@ f:                                      # @f
 	i32.store	12($0), $5
 	i32.store	0($1), $3
 	i32.store	4($0), $4
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	copy_local	$push2=, $0
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -38,41 +36,35 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, main.sc($pop6)
-	tee_local	$push4=, $0=, $pop5
-	i32.store	main.sc+8($pop7), $pop4
-	i32.const	$push3=, 0
-	i32.const	$push0=, 11
-	i32.store	main.sc($pop3), $pop0
+# %bb.0:                                # %entry
+	i32.const	$push2=, 0
+	i32.load8_u	$0=, main.sc.0($pop2)
+	i32.const	$push1=, 0
+	i32.const	$push0=, 1
+	i32.store8	main.sc.0($pop1), $pop0
 	block   	
-	i32.const	$push1=, 2
-	i32.ne  	$push2=, $0, $pop1
-	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push8=, 0
-	call    	exit@FUNCTION, $pop8
+	i32.eqz 	$push4=, $0
+	br_if   	0, $pop4        # 0: down to label0
+# %bb.1:                                # %if.then
+	call    	abort@FUNCTION
 	unreachable
-.LBB1_2:                                # %if.then
+.LBB1_2:                                # %if.end
 	end_block                       # label0:
-	call    	abort@FUNCTION
+	i32.const	$push3=, 0
+	call    	exit@FUNCTION, $pop3
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
-	.type	main.sc,@object         # @main.sc
-	.section	.data.main.sc,"aw",@progbits
+	.type	main.sc.0,@object       # @main.sc.0
+	.section	.bss.main.sc.0,"aw",@nobits
 	.p2align	2
-main.sc:
-	.int32	2                       # 0x2
-	.int32	3                       # 0x3
-	.int32	4                       # 0x4
-	.size	main.sc, 12
+main.sc.0:
+	.int8	0                       # 0x0
+	.size	main.sc.0, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 00c4b4812..401acf729 100644
--- a/test/torture-s/950906-1.c.s
+++ b/test/torture-s/950906-1.c.s
@@ -8,7 +8,7 @@ g:                                      # @g
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,7 +23,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -36,7 +36,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -45,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/950915-1.c.s b/test/torture-s/950915-1.c.s
index 422e1de73..3cbb90de3 100644
--- a/test/torture-s/950915-1.c.s
+++ b/test/torture-s/950915-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load32_s	$push2=, b($pop0)
 	i32.const	$push7=, 0
@@ -26,7 +26,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push9=, 0
 	i64.load32_s	$push1=, b($pop9)
@@ -39,7 +39,7 @@ main:                                   # @main
 	i32.const	$push6=, -1
 	i32.gt_s	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB1_2:                                # %if.end
@@ -70,6 +70,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5623d4722..2fff3e94c 100644
--- a/test/torture-s/950929-1.c.s
+++ b/test/torture-s/950929-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/951003-1.c.s b/test/torture-s/951003-1.c.s
index 5548cb60f..f4b0e99e5 100644
--- a/test/torture-s/951003-1.c.s
+++ b/test/torture-s/951003-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 12
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	g,@function
 g:                                      # @g
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,7 +33,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -42,5 +42,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/951115-1.c.s b/test/torture-s/951115-1.c.s
index 88a9691a8..ddcb21271 100644
--- a/test/torture-s/951115-1.c.s
+++ b/test/torture-s/951115-1.c.s
@@ -7,7 +7,7 @@
 g:                                      # @g
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	var($pop1), $pop0
@@ -24,7 +24,7 @@ g:                                      # @g
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	var($pop1), $pop0
@@ -40,7 +40,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	var($pop1), $pop0
@@ -61,5 +61,5 @@ var:
 	.size	var, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/951204-1.c.s b/test/torture-s/951204-1.c.s
index 9e3e0e677..a66ea4017 100644
--- a/test/torture-s/951204-1.c.s
+++ b/test/torture-s/951204-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 120
 	i32.store8	0($0), $pop0
 	copy_local	$push1=, $0
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960116-1.c.s b/test/torture-s/960116-1.c.s
index 64e6f859e..730448b11 100644
--- a/test/torture-s/960116-1.c.s
+++ b/test/torture-s/960116-1.c.s
@@ -7,16 +7,16 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 1
 	i32.and 	$push0=, $0, $pop3
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %land.lhs.true
+# %bb.1:                                # %land.lhs.true
 	i32.load	$push1=, 0($0)
 	i32.eqz 	$push5=, $pop1
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %return
+# %bb.2:                                # %return
 	i32.const	$push4=, 1
 	return  	$pop4
 .LBB0_3:                                # %if.end
@@ -33,7 +33,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -42,5 +42,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960117-1.c.s b/test/torture-s/960117-1.c.s
index b6c09114b..950a182d2 100644
--- a/test/torture-s/960117-1.c.s
+++ b/test/torture-s/960117-1.c.s
@@ -7,7 +7,7 @@
 get_id:                                 # @get_id
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, curval+2($pop0):p2align=1
 	i32.store8	0($pop1), $0
@@ -23,7 +23,7 @@ get_id:                                 # @get_id
 	.type	get_tok,@function
 get_tok:                                # @get_tok
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, id_space
 	i32.store	curval+2($pop1):p2align=1, $pop0
@@ -45,7 +45,7 @@ get_tok:                                # @get_tok
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, id_space
 	i32.store	curval+2($pop1):p2align=1, $pop0
@@ -79,5 +79,5 @@ id_space:
 	.size	id_space, 66
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960209-1.c.s b/test/torture-s/960209-1.c.s
index 5c661cfe5..dcf9a30ad 100644
--- a/test/torture-s/960209-1.c.s
+++ b/test/torture-s/960209-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.const	$push7=, 0
 	i32.select	$1=, $pop0, $pop7, $1
@@ -16,7 +16,7 @@ f:                                      # @f
 	i32.load	$push1=, yabba($pop6)
 	i32.eqz 	$push9=, $pop1
 	br_if   	0, $pop9        # 0: down to label0
-# BB#1:                                 # %cleanup
+# %bb.1:                                # %cleanup
 	return  	$1
 .LBB0_2:                                # %if.end24
 	end_block                       # label0:
@@ -38,12 +38,12 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, yabba($pop2)
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %if.end24.i
+# %bb.1:                                # %if.end24.i
 	i32.const	$push3=, 0
 	i32.const	$push1=, an_array+1
 	i32.store	a_ptr($pop3), $pop1
@@ -83,5 +83,5 @@ a_ptr:
 	.size	a_ptr, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960215-1.c.s b/test/torture-s/960215-1.c.s
index dbb8b1680..2c24951a2 100644
--- a/test/torture-s/960215-1.c.s
+++ b/test/torture-s/960215-1.c.s
@@ -7,83 +7,68 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push54=, 0
+# %bb.0:                                # %entry
 	i32.const	$push52=, 0
 	i32.load	$push51=, __stack_pointer($pop52)
 	i32.const	$push53=, 320
-	i32.sub 	$push218=, $pop51, $pop53
-	tee_local	$push217=, $12=, $pop218
-	i32.store	__stack_pointer($pop54), $pop217
+	i32.sub 	$12=, $pop51, $pop53
+	i32.const	$push54=, 0
+	i32.store	__stack_pointer($pop54), $12
+	i32.const	$push172=, 0
+	i64.load	$0=, U+8($pop172)
+	i32.const	$push171=, 0
+	i64.load	$1=, U($pop171)
+	i32.const	$push170=, 0
+	i64.load	$2=, C+8($pop170)
+	i32.const	$push169=, 0
+	i64.load	$3=, C($pop169)
 	i32.const	$push55=, 304
 	i32.add 	$push56=, $12, $pop55
-	i32.const	$push216=, 0
-	i64.load	$push215=, C($pop216)
-	tee_local	$push214=, $3=, $pop215
-	i32.const	$push213=, 0
-	i64.load	$push212=, C+8($pop213)
-	tee_local	$push211=, $2=, $pop212
-	i32.const	$push210=, 0
-	i64.load	$push209=, U($pop210)
-	tee_local	$push208=, $1=, $pop209
-	i32.const	$push207=, 0
-	i64.load	$push206=, U+8($pop207)
-	tee_local	$push205=, $0=, $pop206
-	call    	__addtf3@FUNCTION, $pop56, $pop214, $pop211, $pop208, $pop205
+	call    	__addtf3@FUNCTION, $pop56, $3, $2, $1, $0
 	i32.const	$push57=, 240
 	i32.add 	$push58=, $12, $pop57
 	call    	__subtf3@FUNCTION, $pop58, $3, $2, $1, $0
-	i32.const	$push61=, 288
-	i32.add 	$push62=, $12, $pop61
-	i64.load	$push204=, 304($12)
-	tee_local	$push203=, $11=, $pop204
 	i32.const	$push59=, 304
 	i32.add 	$push60=, $12, $pop59
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $pop60, $pop0
-	i64.load	$push202=, 0($pop1)
-	tee_local	$push201=, $10=, $pop202
-	call    	__addtf3@FUNCTION, $pop62, $1, $0, $pop203, $pop201
+	i64.load	$10=, 0($pop1)
+	i64.load	$11=, 304($12)
+	i32.const	$push61=, 288
+	i32.add 	$push62=, $12, $pop61
+	call    	__addtf3@FUNCTION, $pop62, $1, $0, $11, $10
+	i32.const	$push168=, 0
+	i64.load	$2=, Y2+8($pop168)
+	i32.const	$push167=, 0
+	i64.load	$3=, Y2($pop167)
 	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
+	call    	__addtf3@FUNCTION, $pop64, $1, $0, $3, $2
 	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	$push166=, 8
+	i32.add 	$push2=, $pop66, $pop166
+	i64.load	$4=, 0($pop2)
+	i64.load	$5=, 240($12)
+	i32.const	$push67=, 224
+	i32.add 	$push68=, $12, $pop67
+	call    	__subtf3@FUNCTION, $pop68, $5, $4, $1, $0
 	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	$push165=, 8
+	i32.add 	$push3=, $pop70, $pop165
+	i64.load	$6=, 0($pop3)
+	i64.load	$7=, 288($12)
+	i32.const	$push71=, 272
+	i32.add 	$push72=, $12, $pop71
+	call    	__addtf3@FUNCTION, $pop72, $1, $0, $7, $6
+	i32.const	$push164=, 0
+	i64.load	$8=, Y1+8($pop164)
+	i32.const	$push163=, 0
+	i64.load	$9=, Y1($pop163)
 	i32.const	$push73=, 16
 	i32.add 	$push74=, $12, $pop73
-	i32.const	$push184=, 0
-	i64.load	$push183=, Y1($pop184)
-	tee_local	$push182=, $9=, $pop183
-	i32.const	$push181=, 0
-	i64.load	$push180=, Y1+8($pop181)
-	tee_local	$push179=, $8=, $pop180
-	call    	__multf3@FUNCTION, $pop74, $3, $2, $pop182, $pop179
+	call    	__multf3@FUNCTION, $pop74, $3, $2, $9, $8
 	i32.const	$push75=, 112
 	i32.add 	$push76=, $12, $pop75
 	call    	__multf3@FUNCTION, $pop76, $5, $4, $9, $8
@@ -92,46 +77,42 @@ main:                                   # @main
 	i64.load	$push6=, 128($12)
 	i32.const	$push77=, 128
 	i32.add 	$push78=, $12, $pop77
-	i32.const	$push178=, 8
-	i32.add 	$push4=, $pop78, $pop178
+	i32.const	$push162=, 8
+	i32.add 	$push4=, $pop78, $pop162
 	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	$push161=, 8
+	i32.add 	$push7=, $pop84, $pop161
+	i64.load	$10=, 0($pop7)
+	i64.load	$11=, 224($12)
+	i32.const	$push85=, 80
+	i32.add 	$push86=, $12, $pop85
+	call    	__multf3@FUNCTION, $pop86, $11, $10, $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
+	i32.const	$push160=, 8
+	i32.add 	$push8=, $pop92, $pop160
+	i64.load	$8=, 0($pop8)
+	i64.load	$9=, 272($12)
+	i32.const	$push93=, 256
+	i32.add 	$push94=, $12, $pop93
+	call    	__addtf3@FUNCTION, $pop94, $1, $0, $9, $8
 	i64.load	$push13=, 16($12)
 	i32.const	$push95=, 16
 	i32.add 	$push96=, $12, $pop95
-	i32.const	$push167=, 8
-	i32.add 	$push9=, $pop96, $pop167
+	i32.const	$push159=, 8
+	i32.add 	$push9=, $pop96, $pop159
 	i64.load	$push10=, 0($pop9)
 	i64.const	$push12=, 0
 	i64.const	$push11=, -4612248968380809216
@@ -141,8 +122,8 @@ main:                                   # @main
 	i64.load	$push16=, 112($12)
 	i32.const	$push97=, 112
 	i32.add 	$push98=, $12, $pop97
-	i32.const	$push166=, 8
-	i32.add 	$push14=, $pop98, $pop166
+	i32.const	$push158=, 8
+	i32.add 	$push14=, $pop98, $pop158
 	i64.load	$push15=, 0($pop14)
 	call    	__subtf3@FUNCTION, $pop100, $pop16, $pop15, $11, $10
 	i32.const	$push103=, 32
@@ -150,8 +131,8 @@ main:                                   # @main
 	i64.load	$push19=, 48($12)
 	i32.const	$push101=, 48
 	i32.add 	$push102=, $12, $pop101
-	i32.const	$push165=, 8
-	i32.add 	$push17=, $pop102, $pop165
+	i32.const	$push157=, 8
+	i32.add 	$push17=, $pop102, $pop157
 	i64.load	$push18=, 0($pop17)
 	call    	__subtf3@FUNCTION, $pop104, $pop19, $pop18, $3, $2
 	i32.const	$push107=, 176
@@ -159,8 +140,8 @@ main:                                   # @main
 	i64.load	$push22=, 192($12)
 	i32.const	$push105=, 192
 	i32.add 	$push106=, $12, $pop105
-	i32.const	$push164=, 8
-	i32.add 	$push20=, $pop106, $pop164
+	i32.const	$push156=, 8
+	i32.add 	$push20=, $pop106, $pop156
 	i64.load	$push21=, 0($pop20)
 	call    	__subtf3@FUNCTION, $pop108, $pop22, $pop21, $9, $8
 	i32.const	$push113=, 64
@@ -168,110 +149,106 @@ main:                                   # @main
 	i64.load	$push28=, 208($12)
 	i32.const	$push111=, 208
 	i32.add 	$push112=, $12, $pop111
-	i32.const	$push163=, 8
-	i32.add 	$push25=, $pop112, $pop163
+	i32.const	$push155=, 8
+	i32.add 	$push25=, $pop112, $pop155
 	i64.load	$push26=, 0($pop25)
 	i64.load	$push27=, 80($12)
 	i32.const	$push109=, 80
 	i32.add 	$push110=, $12, $pop109
-	i32.const	$push162=, 8
-	i32.add 	$push23=, $pop110, $pop162
+	i32.const	$push154=, 8
+	i32.add 	$push23=, $pop110, $pop154
 	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
+	i32.const	$push153=, 8
+	i32.add 	$push29=, $pop116, $pop153
+	i64.load	$0=, 0($pop29)
+	i64.load	$1=, 160($12)
+	i32.const	$push119=, 144
+	i32.add 	$push120=, $12, $pop119
 	i64.load	$push32=, 256($12)
 	i32.const	$push117=, 256
 	i32.add 	$push118=, $12, $pop117
-	i32.const	$push156=, 8
-	i32.add 	$push30=, $pop118, $pop156
+	i32.const	$push152=, 8
+	i32.add 	$push30=, $pop118, $pop152
 	i64.load	$push31=, 0($pop30)
-	call    	__subtf3@FUNCTION, $pop120, $pop160, $pop157, $pop32, $pop31
-	i32.const	$push155=, 0
-	i32.const	$push154=, 8
-	i32.add 	$push33=, $12, $pop154
+	call    	__subtf3@FUNCTION, $pop120, $1, $0, $pop32, $pop31
+	i32.const	$push151=, 0
+	i32.const	$push150=, 8
+	i32.add 	$push33=, $12, $pop150
 	i64.load	$push34=, 0($pop33)
-	i64.store	Y1+8($pop155), $pop34
-	i32.const	$push153=, 0
+	i64.store	Y1+8($pop151), $pop34
+	i32.const	$push149=, 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.store	S($pop151), $1
-	i32.const	$push150=, 0
+	i64.store	Y1($pop149), $pop35
+	i32.const	$push148=, 0
+	i64.store	S+8($pop148), $0
+	i32.const	$push147=, 0
+	i64.store	S($pop147), $1
+	i32.const	$push146=, 0
 	i32.const	$push121=, 96
 	i32.add 	$push122=, $12, $pop121
-	i32.const	$push149=, 8
-	i32.add 	$push36=, $pop122, $pop149
+	i32.const	$push145=, 8
+	i32.add 	$push36=, $pop122, $pop145
 	i64.load	$push37=, 0($pop36)
-	i64.store	T+8($pop150), $pop37
-	i32.const	$push148=, 0
+	i64.store	T+8($pop146), $pop37
+	i32.const	$push144=, 0
 	i64.load	$push38=, 96($12)
-	i64.store	T($pop148), $pop38
-	i32.const	$push147=, 0
+	i64.store	T($pop144), $pop38
+	i32.const	$push143=, 0
 	i32.const	$push123=, 32
 	i32.add 	$push124=, $12, $pop123
-	i32.const	$push146=, 8
-	i32.add 	$push39=, $pop124, $pop146
+	i32.const	$push142=, 8
+	i32.add 	$push39=, $pop124, $pop142
 	i64.load	$push40=, 0($pop39)
-	i64.store	R+8($pop147), $pop40
-	i32.const	$push145=, 0
+	i64.store	R+8($pop143), $pop40
+	i32.const	$push141=, 0
 	i64.load	$push41=, 32($12)
-	i64.store	R($pop145), $pop41
-	i32.const	$push144=, 0
+	i64.store	R($pop141), $pop41
+	i32.const	$push140=, 0
 	i32.const	$push125=, 176
 	i32.add 	$push126=, $12, $pop125
-	i32.const	$push143=, 8
-	i32.add 	$push42=, $pop126, $pop143
+	i32.const	$push139=, 8
+	i32.add 	$push42=, $pop126, $pop139
 	i64.load	$push43=, 0($pop42)
-	i64.store	X+8($pop144), $pop43
-	i32.const	$push142=, 0
+	i64.store	X+8($pop140), $pop43
+	i32.const	$push138=, 0
 	i64.load	$push44=, 176($12)
-	i64.store	X($pop142), $pop44
-	i32.const	$push141=, 0
+	i64.store	X($pop138), $pop44
+	i32.const	$push137=, 0
 	i32.const	$push127=, 64
 	i32.add 	$push128=, $12, $pop127
-	i32.const	$push140=, 8
-	i32.add 	$push45=, $pop128, $pop140
+	i32.const	$push136=, 8
+	i32.add 	$push45=, $pop128, $pop136
 	i64.load	$push46=, 0($pop45)
-	i64.store	Y+8($pop141), $pop46
-	i32.const	$push139=, 0
+	i64.store	Y+8($pop137), $pop46
+	i32.const	$push135=, 0
 	i64.load	$push47=, 64($12)
-	i64.store	Y($pop139), $pop47
-	i32.const	$push138=, 0
+	i64.store	Y($pop135), $pop47
 	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
-	i64.load	$push133=, 144($12)
-	tee_local	$push132=, $0=, $pop133
-	i64.store	Z($pop134), $pop132
+	i32.const	$push134=, 8
+	i32.add 	$push48=, $pop130, $pop134
+	i64.load	$0=, 0($pop48)
+	i32.const	$push133=, 0
+	i64.store	Z+8($pop133), $0
+	i64.load	$1=, 144($12)
+	i32.const	$push132=, 0
+	i64.store	Z($pop132), $1
 	block   	
 	i64.const	$push131=, 0
 	i64.const	$push49=, 4612108230892453888
-	i32.call	$push50=, __eqtf2@FUNCTION, $0, $1, $pop131, $pop49
-	i32.eqz 	$push220=, $pop50
-	br_if   	0, $pop220      # 0: down to label0
-# BB#1:                                 # %if.then
+	i32.call	$push50=, __eqtf2@FUNCTION, $1, $0, $pop131, $pop49
+	i32.eqz 	$push174=, $pop50
+	br_if   	0, $pop174      # 0: down to label0
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
-	i32.const	$push219=, 0
-	call    	exit@FUNCTION, $pop219
+	i32.const	$push173=, 0
+	call    	exit@FUNCTION, $pop173
 	unreachable
 	.endfunc
 .Lfunc_end0:
@@ -378,6 +355,6 @@ S:
 	.size	S, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6a6d8a06a..d1aaf315e 100644
--- a/test/torture-s/960218-1.c.s
+++ b/test/torture-s/960218-1.c.s
@@ -7,7 +7,7 @@
 g:                                      # @g
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	glob($pop0), $0
 	i32.const	$push1=, 0
@@ -23,12 +23,12 @@ g:                                      # @g
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, -1
 	i32.eq  	$push0=, $0, $pop3
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.cond.while.end_crit_edge
+# %bb.1:                                # %while.cond.while.end_crit_edge
 	i32.const	$push2=, 0
 	i32.const	$push4=, -1
 	i32.xor 	$push1=, $0, $pop4
@@ -47,7 +47,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, -4
 	i32.store	glob($pop1), $pop0
@@ -68,5 +68,5 @@ glob:
 	.size	glob, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960219-1.c.s b/test/torture-s/960219-1.c.s
index ee8754ae1..3d671c7ec 100644
--- a/test/torture-s/960219-1.c.s
+++ b/test/torture-s/960219-1.c.s
@@ -7,10 +7,10 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -35,6 +35,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d2c406f05..36b7f08f2 100644
--- a/test/torture-s/960301-1.c.s
+++ b/test/torture-s/960301-1.c.s
@@ -8,14 +8,13 @@ bar:                                    # @bar
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, foo($pop14)
-	tee_local	$push12=, $1=, $pop13
+	i32.load16_u	$1=, foo($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push1=, 12
-	i32.shr_u	$push2=, $pop12, $pop1
-	i32.store	oldfoo($pop0), $pop2
+	i32.shr_u	$push2=, $1, $pop1
+	i32.store	oldfoo($pop12), $pop2
 	i32.const	$push11=, 0
 	i32.const	$push4=, 4095
 	i32.and 	$push5=, $1, $pop4
@@ -38,14 +37,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load16_u	$push10=, foo($pop11)
-	tee_local	$push9=, $0=, $pop10
+	i32.load16_u	$0=, foo($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push1=, 12
-	i32.shr_u	$push2=, $pop9, $pop1
-	i32.store	oldfoo($pop0), $pop2
+	i32.shr_u	$push2=, $0, $pop1
+	i32.store	oldfoo($pop9), $pop2
 	i32.const	$push8=, 0
 	i32.const	$push3=, 4095
 	i32.and 	$push4=, $0, $pop3
@@ -78,5 +76,5 @@ oldfoo:
 	.size	oldfoo, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960302-1.c.s b/test/torture-s/960302-1.c.s
index 714fdf51f..a99114ee0 100644
--- a/test/torture-s/960302-1.c.s
+++ b/test/torture-s/960302-1.c.s
@@ -7,16 +7,15 @@
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push3=, 1
-	i32.const	$push5=, -1
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, a($pop0)
 	i32.const	$push2=, 2
-	i32.rem_s	$push11=, $pop1, $pop2
-	tee_local	$push10=, $0=, $pop11
+	i32.rem_s	$0=, $pop1, $pop2
+	i32.const	$push3=, 1
+	i32.const	$push5=, -1
 	i32.const	$push9=, 1
-	i32.eq  	$push4=, $pop10, $pop9
+	i32.eq  	$push4=, $0, $pop9
 	i32.select	$push6=, $pop3, $pop5, $pop4
 	i32.const	$push8=, 0
 	i32.select	$push7=, $pop6, $pop8, $0
@@ -31,7 +30,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 0
 	i32.load	$push0=, a($pop5)
@@ -40,7 +39,7 @@ main:                                   # @main
 	i32.const	$push3=, 1
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
 	unreachable
@@ -62,6 +61,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 942f41489..fb3ec4b63 100644
--- a/test/torture-s/960311-1.c.s
+++ b/test/torture-s/960311-1.c.s
@@ -5,7 +5,7 @@
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, count($pop4)
@@ -23,13 +23,13 @@ a1:                                     # @a1
 	.type	b,@function
 b:                                      # @b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 128
 	i32.and 	$push1=, $0, $pop0
 	i32.eqz 	$push21=, $pop1
 	br_if   	0, $pop21       # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push2=, 0
 	i32.const	$push18=, 0
 	i32.load	$push3=, count($pop18)
@@ -43,7 +43,7 @@ b:                                      # @b
 	i32.and 	$push7=, $0, $pop6
 	i32.eqz 	$push22=, $pop7
 	br_if   	0, $pop22       # 0: down to label1
-# BB#3:                                 # %if.then6
+# %bb.3:                                # %if.then6
 	i32.const	$push8=, 0
 	i32.const	$push19=, 0
 	i32.load	$push9=, count($pop19)
@@ -57,7 +57,7 @@ b:                                      # @b
 	i32.and 	$push13=, $0, $pop12
 	i32.eqz 	$push23=, $pop13
 	br_if   	0, $pop23       # 0: down to label2
-# BB#5:                                 # %if.then14
+# %bb.5:                                # %if.then14
 	i32.const	$push14=, 0
 	i32.const	$push20=, 0
 	i32.load	$push15=, count($pop20)
@@ -77,7 +77,7 @@ b:                                      # @b
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end21
+# %bb.0:                                # %if.end21
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	count($pop1), $pop0
@@ -98,5 +98,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960311-2.c.s b/test/torture-s/960311-2.c.s
index 60c57fea1..8b343d19f 100644
--- a/test/torture-s/960311-2.c.s
+++ b/test/torture-s/960311-2.c.s
@@ -5,7 +5,7 @@
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, count($pop4)
@@ -23,13 +23,13 @@ a1:                                     # @a1
 	.type	b,@function
 b:                                      # @b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 32768
 	i32.and 	$push1=, $0, $pop0
 	i32.eqz 	$push21=, $pop1
 	br_if   	0, $pop21       # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push2=, 0
 	i32.const	$push18=, 0
 	i32.load	$push3=, count($pop18)
@@ -43,7 +43,7 @@ b:                                      # @b
 	i32.and 	$push7=, $0, $pop6
 	i32.eqz 	$push22=, $pop7
 	br_if   	0, $pop22       # 0: down to label1
-# BB#3:                                 # %if.then6
+# %bb.3:                                # %if.then6
 	i32.const	$push8=, 0
 	i32.const	$push19=, 0
 	i32.load	$push9=, count($pop19)
@@ -57,7 +57,7 @@ b:                                      # @b
 	i32.and 	$push13=, $0, $pop12
 	i32.eqz 	$push23=, $pop13
 	br_if   	0, $pop23       # 0: down to label2
-# BB#5:                                 # %if.then14
+# %bb.5:                                # %if.then14
 	i32.const	$push14=, 0
 	i32.const	$push20=, 0
 	i32.load	$push15=, count($pop20)
@@ -77,7 +77,7 @@ b:                                      # @b
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end21
+# %bb.0:                                # %if.end21
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	count($pop1), $pop0
@@ -98,5 +98,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960311-3.c.s b/test/torture-s/960311-3.c.s
index 9af250f0d..7c8498d92 100644
--- a/test/torture-s/960311-3.c.s
+++ b/test/torture-s/960311-3.c.s
@@ -5,7 +5,7 @@
 	.globl	a1
 	.type	a1,@function
 a1:                                     # @a1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, count($pop4)
@@ -23,12 +23,12 @@ a1:                                     # @a1
 	.type	b,@function
 b:                                      # @b
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -1
 	i32.gt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push2=, 0
 	i32.const	$push18=, 0
 	i32.load	$push3=, count($pop18)
@@ -42,7 +42,7 @@ b:                                      # @b
 	i32.and 	$push7=, $0, $pop6
 	i32.eqz 	$push21=, $pop7
 	br_if   	0, $pop21       # 0: down to label1
-# BB#3:                                 # %if.then3
+# %bb.3:                                # %if.then3
 	i32.const	$push8=, 0
 	i32.const	$push19=, 0
 	i32.load	$push9=, count($pop19)
@@ -56,7 +56,7 @@ b:                                      # @b
 	i32.and 	$push13=, $0, $pop12
 	i32.eqz 	$push22=, $pop13
 	br_if   	0, $pop22       # 0: down to label2
-# BB#5:                                 # %if.then8
+# %bb.5:                                # %if.then8
 	i32.const	$push14=, 0
 	i32.const	$push20=, 0
 	i32.load	$push15=, count($pop20)
@@ -76,7 +76,7 @@ b:                                      # @b
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end21
+# %bb.0:                                # %if.end21
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	count($pop1), $pop0
@@ -97,5 +97,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960312-1.c.s b/test/torture-s/960312-1.c.s
index a4346b896..9a5d9dc93 100644
--- a/test/torture-s/960312-1.c.s
+++ b/test/torture-s/960312-1.c.s
@@ -8,15 +8,13 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
-	i32.add 	$push4=, $0, $pop0
-	tee_local	$push3=, $3=, $pop4
-	i32.load	$4=, 0($pop3)
+	i32.add 	$3=, $0, $pop0
+	i32.load	$4=, 0($3)
 	i32.load	$5=, 12($0)
-	i32.load	$push2=, 8($0)
-	tee_local	$push1=, $6=, $pop2
-	i32.load	$7=, 0($pop1)
+	i32.load	$6=, 8($0)
+	i32.load	$7=, 0($6)
 	i32.load	$2=, 8($6)
 	i32.load	$1=, 4($6)
 	#APP
@@ -27,8 +25,8 @@ f:                                      # @f
 	i32.store	12($0), $2
 	i32.store	0($3), $5
 	i32.store	4($0), $1
-	copy_local	$push5=, $0
-                                        # fallthrough-return: $pop5
+	copy_local	$push1=, $0
+                                        # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -40,46 +38,52 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
-	i32.load	$2=, main.sc($pop7)
+	i32.load8_u	$2=, main.sc.0($pop7)
 	i32.const	$push6=, 0
-	i32.load	$1=, main.sc+8($pop6)
-	i32.const	$push5=, 0
-	i32.load	$0=, main.sc+4($pop5)
+	i32.load	$1=, main.sc.2($pop6)
+	i32.const	$0=, 3
 	#APP
 	#NO_APP
+	i32.const	$push5=, 0
+	i32.const	$push0=, 1
+	i32.store8	main.sc.0($pop5), $pop0
 	i32.const	$push4=, 0
-	i32.const	$push0=, 11
-	i32.store	main.sc($pop4), $pop0
-	i32.const	$push3=, 0
-	i32.store	main.sc+8($pop3), $2
-	block   	
+	i32.const	$push2=, 11
 	i32.const	$push1=, 2
-	i32.ne  	$push2=, $2, $pop1
-	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push8=, 0
-	call    	exit@FUNCTION, $pop8
+	i32.select	$push3=, $pop2, $pop1, $2
+	i32.store	main.sc.2($pop4), $pop3
+	block   	
+	i32.eqz 	$push9=, $2
+	br_if   	0, $pop9        # 0: down to label0
+# %bb.1:                                # %if.then
+	call    	abort@FUNCTION
 	unreachable
-.LBB1_2:                                # %if.then
+.LBB1_2:                                # %if.end
 	end_block                       # label0:
-	call    	abort@FUNCTION
+	i32.const	$push8=, 0
+	call    	exit@FUNCTION, $pop8
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
-	.type	main.sc,@object         # @main.sc
-	.section	.data.main.sc,"aw",@progbits
+	.type	main.sc.0,@object       # @main.sc.0
+	.section	.bss.main.sc.0,"aw",@nobits
+	.p2align	2
+main.sc.0:
+	.int8	0                       # 0x0
+	.size	main.sc.0, 1
+
+	.type	main.sc.2,@object       # @main.sc.2
+	.section	.data.main.sc.2,"aw",@progbits
 	.p2align	2
-main.sc:
-	.int32	2                       # 0x2
-	.int32	3                       # 0x3
+main.sc.2:
 	.int32	4                       # 0x4
-	.size	main.sc, 12
+	.size	main.sc.2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 489825282..7c0354779 100644
--- a/test/torture-s/960317-1.c.s
+++ b/test/torture-s/960317-1.c.s
@@ -7,27 +7,26 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push6=, -1
+	i32.shl 	$0=, $pop6, $0
 	block   	
-	i32.const	$push8=, 0
-	i32.const	$push7=, -1
-	i32.shl 	$push6=, $pop7, $0
-	tee_local	$push5=, $0=, $pop6
-	i32.sub 	$push0=, $pop8, $pop5
+	i32.const	$push5=, 0
+	i32.sub 	$push0=, $pop5, $0
 	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.eqz 	$push10=, $pop1
+	br_if   	0, $pop10       # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push8=, -1
+	i32.xor 	$push2=, $0, $pop8
 	i32.and 	$push3=, $pop2, $1
-	i32.const	$push9=, 0
-	i32.ne  	$push4=, $pop3, $pop9
+	i32.const	$push7=, 0
+	i32.ne  	$push4=, $pop3, $pop7
 	return  	$pop4
 .LBB0_2:                                # %cleanup
 	end_block                       # label0:
-	i32.const	$push11=, 0
-                                        # fallthrough-return: $pop11
+	i32.const	$push9=, 0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -38,7 +37,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -47,5 +46,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960321-1.c.s b/test/torture-s/960321-1.c.s
index 5456cbd07..7ab367aee 100644
--- a/test/torture-s/960321-1.c.s
+++ b/test/torture-s/960321-1.c.s
@@ -7,7 +7,7 @@
 acc_a:                                  # @acc_a
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, a-2000000000
 	i32.add 	$push1=, $0, $pop0
 	i32.load8_s	$push2=, 0($pop1)
@@ -22,14 +22,14 @@ acc_a:                                  # @acc_a
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load8_u	$push0=, a($pop3)
 	i32.const	$push1=, 100
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -50,6 +50,6 @@ a:
 	.size	a, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 710539e26..81bf7ca15 100644
--- a/test/torture-s/960326-1.c.s
+++ b/test/torture-s/960326-1.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, s+4($pop3)
 	i32.const	$push1=, 3
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -41,6 +41,6 @@ s:
 	.size	s, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e0d1f3578..98a2e3800 100644
--- a/test/torture-s/960327-1.c.s
+++ b/test/torture-s/960327-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,14 +20,13 @@ g:                                      # @g
 f:                                      # @f
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $3
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lf.s+6($pop0):p2align=0
 	i64.store	6($3):p2align=1, $pop1
@@ -39,17 +38,16 @@ f:                                      # @f
 .LBB1_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # 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.const	$push21=, -1
+	i32.add 	$0=, $2, $pop21
+	i32.const	$push20=, -2
+	i32.add 	$1=, $2, $pop20
+	copy_local	$2=, $0
 	i32.load8_u	$push4=, 0($1)
-	i32.const	$push21=, 48
-	i32.eq  	$push5=, $pop4, $pop21
+	i32.const	$push19=, 48
+	i32.eq  	$push5=, $pop4, $pop19
 	br_if   	0, $pop5        # 0: up to label0
-# BB#2:                                 # %while.end
+# %bb.2:                                # %while.end
 	end_loop
 	i32.const	$push6=, 88
 	i32.store16	0($0):p2align=0, $pop6
@@ -57,10 +55,10 @@ f:                                      # @f
 	i32.const	$push7=, 12
 	i32.add 	$push8=, $3, $pop7
 	i32.load8_u	$push9=, 0($pop8)
-	i32.const	$push26=, 88
-	i32.ne  	$push10=, $pop9, $pop26
+	i32.const	$push22=, 88
+	i32.ne  	$push10=, $pop9, $pop22
 	br_if   	0, $pop10       # 0: down to label1
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push17=, 0
 	i32.const	$push15=, 16
 	i32.add 	$push16=, $3, $pop15
@@ -80,7 +78,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -96,6 +94,6 @@ main:                                   # @main
 	.size	.Lf.s, 14
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8e527a4d0..c72e08daa 100644
--- a/test/torture-s/960402-1.c.s
+++ b/test/torture-s/960402-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
 	i64.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 6442450943
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -32,5 +32,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960405-1.c.s b/test/torture-s/960405-1.c.s
index 649fb53a1..ffadbf713 100644
--- a/test/torture-s/960405-1.c.s
+++ b/test/torture-s/960405-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push8=, 0
 	i64.load	$push3=, x($pop8)
@@ -19,7 +19,7 @@ main:                                   # @main
 	i32.call	$push4=, __eqtf2@FUNCTION, $pop3, $pop2, $pop1, $pop0
 	i32.eqz 	$push10=, $pop4
 	br_if   	0, $pop10       # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -52,6 +52,6 @@ y:
 	.size	y, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6e857b745..299ff04cf 100644
--- a/test/torture-s/960416-1.c.s
+++ b/test/torture-s/960416-1.c.s
@@ -7,57 +7,46 @@
 f_le:                                   # @f_le
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i64, i64, i64, i64
-# BB#0:                                 # %entry
-	i32.load	$push47=, 0($1)
-	tee_local	$push46=, $2=, $pop47
-	i64.extend_u/i32	$push11=, $pop46
-	i32.load	$push45=, 0($0)
-	tee_local	$push44=, $3=, $pop45
-	i64.extend_u/i32	$push10=, $pop44
-	i64.mul 	$push43=, $pop11, $pop10
-	tee_local	$push42=, $6=, $pop43
-	i64.const	$push15=, 32
-	i64.shr_u	$push41=, $pop42, $pop15
-	tee_local	$push40=, $8=, $pop41
-	i32.load	$push39=, 4($1)
-	tee_local	$push38=, $1=, $pop39
-	i64.extend_u/i32	$push13=, $pop38
-	i32.load	$push37=, 4($0)
-	tee_local	$push36=, $4=, $pop37
-	i64.extend_u/i32	$push12=, $pop36
-	i64.mul 	$push35=, $pop13, $pop12
-	tee_local	$push34=, $7=, $pop35
-	i64.add 	$push20=, $pop40, $pop34
-	i64.const	$push33=, 32
-	i64.shr_u	$push21=, $7, $pop33
-	i64.add 	$push22=, $pop20, $pop21
+	.local  	i32, i32, i32, i32, i64, i64, i64, i64
+# %bb.0:                                # %entry
+	i32.load	$2=, 4($1)
+	i32.load	$1=, 0($1)
+	i32.sub 	$3=, $1, $2
+	i32.gt_u	$4=, $3, $1
+	i32.load	$5=, 0($0)
+	i32.load	$0=, 4($0)
 	i32.const	$push0=, 0
-	i32.sub 	$push32=, $2, $1
-	tee_local	$push31=, $0=, $pop32
-	i32.sub 	$push1=, $pop0, $pop31
-	i32.gt_u	$push30=, $0, $2
-	tee_local	$push29=, $1=, $pop30
-	i32.select	$push2=, $pop1, $0, $pop29
+	i32.sub 	$push1=, $pop0, $3
+	i32.select	$push2=, $pop1, $3, $4
 	i64.extend_u/i32	$push3=, $pop2
-	i32.sub 	$push4=, $4, $3
+	i32.sub 	$push4=, $0, $5
 	i64.extend_u/i32	$push5=, $pop4
 	i64.mul 	$push6=, $pop3, $pop5
 	i64.const	$push8=, -1
 	i64.const	$push7=, 0
-	i64.select	$push9=, $pop8, $pop7, $1
-	i64.xor 	$push28=, $pop6, $pop9
-	tee_local	$push27=, $5=, $pop28
+	i64.select	$push9=, $pop8, $pop7, $4
+	i64.xor 	$6=, $pop6, $pop9
+	i64.extend_u/i32	$push11=, $2
+	i64.extend_u/i32	$push10=, $0
+	i64.mul 	$7=, $pop11, $pop10
+	i64.extend_u/i32	$push13=, $1
+	i64.extend_u/i32	$push12=, $5
+	i64.mul 	$8=, $pop13, $pop12
+	i64.const	$push14=, 32
+	i64.shr_u	$push15=, $8, $pop14
+	i64.add 	$9=, $pop15, $7
 	i64.const	$push26=, 32
-	i64.shr_u	$push19=, $pop27, $pop26
-	i64.add 	$push23=, $pop22, $pop19
-	i32.wrap/i64	$push24=, $pop23
-	i64.add 	$push14=, $7, $6
-	i64.add 	$push16=, $pop14, $8
-	i64.add 	$push17=, $pop16, $5
+	i64.shr_u	$push20=, $7, $pop26
+	i64.add 	$push21=, $9, $pop20
+	i64.const	$push25=, 32
+	i64.shr_u	$push19=, $6, $pop25
+	i64.add 	$push22=, $pop21, $pop19
+	i32.wrap/i64	$push23=, $pop22
+	i64.add 	$push16=, $9, $8
+	i64.add 	$push17=, $pop16, $6
 	i32.wrap/i64	$push18=, $pop17
-	i32.add 	$push25=, $pop24, $pop18
-                                        # fallthrough-return: $pop25
+	i32.add 	$push24=, $pop23, $pop18
+                                        # fallthrough-return: $pop24
 	.endfunc
 .Lfunc_end0:
 	.size	f_le, .Lfunc_end0-f_le
@@ -69,61 +58,51 @@ f_le:                                   # @f_le
 f_be:                                   # @f_be
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i64, i64, i64, i64
-# BB#0:                                 # %entry
-	i32.load	$push57=, 4($1)
-	tee_local	$push56=, $2=, $pop57
-	i64.extend_u/i32	$push13=, $pop56
-	i32.load	$push55=, 4($0)
-	tee_local	$push54=, $3=, $pop55
-	i64.extend_u/i32	$push12=, $pop54
-	i64.mul 	$push53=, $pop13, $pop12
-	tee_local	$push52=, $6=, $pop53
-	i64.const	$push14=, 4294967295
-	i64.and 	$push51=, $pop52, $pop14
-	tee_local	$push50=, $7=, $pop51
-	i32.load	$push49=, 0($1)
-	tee_local	$push48=, $1=, $pop49
-	i64.extend_u/i32	$push18=, $pop48
-	i32.load	$push47=, 0($0)
-	tee_local	$push46=, $4=, $pop47
-	i64.extend_u/i32	$push17=, $pop46
-	i64.mul 	$push45=, $pop18, $pop17
-	tee_local	$push44=, $8=, $pop45
-	i64.add 	$push25=, $pop50, $pop44
-	i64.const	$push43=, 4294967295
-	i64.and 	$push26=, $8, $pop43
-	i64.add 	$push27=, $pop25, $pop26
+	.local  	i32, i32, i32, i32, i64, i64, i64, i64
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($1)
+	i32.load	$1=, 4($1)
+	i32.sub 	$3=, $1, $2
+	i32.gt_u	$4=, $3, $1
+	i32.load	$5=, 4($0)
+	i32.load	$0=, 0($0)
 	i32.const	$push0=, 0
-	i32.sub 	$push42=, $2, $1
-	tee_local	$push41=, $0=, $pop42
-	i32.sub 	$push1=, $pop0, $pop41
-	i32.gt_u	$push40=, $0, $2
-	tee_local	$push39=, $1=, $pop40
-	i32.select	$push2=, $pop1, $0, $pop39
+	i32.sub 	$push1=, $pop0, $3
+	i32.select	$push2=, $pop1, $3, $4
 	i64.extend_u/i32	$push3=, $pop2
-	i32.sub 	$push4=, $4, $3
+	i32.sub 	$push4=, $0, $5
 	i64.extend_u/i32	$push5=, $pop4
 	i64.mul 	$push6=, $pop3, $pop5
 	i64.const	$push8=, -1
 	i64.const	$push7=, 0
-	i64.select	$push9=, $pop8, $pop7, $1
-	i64.xor 	$push38=, $pop6, $pop9
-	tee_local	$push37=, $5=, $pop38
+	i64.select	$push9=, $pop8, $pop7, $4
+	i64.xor 	$6=, $pop6, $pop9
+	i64.extend_u/i32	$push13=, $1
+	i64.extend_u/i32	$push12=, $5
+	i64.mul 	$7=, $pop13, $pop12
+	i64.const	$push14=, 4294967295
+	i64.and 	$8=, $7, $pop14
+	i64.extend_u/i32	$push18=, $2
+	i64.extend_u/i32	$push17=, $0
+	i64.mul 	$9=, $pop18, $pop17
+	i64.add 	$push25=, $8, $9
+	i64.const	$push37=, 4294967295
+	i64.and 	$push26=, $9, $pop37
+	i64.add 	$push27=, $pop25, $pop26
 	i64.const	$push36=, 4294967295
-	i64.and 	$push24=, $pop37, $pop36
+	i64.and 	$push24=, $6, $pop36
 	i64.add 	$push28=, $pop27, $pop24
 	i64.const	$push10=, 32
 	i64.shr_u	$push29=, $pop28, $pop10
 	i32.wrap/i64	$push30=, $pop29
 	i64.const	$push35=, 32
-	i64.shr_u	$push15=, $6, $pop35
-	i64.add 	$push16=, $pop15, $7
+	i64.shr_u	$push15=, $7, $pop35
+	i64.add 	$push16=, $pop15, $8
 	i64.const	$push34=, 32
-	i64.shr_u	$push19=, $8, $pop34
+	i64.shr_u	$push19=, $9, $pop34
 	i64.add 	$push20=, $pop16, $pop19
 	i64.const	$push33=, 32
-	i64.shr_u	$push11=, $5, $pop33
+	i64.shr_u	$push11=, $6, $pop33
 	i64.add 	$push21=, $pop20, $pop11
 	i64.const	$push32=, 32
 	i64.shr_u	$push22=, $pop21, $pop32
@@ -140,7 +119,7 @@ f_be:                                   # @f_be
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end12
+# %bb.0:                                # %if.end12
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -149,5 +128,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960419-1.c.s b/test/torture-s/960419-1.c.s
index e2deb25a7..c3b23a6a8 100644
--- a/test/torture-s/960419-1.c.s
+++ b/test/torture-s/960419-1.c.s
@@ -6,11 +6,11 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ check:                                  # @check
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -35,6 +35,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f9d0de535..3fb75e452 100644
--- a/test/torture-s/960419-2.c.s
+++ b/test/torture-s/960419-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960512-1.c.s b/test/torture-s/960512-1.c.s
index f3bc07325..7a7f9f313 100644
--- a/test/torture-s/960512-1.c.s
+++ b/test/torture-s/960512-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 8
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960513-1.c.s b/test/torture-s/960513-1.c.s
index a0cc264d1..94f63273b 100644
--- a/test/torture-s/960513-1.c.s
+++ b/test/torture-s/960513-1.c.s
@@ -7,145 +7,131 @@
 f:                                      # @f
 	.param  	i32, i64, i64, i32
 	.local  	i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push37=, 0
-	i32.const	$push35=, 0
-	i32.load	$push34=, __stack_pointer($pop35)
-	i32.const	$push36=, 192
-	i32.sub 	$push121=, $pop34, $pop36
-	tee_local	$push120=, $6=, $pop121
-	i32.store	__stack_pointer($pop37), $pop120
-	i32.const	$push41=, 176
-	i32.add 	$push42=, $6, $pop41
+# %bb.0:                                # %entry
+	i32.const	$push34=, 0
+	i32.load	$push33=, __stack_pointer($pop34)
+	i32.const	$push35=, 192
+	i32.sub 	$6=, $pop33, $pop35
+	i32.const	$push36=, 0
+	i32.store	__stack_pointer($pop36), $6
+	i32.const	$push40=, 176
+	i32.add 	$push41=, $6, $pop40
 	i64.const	$push1=, 0
 	i64.const	$push0=, -9223372036854775808
-	call    	__subtf3@FUNCTION, $pop42, $pop1, $pop0, $1, $2
-	i32.const	$push43=, 160
-	i32.add 	$push44=, $6, $pop43
-	i64.const	$push119=, 0
+	call    	__subtf3@FUNCTION, $pop41, $pop1, $pop0, $1, $2
+	i32.const	$push42=, 160
+	i32.add 	$push43=, $6, $pop42
+	i64.const	$push95=, 0
 	i64.const	$push2=, -4611686018427387904
-	call    	__multf3@FUNCTION, $pop44, $1, $2, $pop119, $pop2
-	i32.const	$push49=, 144
-	i32.add 	$push50=, $6, $pop49
-	i64.load	$push10=, 160($6)
-	i64.load	$push9=, 176($6)
+	call    	__multf3@FUNCTION, $pop43, $1, $2, $pop95, $pop2
 	i32.const	$push3=, 1
-	i32.eq  	$push118=, $3, $pop3
-	tee_local	$push117=, $3=, $pop118
-	i64.select	$push116=, $pop10, $pop9, $pop117
-	tee_local	$push115=, $5=, $pop116
-	i32.const	$push47=, 160
-	i32.add 	$push48=, $6, $pop47
+	i32.eq  	$3=, $3, $pop3
+	i32.const	$push46=, 160
+	i32.add 	$push47=, $6, $pop46
 	i32.const	$push4=, 8
-	i32.add 	$push7=, $pop48, $pop4
+	i32.add 	$push7=, $pop47, $pop4
 	i64.load	$push8=, 0($pop7)
-	i32.const	$push45=, 176
-	i32.add 	$push46=, $6, $pop45
-	i32.const	$push114=, 8
-	i32.add 	$push5=, $pop46, $pop114
+	i32.const	$push44=, 176
+	i32.add 	$push45=, $6, $pop44
+	i32.const	$push94=, 8
+	i32.add 	$push5=, $pop45, $pop94
 	i64.load	$push6=, 0($pop5)
-	i64.select	$push113=, $pop8, $pop6, $3
-	tee_local	$push112=, $4=, $pop113
-	call    	__multf3@FUNCTION, $pop50, $pop115, $pop112, $1, $2
-	i32.const	$push53=, 128
-	i32.add 	$push54=, $6, $pop53
+	i64.select	$4=, $pop8, $pop6, $3
+	i64.load	$push10=, 160($6)
+	i64.load	$push9=, 176($6)
+	i64.select	$5=, $pop10, $pop9, $3
+	i32.const	$push48=, 144
+	i32.add 	$push49=, $6, $pop48
+	call    	__multf3@FUNCTION, $pop49, $5, $4, $1, $2
+	i32.const	$push52=, 128
+	i32.add 	$push53=, $6, $pop52
 	i64.load	$push13=, 144($6)
-	i32.const	$push51=, 144
-	i32.add 	$push52=, $6, $pop51
-	i32.const	$push111=, 8
-	i32.add 	$push11=, $pop52, $pop111
+	i32.const	$push50=, 144
+	i32.add 	$push51=, $6, $pop50
+	i32.const	$push93=, 8
+	i32.add 	$push11=, $pop51, $pop93
 	i64.load	$push12=, 0($pop11)
-	call    	__addtf3@FUNCTION, $pop54, $5, $4, $pop13, $pop12
-	i32.const	$push57=, 112
-	i32.add 	$push58=, $6, $pop57
-	i64.load	$push110=, 128($6)
-	tee_local	$push109=, $5=, $pop110
-	i32.const	$push55=, 128
-	i32.add 	$push56=, $6, $pop55
-	i32.const	$push108=, 8
-	i32.add 	$push14=, $pop56, $pop108
-	i64.load	$push107=, 0($pop14)
-	tee_local	$push106=, $4=, $pop107
-	call    	__multf3@FUNCTION, $pop58, $pop109, $pop106, $1, $2
-	i32.const	$push61=, 96
-	i32.add 	$push62=, $6, $pop61
+	call    	__addtf3@FUNCTION, $pop53, $5, $4, $pop13, $pop12
+	i32.const	$push54=, 128
+	i32.add 	$push55=, $6, $pop54
+	i32.const	$push92=, 8
+	i32.add 	$push14=, $pop55, $pop92
+	i64.load	$4=, 0($pop14)
+	i64.load	$5=, 128($6)
+	i32.const	$push56=, 112
+	i32.add 	$push57=, $6, $pop56
+	call    	__multf3@FUNCTION, $pop57, $5, $4, $1, $2
+	i32.const	$push60=, 96
+	i32.add 	$push61=, $6, $pop60
 	i64.load	$push17=, 112($6)
-	i32.const	$push59=, 112
-	i32.add 	$push60=, $6, $pop59
-	i32.const	$push105=, 8
-	i32.add 	$push15=, $pop60, $pop105
+	i32.const	$push58=, 112
+	i32.add 	$push59=, $6, $pop58
+	i32.const	$push91=, 8
+	i32.add 	$push15=, $pop59, $pop91
 	i64.load	$push16=, 0($pop15)
-	call    	__addtf3@FUNCTION, $pop62, $5, $4, $pop17, $pop16
-	i32.const	$push65=, 80
-	i32.add 	$push66=, $6, $pop65
-	i64.load	$push104=, 96($6)
-	tee_local	$push103=, $5=, $pop104
-	i32.const	$push63=, 96
-	i32.add 	$push64=, $6, $pop63
-	i32.const	$push102=, 8
-	i32.add 	$push18=, $pop64, $pop102
-	i64.load	$push101=, 0($pop18)
-	tee_local	$push100=, $4=, $pop101
-	call    	__multf3@FUNCTION, $pop66, $pop103, $pop100, $1, $2
-	i32.const	$push69=, 64
-	i32.add 	$push70=, $6, $pop69
+	call    	__addtf3@FUNCTION, $pop61, $5, $4, $pop17, $pop16
+	i32.const	$push62=, 96
+	i32.add 	$push63=, $6, $pop62
+	i32.const	$push90=, 8
+	i32.add 	$push18=, $pop63, $pop90
+	i64.load	$4=, 0($pop18)
+	i64.load	$5=, 96($6)
+	i32.const	$push64=, 80
+	i32.add 	$push65=, $6, $pop64
+	call    	__multf3@FUNCTION, $pop65, $5, $4, $1, $2
+	i32.const	$push68=, 64
+	i32.add 	$push69=, $6, $pop68
 	i64.load	$push21=, 80($6)
-	i32.const	$push67=, 80
-	i32.add 	$push68=, $6, $pop67
-	i32.const	$push99=, 8
-	i32.add 	$push19=, $pop68, $pop99
+	i32.const	$push66=, 80
+	i32.add 	$push67=, $6, $pop66
+	i32.const	$push89=, 8
+	i32.add 	$push19=, $pop67, $pop89
 	i64.load	$push20=, 0($pop19)
-	call    	__addtf3@FUNCTION, $pop70, $5, $4, $pop21, $pop20
-	i32.const	$push73=, 48
-	i32.add 	$push74=, $6, $pop73
-	i64.load	$push98=, 64($6)
-	tee_local	$push97=, $5=, $pop98
-	i32.const	$push71=, 64
-	i32.add 	$push72=, $6, $pop71
-	i32.const	$push96=, 8
-	i32.add 	$push22=, $pop72, $pop96
-	i64.load	$push95=, 0($pop22)
-	tee_local	$push94=, $4=, $pop95
-	call    	__multf3@FUNCTION, $pop74, $pop97, $pop94, $1, $2
-	i32.const	$push77=, 32
-	i32.add 	$push78=, $6, $pop77
+	call    	__addtf3@FUNCTION, $pop69, $5, $4, $pop21, $pop20
+	i32.const	$push70=, 64
+	i32.add 	$push71=, $6, $pop70
+	i32.const	$push88=, 8
+	i32.add 	$push22=, $pop71, $pop88
+	i64.load	$4=, 0($pop22)
+	i64.load	$5=, 64($6)
+	i32.const	$push72=, 48
+	i32.add 	$push73=, $6, $pop72
+	call    	__multf3@FUNCTION, $pop73, $5, $4, $1, $2
+	i32.const	$push76=, 32
+	i32.add 	$push77=, $6, $pop76
 	i64.load	$push25=, 48($6)
-	i32.const	$push75=, 48
-	i32.add 	$push76=, $6, $pop75
-	i32.const	$push93=, 8
-	i32.add 	$push23=, $pop76, $pop93
+	i32.const	$push74=, 48
+	i32.add 	$push75=, $6, $pop74
+	i32.const	$push87=, 8
+	i32.add 	$push23=, $pop75, $pop87
 	i64.load	$push24=, 0($pop23)
-	call    	__addtf3@FUNCTION, $pop78, $5, $4, $pop25, $pop24
-	i32.const	$push81=, 16
-	i32.add 	$push82=, $6, $pop81
-	i64.load	$push92=, 32($6)
-	tee_local	$push91=, $5=, $pop92
-	i32.const	$push79=, 32
-	i32.add 	$push80=, $6, $pop79
-	i32.const	$push90=, 8
-	i32.add 	$push26=, $pop80, $pop90
-	i64.load	$push89=, 0($pop26)
-	tee_local	$push88=, $4=, $pop89
-	call    	__multf3@FUNCTION, $pop82, $pop91, $pop88, $1, $2
+	call    	__addtf3@FUNCTION, $pop77, $5, $4, $pop25, $pop24
+	i32.const	$push78=, 32
+	i32.add 	$push79=, $6, $pop78
+	i32.const	$push86=, 8
+	i32.add 	$push26=, $pop79, $pop86
+	i64.load	$4=, 0($pop26)
+	i64.load	$5=, 32($6)
+	i32.const	$push80=, 16
+	i32.add 	$push81=, $6, $pop80
+	call    	__multf3@FUNCTION, $pop81, $5, $4, $1, $2
 	i64.load	$push29=, 16($6)
-	i32.const	$push83=, 16
-	i32.add 	$push84=, $6, $pop83
-	i32.const	$push87=, 8
-	i32.add 	$push27=, $pop84, $pop87
+	i32.const	$push82=, 16
+	i32.add 	$push83=, $6, $pop82
+	i32.const	$push85=, 8
+	i32.add 	$push27=, $pop83, $pop85
 	i64.load	$push28=, 0($pop27)
 	call    	__addtf3@FUNCTION, $6, $5, $4, $pop29, $pop28
-	i32.const	$push86=, 8
-	i32.add 	$push30=, $0, $pop86
-	i32.const	$push85=, 8
-	i32.add 	$push31=, $6, $pop85
-	i64.load	$push32=, 0($pop31)
-	i64.store	0($pop30), $pop32
-	i64.load	$push33=, 0($6)
-	i64.store	0($0), $pop33
-	i32.const	$push40=, 0
-	i32.const	$push38=, 192
-	i32.add 	$push39=, $6, $pop38
-	i32.store	__stack_pointer($pop40), $pop39
+	i32.const	$push84=, 8
+	i32.add 	$push30=, $6, $pop84
+	i64.load	$push31=, 0($pop30)
+	i64.store	8($0), $pop31
+	i64.load	$push32=, 0($6)
+	i64.store	0($0), $pop32
+	i32.const	$push39=, 0
+	i32.const	$push37=, 192
+	i32.add 	$push38=, $6, $pop37
+	i32.store	__stack_pointer($pop39), $pop38
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -157,7 +143,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -166,5 +152,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960521-1.c.s b/test/torture-s/960521-1.c.s
index bc68eb416..897843c40 100644
--- a/test/torture-s/960521-1.c.s
+++ b/test/torture-s/960521-1.c.s
@@ -7,41 +7,40 @@
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push8=, 0
 	i32.load	$push0=, n($pop8)
 	i32.const	$push7=, 1
 	i32.lt_s	$push1=, $pop0, $pop7
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push9=, 0
 	i32.load	$0=, a($pop9)
 	i32.const	$1=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push15=, -1
-	i32.store	0($0), $pop15
-	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	$push13=, -1
+	i32.store	0($0), $pop13
+	i32.const	$push12=, 4
+	i32.add 	$0=, $0, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$1=, $1, $pop11
 	i32.const	$push10=, 0
 	i32.load	$push2=, n($pop10)
-	i32.lt_s	$push3=, $pop11, $pop2
+	i32.lt_s	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	i32.const	$push16=, 0
-	i32.load	$push4=, b($pop16)
+	i32.const	$push14=, 0
+	i32.load	$push4=, b($pop14)
 	i32.const	$push6=, 255
-	i32.const	$push5=, 522236
+	i32.const	$push5=, 262140
 	i32.call	$drop=, memset@FUNCTION, $pop4, $pop6, $pop5
-	copy_local	$push17=, $0
-                                        # fallthrough-return: $pop17
+	copy_local	$push15=, $0
+                                        # fallthrough-return: $pop15
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -53,30 +52,27 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
-	i32.const	$push0=, 130560
+	i32.const	$push0=, 65536
 	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	$push2=, 262144
+	i32.call	$0=, malloc@FUNCTION, $pop2
 	i32.const	$push12=, 0
-	i32.store	0($pop13), $pop12
-	i32.const	$push11=, 0
+	i32.store	a($pop12), $0
+	i32.const	$push11=, 262144
+	i32.call	$1=, malloc@FUNCTION, $pop11
+	i32.const	$push10=, 0
+	i32.store	0($1), $pop10
 	i32.const	$push3=, 4
-	i32.add 	$push10=, $1, $pop3
-	tee_local	$push9=, $1=, $pop10
-	i32.store	b($pop11), $pop9
+	i32.add 	$1=, $1, $pop3
+	i32.const	$push9=, 0
+	i32.store	b($pop9), $1
 	i32.const	$push4=, 255
-	i32.const	$push8=, 522240
+	i32.const	$push8=, 262144
 	i32.call	$drop=, memset@FUNCTION, $0, $pop4, $pop8
 	i32.const	$push7=, 255
-	i32.const	$push5=, 522236
+	i32.const	$push5=, 262140
 	i32.call	$drop=, memset@FUNCTION, $1, $pop7, $pop5
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
@@ -113,6 +109,6 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	malloc, i32, i32
 	.functype	exit, void, i32
diff --git a/test/torture-s/960608-1.c.s b/test/torture-s/960608-1.c.s
index 32b445c9d..9d53b4bc1 100644
--- a/test/torture-s/960608-1.c.s
+++ b/test/torture-s/960608-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load8_u	$push0=, 0($0)
 	i32.const	$push1=, 206
 	i32.ne  	$push2=, $pop0, $pop1
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.else
+# %bb.0:                                # %if.else
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960801-1.c.s b/test/torture-s/960801-1.c.s
index fce54152a..7afeae02e 100644
--- a/test/torture-s/960801-1.c.s
+++ b/test/torture-s/960801-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	g,@function
 g:                                      # @g
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 65535
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,5 +41,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960802-1.c.s b/test/torture-s/960802-1.c.s
index e1b5d4bba..3d021140d 100644
--- a/test/torture-s/960802-1.c.s
+++ b/test/torture-s/960802-1.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 306
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1577058304
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	val($pop0), $0
                                         # fallthrough-return
@@ -45,7 +45,7 @@ f3:                                     # @f3
 	.globl	f4
 	.type	f4,@function
 f4:                                     # @f4
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1577058610
 	i32.store	val($pop1), $pop0
@@ -60,7 +60,7 @@ f4:                                     # @f4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1577058610
 	i32.store	val($pop1), $pop0
@@ -81,5 +81,5 @@ val:
 	.size	val, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960830-1.c.s b/test/torture-s/960830-1.c.s
index caf851b96..2d64b6238 100644
--- a/test/torture-s/960830-1.c.s
+++ b/test/torture-s/960830-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/960909-1.c.s b/test/torture-s/960909-1.c.s
index 681ec661f..271735fa9 100644
--- a/test/torture-s/960909-1.c.s
+++ b/test/torture-s/960909-1.c.s
@@ -8,30 +8,29 @@ ffs:                                    # @ffs
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push8=, $0
-	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.end
+	i32.eqz 	$push6=, $0
+	br_if   	0, $pop6        # 0: down to label0
+# %bb.1:                                # %if.end
 	i32.const	$2=, 1
 	block   	
 	i32.const	$push3=, 1
 	i32.and 	$push0=, $0, $pop3
 	br_if   	0, $pop0        # 0: down to label1
-# BB#2:                                 # %for.inc.preheader
+# %bb.2:                                # %for.inc.preheader
 	i32.const	$1=, 1
 	i32.const	$2=, 1
 .LBB0_3:                                # %for.inc
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push7=, 1
-	i32.add 	$2=, $2, $pop7
-	i32.const	$push6=, 1
-	i32.shl 	$push5=, $1, $pop6
-	tee_local	$push4=, $1=, $pop5
-	i32.and 	$push1=, $pop4, $0
-	i32.eqz 	$push9=, $pop1
-	br_if   	0, $pop9        # 0: up to label2
+	i32.const	$push5=, 1
+	i32.add 	$2=, $2, $pop5
+	i32.const	$push4=, 1
+	i32.shl 	$1=, $1, $pop4
+	i32.and 	$push1=, $1, $0
+	i32.eqz 	$push7=, $pop1
+	br_if   	0, $pop7        # 0: up to label2
 .LBB0_4:                                # %cleanup
 	end_loop
 	end_block                       # label1:
@@ -51,11 +50,11 @@ ffs:                                    # @ffs
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB1_2:                                # %if.then
 	end_block                       # label3:
@@ -71,7 +70,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -80,6 +79,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 84e5bf676..efde6936c 100644
--- a/test/torture-s/961004-1.c.s
+++ b/test/torture-s/961004-1.c.s
@@ -6,12 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, k($pop2)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.const	$push3=, 0
 	i32.const	$push1=, 1
 	i32.store	k($pop3), $pop1
@@ -34,5 +34,5 @@ k:
 	.size	k, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961017-1.c.s b/test/torture-s/961017-1.c.s
index 28b77508c..ed4c74e81 100644
--- a/test/torture-s/961017-1.c.s
+++ b/test/torture-s/961017-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961017-2.c.s b/test/torture-s/961017-2.c.s
index 15698081c..8ee6fd8b9 100644
--- a/test/torture-s/961017-2.c.s
+++ b/test/torture-s/961017-2.c.s
@@ -7,16 +7,15 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB0_1:                                # %do.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push3=, 16384
-	i32.add 	$push2=, $0, $pop3
-	tee_local	$push1=, $0=, $pop2
-	br_if   	0, $pop1        # 0: up to label0
-# BB#2:                                 # %do.end
+	i32.const	$push1=, 16384
+	i32.add 	$0=, $0, $pop1
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %do.end
 	end_loop
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -26,5 +25,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961026-1.c.s b/test/torture-s/961026-1.c.s
index ff80c9632..dfebc0945 100644
--- a/test/torture-s/961026-1.c.s
+++ b/test/torture-s/961026-1.c.s
@@ -7,7 +7,7 @@
 test:                                   # @test
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961112-1.c.s b/test/torture-s/961112-1.c.s
index 6ce868da3..7673cbd77 100644
--- a/test/torture-s/961112-1.c.s
+++ b/test/torture-s/961112-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961122-1.c.s b/test/torture-s/961122-1.c.s
index 98dd5a421..20c8a4602 100644
--- a/test/torture-s/961122-1.c.s
+++ b/test/torture-s/961122-1.c.s
@@ -7,7 +7,7 @@
 addhi:                                  # @addhi
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push6=, 0
 	i64.load	$push4=, acc($pop6)
@@ -29,7 +29,7 @@ addhi:                                  # @addhi
 subhi:                                  # @subhi
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push6=, 0
 	i64.load	$push4=, acc($pop6)
@@ -50,7 +50,7 @@ subhi:                                  # @subhi
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4
+# %bb.0:                                # %if.end4
 	i32.const	$push1=, 0
 	i64.const	$push0=, 281470681743360
 	i64.store	acc($pop1), $pop0
@@ -71,5 +71,5 @@ acc:
 	.size	acc, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961122-2.c.s b/test/torture-s/961122-2.c.s
index e4b0a823f..be972ff49 100644
--- a/test/torture-s/961122-2.c.s
+++ b/test/torture-s/961122-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961125-1.c.s b/test/torture-s/961125-1.c.s
index 2b851cf8f..05ee1ea34 100644
--- a/test/torture-s/961125-1.c.s
+++ b/test/torture-s/961125-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, .L.str
 	i32.const	$1=, 1
 .LBB0_1:                                # %land.rhs.i
@@ -15,15 +15,15 @@ main:                                   # @main
                                         #     Child Loop BB0_4 Depth 2
 	block   	
 	loop    	                # label1:
-	i32.eqz 	$push20=, $1
-	br_if   	1, $pop20       # 1: down to label0
-# BB#2:                                 # %while.body.i
+	i32.eqz 	$push18=, $1
+	br_if   	1, $pop18       # 1: down to label0
+# %bb.2:                                # %while.body.i
                                         #   in Loop: Header=BB0_1 Depth=1
 	block   	
 	i32.const	$push12=, .L.str+3
 	i32.ge_u	$push0=, $0, $pop12
 	br_if   	0, $pop0        # 0: down to label2
-# BB#3:                                 # %land.rhs4.i.preheader
+# %bb.3:                                # %land.rhs4.i.preheader
                                         #   in Loop: Header=BB0_1 Depth=1
 	copy_local	$2=, $0
 .LBB0_4:                                # %land.rhs4.i
@@ -36,7 +36,7 @@ main:                                   # @main
 	i32.const	$push13=, 58
 	i32.eq  	$push2=, $pop1, $pop13
 	br_if   	1, $pop2        # 1: down to label2
-# BB#5:                                 # %land.rhs4.i
+# %bb.5:                                # %land.rhs4.i
                                         #   in Loop: Header=BB0_4 Depth=2
 	copy_local	$2=, $0
 	i32.const	$push15=, .L.str+3
@@ -54,17 +54,16 @@ main:                                   # @main
 .LBB0_7:                                # %begfield.exit
 	end_loop
 	end_block                       # label0:
-	block   	
 	i32.const	$push5=, 1
-	i32.add 	$push19=, $0, $pop5
-	tee_local	$push18=, $2=, $pop19
+	i32.add 	$2=, $0, $pop5
+	block   	
 	i32.const	$push6=, .L.str+3
 	i32.gt_u	$push7=, $2, $pop6
-	i32.select	$push8=, $0, $pop18, $pop7
+	i32.select	$push8=, $0, $2, $pop7
 	i32.const	$push9=, .L.str+2
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label4
-# BB#8:                                 # %if.end
+# %bb.8:                                # %if.end
 	i32.const	$push11=, 0
 	call    	exit@FUNCTION, $pop11
 	unreachable
@@ -83,6 +82,6 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b8add2978..511ab0720 100644
--- a/test/torture-s/961206-1.c.s
+++ b/test/torture-s/961206-1.c.s
@@ -7,7 +7,7 @@
 sub1:                                   # @sub1
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
 	i64.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ sub1:                                   # @sub1
 sub2:                                   # @sub2
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
 	i64.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ sub2:                                   # @sub2
 sub3:                                   # @sub3
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
 	i64.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -52,7 +52,7 @@ sub3:                                   # @sub3
 sub4:                                   # @sub4
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
 	i64.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -66,7 +66,7 @@ sub4:                                   # @sub4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end12
+# %bb.0:                                # %if.end12
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -75,5 +75,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961213-1.c.s b/test/torture-s/961213-1.c.s
index a89be0f96..1c6efcbac 100644
--- a/test/torture-s/961213-1.c.s
+++ b/test/torture-s/961213-1.c.s
@@ -8,7 +8,7 @@ g:                                      # @g
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i64, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$5=, 0
 	i64.const	$push5=, 0
 	i64.store	0($0), $pop5
@@ -16,29 +16,28 @@ g:                                      # @g
 	i32.const	$push1=, 1
 	i32.lt_s	$push2=, $1, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i64.extend_s/i32	$4=, $3
 	copy_local	$3=, $1
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
+	i32.const	$push7=, -1
+	i32.add 	$3=, $3, $pop7
 	i64.mul 	$push3=, $5, $4
 	i64.load32_u	$push4=, 0($2)
 	i64.add 	$5=, $pop3, $pop4
-	i32.const	$push9=, 4
-	i32.add 	$push0=, $2, $pop9
+	i32.const	$push6=, 4
+	i32.add 	$push0=, $2, $pop6
 	copy_local	$2=, $pop0
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $3, $pop8
-	tee_local	$push6=, $3=, $pop7
-	br_if   	0, $pop6        # 0: up to label1
-# BB#3:                                 # %for.cond.for.end_crit_edge
+	br_if   	0, $3           # 0: up to label1
+# %bb.3:                                # %for.cond.for.end_crit_edge
 	end_loop
 	i64.store	0($0), $5
 .LBB0_4:                                # %for.end
 	end_block                       # label0:
-	copy_local	$push10=, $1
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $1
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end0:
 	.size	g, .Lfunc_end0-g
@@ -49,7 +48,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -58,5 +57,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/961223-1.c.s b/test/torture-s/961223-1.c.s
index fd2d88245..8893f12f8 100644
--- a/test/torture-s/961223-1.c.s
+++ b/test/torture-s/961223-1.c.s
@@ -7,7 +7,7 @@
 sub:                                    # @sub
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x1p0
 	f64.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ sub:                                    # @sub
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970214-1.c.s b/test/torture-s/970214-1.c.s
index 793a90c59..6cb9cbf20 100644
--- a/test/torture-s/970214-1.c.s
+++ b/test/torture-s/970214-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970214-2.c.s b/test/torture-s/970214-2.c.s
index ec7c80814..94d59d1e0 100644
--- a/test/torture-s/970214-2.c.s
+++ b/test/torture-s/970214-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970217-1.c.s b/test/torture-s/970217-1.c.s
index bf1571a86..5cc10d83c 100644
--- a/test/torture-s/970217-1.c.s
+++ b/test/torture-s/970217-1.c.s
@@ -7,7 +7,7 @@
 sub:                                    # @sub
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ sub:                                    # @sub
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/970923-1.c.s b/test/torture-s/970923-1.c.s
index 00a4faf79..3a321b392 100644
--- a/test/torture-s/970923-1.c.s
+++ b/test/torture-s/970923-1.c.s
@@ -7,7 +7,7 @@
 ts:                                     # @ts
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ ts:                                     # @ts
 tu:                                     # @tu
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ tu:                                     # @tu
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -43,5 +43,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980205.c.s b/test/torture-s/980205.c.s
index 24e866432..22e8cf7f0 100644
--- a/test/torture-s/980205.c.s
+++ b/test/torture-s/980205.c.s
@@ -7,32 +7,30 @@
 fdouble:                                # @fdouble
 	.param  	f64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push20=, $pop10, $pop12
-	tee_local	$push19=, $2=, $pop20
-	i32.store	__stack_pointer($pop13), $pop19
+	i32.sub 	$2=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $2
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
-	i32.and 	$push18=, $pop2, $pop3
-	tee_local	$push17=, $1=, $pop18
+	i32.and 	$1=, $pop2, $pop3
 	i32.const	$push4=, 8
-	i32.add 	$push5=, $pop17, $pop4
+	i32.add 	$push5=, $1, $pop4
 	i32.store	12($2), $pop5
 	block   	
 	f64.const	$push6=, 0x1p0
 	f64.ne  	$push7=, $0, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.load	$push0=, 0($1)
 	f64.const	$push8=, 0x1p1
 	f64.ne  	$push9=, $pop0, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
 	i32.add 	$push15=, $2, $pop14
@@ -53,14 +51,13 @@ fdouble:                                # @fdouble
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $0=, $pop8
-	i32.store	__stack_pointer($pop6), $pop7
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i64.const	$push0=, 4611686018427387904
 	i64.store	0($0), $pop0
 	f64.const	$push1=, 0x1p0
@@ -73,6 +70,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/980223.c.s b/test/torture-s/980223.c.s
index ab80035af..700453d31 100644
--- a/test/torture-s/980223.c.s
+++ b/test/torture-s/980223.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -20,31 +20,28 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($1)
 	block   	
-	i32.load	$push7=, 0($1)
-	tee_local	$push6=, $1=, $pop7
-	i32.load8_u	$push0=, 4($pop6)
+	i32.load8_u	$push0=, 4($1)
 	i32.const	$push5=, 64
 	i32.and 	$push1=, $pop0, $pop5
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry.if.end7_crit_edge
+# %bb.1:                                # %entry.if.end7_crit_edge
 	i64.load	$push4=, 0($2):p2align=2
 	i64.store	0($0):p2align=2, $pop4
 	return
 .LBB1_2:                                # %if.then
 	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
+	i32.load	$1=, 0($1)
+	i64.load	$3=, 8($1):p2align=2
+	i64.store	0($2):p2align=2, $3
 	block   	
 	i32.load8_u	$push2=, 4($1)
-	i32.const	$push8=, 64
-	i32.and 	$push3=, $pop2, $pop8
+	i32.const	$push6=, 64
+	i32.and 	$push3=, $pop2, $pop6
 	br_if   	0, $pop3        # 0: down to label1
-# BB#3:                                 # %if.end7
+# %bb.3:                                # %if.end7
 	i64.store	0($0):p2align=2, $3
 	return
 .LBB1_4:                                # %if.then6
@@ -61,7 +58,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push6=, 0
@@ -70,7 +67,7 @@ main:                                   # @main
 	i32.and 	$push1=, $pop0, $pop5
 	i32.eqz 	$push10=, $pop1
 	br_if   	0, $pop10       # 0: down to label3
-# BB#1:                                 # %if.then.i
+# %bb.1:                                # %if.then.i
 	i32.const	$push8=, 0
 	i32.load	$push2=, cons2($pop8)
 	i32.load8_u	$push3=, 4($pop2)
@@ -123,5 +120,5 @@ cons2:
 	.size	cons2, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/980424-1.c.s b/test/torture-s/980424-1.c.s
index 350128111..1fccb740a 100644
--- a/test/torture-s/980424-1.c.s
+++ b/test/torture-s/980424-1.c.s
@@ -6,12 +6,12 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ f:                                      # @f
 	.globl	g
 	.type	g,@function
 g:                                      # @g
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push1=, i($pop0)
@@ -40,7 +40,7 @@ g:                                      # @g
 	i32.const	$push9=, 1
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label1
-# BB#1:                                 # %f.exit
+# %bb.1:                                # %f.exit
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -56,7 +56,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 64
 	i32.store	i($pop1), $pop0
@@ -90,6 +90,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d3276c410..32b095882 100644
--- a/test/torture-s/980505-1.c.s
+++ b/test/torture-s/980505-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980505-2.c.s b/test/torture-s/980505-2.c.s
index bd792f507..29ffca349 100644
--- a/test/torture-s/980505-2.c.s
+++ b/test/torture-s/980505-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 147
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980506-1.c.s b/test/torture-s/980506-1.c.s
index 1fe3b1617..9d0e92098 100644
--- a/test/torture-s/980506-1.c.s
+++ b/test/torture-s/980506-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980506-2.c.s b/test/torture-s/980506-2.c.s
index f844bc332..ba40fa18c 100644
--- a/test/torture-s/980506-2.c.s
+++ b/test/torture-s/980506-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.else
+# %bb.0:                                # %if.else
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980506-3.c.s b/test/torture-s/980506-3.c.s
index 7778c98c3..78753fb8a 100644
--- a/test/torture-s/980506-3.c.s
+++ b/test/torture-s/980506-3.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, lookup_table
 	i32.const	$push1=, 4
 	i32.const	$push0=, 257
@@ -29,5 +29,5 @@ lookup_table:
 	.size	lookup_table, 257
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980526-2.c.s b/test/torture-s/980526-2.c.s
index d8bdad3b2..4119017f1 100644
--- a/test/torture-s/980526-2.c.s
+++ b/test/torture-s/980526-2.c.s
@@ -6,12 +6,12 @@
 	.type	do_mknod,@function
 do_mknod:                               # @do_mknod
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 360710264
 	i32.ne  	$push1=, $2, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -30,7 +30,7 @@ do_mknod:                               # @do_mknod
 getname:                                # @getname
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push17=, 13
 	i32.mul 	$push18=, $0, $pop17
 	i32.const	$push13=, 7
@@ -87,7 +87,7 @@ getname:                                # @getname
 sys_mknod:                              # @sys_mknod
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 14
 	i32.shl 	$push3=, $2, $pop2
 	i32.const	$push4=, -4194304
@@ -108,7 +108,7 @@ sys_mknod:                              # @sys_mknod
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, .L.str
 	i32.const	$push0=, 305419896
 	i32.call	$drop=, sys_mknod@FUNCTION, $pop1, $0, $pop0
@@ -124,6 +124,6 @@ main:                                   # @main
 	.size	.L.str, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 edb1eae09..946be2129 100644
--- a/test/torture-s/980526-3.c.s
+++ b/test/torture-s/980526-3.c.s
@@ -7,7 +7,7 @@
 compare:                                # @compare
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.ne  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ compare:                                # @compare
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.else
+# %bb.0:                                # %if.else
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980602-1.c.s b/test/torture-s/980602-1.c.s
index a9f2a9954..6f7a6b973 100644
--- a/test/torture-s/980602-1.c.s
+++ b/test/torture-s/980602-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980602-2.c.s b/test/torture-s/980602-2.c.s
index bfa42bf84..8919dd911 100644
--- a/test/torture-s/980602-2.c.s
+++ b/test/torture-s/980602-2.c.s
@@ -7,26 +7,25 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, t($pop11)
-	tee_local	$push9=, $0=, $pop10
+# %bb.0:                                # %entry
+	i32.const	$push10=, 0
+	i32.load	$0=, t($pop10)
+	i32.const	$push9=, 0
 	i32.const	$push2=, 1
-	i32.add 	$push3=, $pop9, $pop2
+	i32.add 	$push3=, $0, $pop2
 	i32.const	$push4=, 1073741823
 	i32.and 	$push5=, $pop3, $pop4
 	i32.const	$push0=, -1073741824
 	i32.and 	$push1=, $0, $pop0
 	i32.or  	$push6=, $pop5, $pop1
-	i32.store	t($pop12), $pop6
+	i32.store	t($pop9), $pop6
 	block   	
 	i32.const	$push8=, 1073741823
 	i32.and 	$push7=, $0, $pop8
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push13=, 0
-	call    	exit@FUNCTION, $pop13
+# %bb.1:                                # %if.then
+	i32.const	$push11=, 0
+	call    	exit@FUNCTION, $pop11
 	unreachable
 .LBB0_2:                                # %if.else
 	end_block                       # label0:
@@ -46,6 +45,6 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 bbdf69dff..4b9ddc8c4 100644
--- a/test/torture-s/980604-1.c.s
+++ b/test/torture-s/980604-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, c
 	i32.const	$push3=, d
@@ -18,7 +18,7 @@ main:                                   # @main
 	i32.select	$push5=, $pop4, $pop3, $pop2
 	i32.load	$push6=, 0($pop5)
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -67,6 +67,6 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fda0dd631..85c94a4c6 100644
--- a/test/torture-s/980605-1.c.s
+++ b/test/torture-s/980605-1.c.s
@@ -7,22 +7,36 @@
 f2:                                     # @f2
 	.param  	f64
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, x($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, x($pop0)
+	i32.const	$push12=, 0
 	i32.const	$push1=, 10
-	i32.add 	$push2=, $pop9, $pop1
-	i32.store	x($pop0), $pop2
-	i32.trunc_u/f64	$push4=, $0
-	i32.const	$push8=, 10
-	i32.mul 	$push3=, $1, $pop8
-	i32.add 	$push5=, $pop4, $pop3
-	i32.const	$push6=, 45
-	i32.add 	$push7=, $pop5, $pop6
-                                        # fallthrough-return: $pop7
+	i32.add 	$push2=, $1, $pop1
+	i32.store	x($pop12), $pop2
+	i32.const	$push11=, 10
+	i32.mul 	$1=, $1, $pop11
+	block   	
+	block   	
+	f64.const	$push6=, 0x1p32
+	f64.lt  	$push7=, $0, $pop6
+	f64.const	$push8=, 0x0p0
+	f64.ge  	$push9=, $0, $pop8
+	i32.and 	$push10=, $pop7, $pop9
+	br_if   	0, $pop10       # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$2=, 0
+	br      	1               # 1: down to label0
+.LBB0_2:                                # %entry
+	end_block                       # label1:
+	i32.trunc_u/f64	$2=, $0
+.LBB0_3:                                # %entry
+	end_block                       # label0:
+	i32.add 	$push3=, $2, $1
+	i32.const	$push4=, 45
+	i32.add 	$push5=, $pop3, $pop4
+                                        # fallthrough-return: $pop5
 	.endfunc
 .Lfunc_end0:
 	.size	f2, .Lfunc_end0-f2
@@ -34,16 +48,15 @@ f2:                                     # @f2
 getval:                                 # @getval
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load	$push4=, x($pop5)
-	tee_local	$push3=, $0=, $pop4
+	i32.load	$0=, x($pop0)
+	i32.const	$push3=, 0
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop3, $pop1
-	i32.store	x($pop0), $pop2
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	i32.add 	$push2=, $0, $pop1
+	i32.store	x($pop3), $pop2
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end1:
 	.size	getval, .Lfunc_end1-getval
@@ -54,42 +67,39 @@ getval:                                 # @getval
 	.type	f,@function
 f:                                      # @f
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 16
-	i32.sub 	$push23=, $pop9, $pop11
-	tee_local	$push22=, $1=, $pop23
-	i32.store	__stack_pointer($pop12), $pop22
+	i32.sub 	$1=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $1
 	i32.const	$push0=, 0
-	i32.const	$push21=, 0
-	i32.load	$push20=, x($pop21)
-	tee_local	$push19=, $0=, $pop20
+	i32.load	$0=, x($pop0)
+	i32.const	$push17=, 0
 	i32.const	$push1=, 20
-	i32.add 	$push2=, $pop19, $pop1
-	i32.store	x($pop0), $pop2
-	i32.const	$push18=, 20
-	i32.mul 	$push3=, $0, $pop18
+	i32.add 	$push2=, $0, $pop1
+	i32.store	x($pop17), $pop2
+	i32.const	$push16=, 20
+	i32.mul 	$push3=, $0, $pop16
 	i32.const	$push4=, 207
-	i32.add 	$push17=, $pop3, $pop4
-	tee_local	$push16=, $0=, $pop17
-	i32.store	0($1), $pop16
+	i32.add 	$0=, $pop3, $pop4
+	i32.store	0($1), $0
 	i32.const	$push6=, buf
 	i32.const	$push5=, .L.str
 	i32.call	$drop=, sprintf@FUNCTION, $pop6, $pop5, $1
 	block   	
 	i32.const	$push7=, 227
 	i32.ne  	$push8=, $0, $pop7
-	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.end
+	br_if   	0, $pop8        # 0: down to label2
+# %bb.1:                                # %if.end
 	i32.const	$push15=, 0
 	i32.const	$push13=, 16
 	i32.add 	$push14=, $1, $pop13
 	i32.store	__stack_pointer($pop15), $pop14
 	return
 .LBB2_2:                                # %if.then
-	end_block                       # label0:
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -102,7 +112,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	f@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -135,7 +145,7 @@ buf:
 	.size	.L.str, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 79b4ffbcf..a6127ad9b 100644
--- a/test/torture-s/980608-1.c.s
+++ b/test/torture-s/980608-1.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,60 +19,54 @@ f1:                                     # @f1
 debug:                                  # @debug
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push28=, 0
+# %bb.0:                                # %entry
 	i32.const	$push26=, 0
 	i32.load	$push25=, __stack_pointer($pop26)
 	i32.const	$push27=, 16
-	i32.sub 	$push35=, $pop25, $pop27
-	tee_local	$push34=, $4=, $pop35
-	i32.store	__stack_pointer($pop28), $pop34
+	i32.sub 	$4=, $pop25, $pop27
+	i32.const	$push28=, 0
+	i32.store	__stack_pointer($pop28), $4
 	i32.const	$push0=, 4
-	i32.add 	$push33=, $1, $pop0
-	tee_local	$push32=, $2=, $pop33
-	i32.store	12($4), $pop32
+	i32.add 	$2=, $1, $pop0
+	i32.store	12($4), $2
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 101
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 8
-	i32.add 	$push37=, $1, $pop4
-	tee_local	$push36=, $3=, $pop37
-	i32.store	12($4), $pop36
+	i32.add 	$3=, $1, $pop4
+	i32.store	12($4), $3
 	i32.load	$push5=, 0($2)
 	i32.const	$push6=, 102
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push8=, 12
-	i32.add 	$push39=, $1, $pop8
-	tee_local	$push38=, $2=, $pop39
-	i32.store	12($4), $pop38
+	i32.add 	$2=, $1, $pop8
+	i32.store	12($4), $2
 	i32.load	$push9=, 0($3)
 	i32.const	$push10=, 103
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push12=, 16
-	i32.add 	$push41=, $1, $pop12
-	tee_local	$push40=, $3=, $pop41
-	i32.store	12($4), $pop40
+	i32.add 	$3=, $1, $pop12
+	i32.store	12($4), $3
 	i32.load	$push13=, 0($2)
 	i32.const	$push14=, 104
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push16=, 20
-	i32.add 	$push43=, $1, $pop16
-	tee_local	$push42=, $2=, $pop43
-	i32.store	12($4), $pop42
+	i32.add 	$2=, $1, $pop16
+	i32.store	12($4), $2
 	i32.load	$push17=, 0($3)
 	i32.const	$push18=, 105
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#5:                                 # %if.end21
+# %bb.5:                                # %if.end21
 	i32.const	$push20=, 24
 	i32.add 	$push21=, $1, $pop20
 	i32.store	12($4), $pop21
@@ -80,7 +74,7 @@ debug:                                  # @debug
 	i32.const	$push23=, 106
 	i32.ne  	$push24=, $pop22, $pop23
 	br_if   	0, $pop24       # 0: down to label0
-# BB#6:                                 # %if.end26
+# %bb.6:                                # %if.end26
 	i32.const	$push31=, 0
 	i32.const	$push29=, 16
 	i32.add 	$push30=, $4, $pop29
@@ -101,14 +95,13 @@ debug:                                  # @debug
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push11=, $pop6, $pop8
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop9), $pop10
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i32.const	$push0=, 16
 	i32.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 455266533481
@@ -126,6 +119,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c1f0f8100..7f4525f5c 100644
--- a/test/torture-s/980612-1.c.s
+++ b/test/torture-s/980612-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, f
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ g:                                      # @g
 	.type	h,@function
 h:                                      # @h
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ h:                                      # @h
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.const	$push0=, 255
 	i32.store8	f+1($pop7), $pop0
@@ -44,7 +44,7 @@ main:                                   # @main
 	i32.const	$push4=, 2
 	i32.gt_u	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_2:                                # %if.end
@@ -66,6 +66,6 @@ f:
 	.size	f, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fac3b470e..1b0e89e8f 100644
--- a/test/torture-s/980617-1.c.s
+++ b/test/torture-s/980617-1.c.s
@@ -6,17 +6,23 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$push0=, 0($0)
+	i32.const	$push1=, 24
+	i32.shl 	$0=, $pop0, $pop1
 	block   	
-	i32.load8_s	$push0=, 0($0)
-	i32.const	$push1=, -17
-	i32.add 	$push2=, $pop0, $pop1
-	i32.const	$push3=, 1
-	i32.gt_u	$push4=, $pop2, $pop3
-	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.then
+	block   	
+	i32.const	$push2=, 301989888
+	i32.eq  	$push3=, $0, $pop2
+	br_if   	0, $pop3        # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$push4=, 285212672
+	i32.ne  	$push5=, $0, $pop4
+	br_if   	1, $pop5        # 1: down to label0
+.LBB0_2:                                # %if.then
+	end_block                       # label1:
 	return
-.LBB0_2:                                # %if.else
+.LBB0_3:                                # %if.else
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
@@ -31,14 +37,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	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
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 196625
 	i32.store	12($0), $pop0
 	i32.const	$push6=, 12
@@ -52,6 +57,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5cda6d5e0..7c2c0c99f 100644
--- a/test/torture-s/980618-1.c.s
+++ b/test/torture-s/980618-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,11 +20,11 @@ main:                                   # @main
 	.type	func,@function
 func:                                   # @func
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	return
 .LBB1_2:                                # %if.else
 	end_block                       # label0:
@@ -35,6 +35,6 @@ func:                                   # @func
 	.size	func, .Lfunc_end1-func
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e37d0443f..a3e84f4d2 100644
--- a/test/torture-s/980701-1.c.s
+++ b/test/torture-s/980701-1.c.s
@@ -7,7 +7,7 @@
 ns_name_skip:                           # @ns_name_skip
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
 	i32.const	$push1=, 0
@@ -23,7 +23,7 @@ ns_name_skip:                           # @ns_name_skip
 dn_skipname:                            # @dn_skipname
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.sub 	$push1=, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -37,11 +37,11 @@ dn_skipname:                            # @dn_skipname
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, a
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_2:                                # %if.end
@@ -62,6 +62,6 @@ a:
 	.size	a, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 660eea0b9..221c46727 100644
--- a/test/torture-s/980707-1.c.s
+++ b/test/torture-s/980707-1.c.s
@@ -8,19 +8,18 @@ buildargv:                              # @buildargv
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
 .LBB0_1:                                # %while.cond1
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_5 Depth 2
 	loop    	                # label0:
+	i32.load8_u	$2=, 0($0)
 	block   	
-	i32.load8_u	$push16=, 0($0)
-	tee_local	$push15=, $2=, $pop16
 	i32.const	$push14=, 32
-	i32.ne  	$push1=, $pop15, $pop14
+	i32.ne  	$push1=, $2, $pop14
 	br_if   	0, $pop1        # 0: down to label1
-# BB#2:                                 # %while.body3
+# %bb.2:                                # %while.body3
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.const	$push13=, 1
 	i32.add 	$0=, $0, $pop13
@@ -29,47 +28,46 @@ buildargv:                              # @buildargv
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
 	block   	
-	i32.eqz 	$push30=, $2
-	br_if   	0, $pop30       # 0: down to label2
-# BB#4:                                 # %if.end
+	i32.eqz 	$push26=, $2
+	br_if   	0, $pop26       # 0: down to label2
+# %bb.4:                                # %if.end
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push18=, 2
-	i32.shl 	$push2=, $3, $pop18
-	i32.const	$push17=, buildargv.arglist
-	i32.add 	$push3=, $pop2, $pop17
+	i32.const	$push16=, 2
+	i32.shl 	$push2=, $3, $pop16
+	i32.const	$push15=, buildargv.arglist
+	i32.add 	$push3=, $pop2, $pop15
 	i32.store	0($pop3), $0
 .LBB0_5:                                # %while.cond7
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	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	$push20=, 1
+	i32.add 	$2=, $0, $pop20
+	i32.load8_u	$1=, 0($0)
+	copy_local	$0=, $2
 	i32.const	$push19=, 32
-	i32.ne  	$push6=, $pop5, $pop19
+	i32.or  	$push4=, $1, $pop19
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $pop4, $pop18
+	i32.const	$push17=, 32
+	i32.ne  	$push6=, $pop5, $pop17
 	br_if   	0, $pop6        # 0: up to label3
-# BB#6:                                 # %while.end16
+# %bb.6:                                # %while.end16
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	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
+	i32.const	$push22=, 1
+	i32.add 	$3=, $3, $pop22
+	i32.const	$push21=, 255
+	i32.and 	$push7=, $1, $pop21
+	i32.eqz 	$push27=, $pop7
+	br_if   	0, $pop27       # 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
+	i32.const	$push24=, -1
+	i32.add 	$push0=, $2, $pop24
+	i32.const	$push23=, 0
+	i32.store8	0($pop0), $pop23
+	copy_local	$0=, $2
 	br      	1               # 1: up to label0
 .LBB0_8:                                # %while.end23
 	end_block                       # label2:
@@ -80,8 +78,8 @@ buildargv:                              # @buildargv
 	i32.add 	$push11=, $pop9, $pop10
 	i32.const	$push12=, 0
 	i32.store	0($pop11), $pop12
-	i32.const	$push29=, buildargv.arglist
-                                        # fallthrough-return: $pop29
+	i32.const	$push25=, buildargv.arglist
+                                        # fallthrough-return: $pop25
 	.endfunc
 .Lfunc_end0:
 	.size	buildargv, .Lfunc_end0-buildargv
@@ -93,14 +91,13 @@ buildargv:                              # @buildargv
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push24=, 0
+# %bb.0:                                # %entry
 	i32.const	$push22=, 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.sub 	$3=, $pop21, $pop23
+	i32.const	$push24=, 0
+	i32.store	__stack_pointer($pop24), $3
 	i32.const	$push26=, 0
 	i32.load8_u	$push1=, .L.str+4($pop26)
 	i32.store8	4($3), $pop1
@@ -114,61 +111,59 @@ main:                                   # @main
                                         #     Child Loop BB1_4 Depth 2
 	block   	
 	loop    	                # label5:
+	i32.load8_u	$1=, 0($3)
 	block   	
-	i32.load8_u	$push33=, 0($3)
-	tee_local	$push32=, $0=, $pop33
-	i32.const	$push31=, 32
-	i32.eq  	$push3=, $pop32, $pop31
+	i32.const	$push29=, 32
+	i32.eq  	$push3=, $1, $pop29
 	br_if   	0, $pop3        # 0: down to label6
-# BB#2:                                 # %while.cond1.i
+# %bb.2:                                # %while.cond1.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.eqz 	$push50=, $0
-	br_if   	2, $pop50       # 2: down to label4
-# BB#3:                                 # %if.end.i
+	i32.eqz 	$push44=, $1
+	br_if   	2, $pop44       # 2: down to label4
+# %bb.3:                                # %if.end.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push35=, 2
-	i32.shl 	$push4=, $2, $pop35
-	i32.const	$push34=, buildargv.arglist
-	i32.add 	$push5=, $pop4, $pop34
+	i32.const	$push31=, 2
+	i32.shl 	$push4=, $2, $pop31
+	i32.const	$push30=, buildargv.arglist
+	i32.add 	$push5=, $pop4, $pop30
 	i32.store	0($pop5), $3
 .LBB1_4:                                # %while.cond7.i
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label7:
+	i32.const	$push35=, 1
+	i32.add 	$1=, $3, $pop35
 	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
+	copy_local	$3=, $1
+	i32.const	$push34=, 32
+	i32.or  	$push6=, $0, $pop34
+	i32.const	$push33=, 255
+	i32.and 	$push7=, $pop6, $pop33
+	i32.const	$push32=, 32
+	i32.ne  	$push8=, $pop7, $pop32
 	br_if   	0, $pop8        # 0: up to label7
-# BB#5:                                 # %while.end16.i
+# %bb.5:                                # %while.end16.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
-	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
+	i32.const	$push37=, 1
+	i32.add 	$2=, $2, $pop37
+	i32.const	$push36=, 255
+	i32.and 	$push9=, $0, $pop36
+	i32.eqz 	$push45=, $pop9
+	br_if   	2, $pop45       # 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
+	i32.const	$push28=, -1
+	i32.add 	$push0=, $1, $pop28
+	i32.const	$push27=, 0
+	i32.store8	0($pop0), $pop27
 	copy_local	$3=, $1
 	br      	1               # 1: up to label5
 .LBB1_7:                                # %while.body3.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label6:
-	i32.const	$push44=, 1
-	i32.add 	$3=, $3, $pop44
+	i32.const	$push38=, 1
+	i32.add 	$3=, $3, $pop38
 	br      	0               # 0: up to label5
 .LBB1_8:                                # %buildargv.exit
 	end_loop
@@ -177,27 +172,27 @@ main:                                   # @main
 	i32.shl 	$push11=, $2, $pop10
 	i32.const	$push12=, buildargv.arglist
 	i32.add 	$push13=, $pop11, $pop12
-	i32.const	$push46=, 0
-	i32.store	0($pop13), $pop46
+	i32.const	$push40=, 0
+	i32.store	0($pop13), $pop40
 	block   	
-	i32.const	$push45=, 0
-	i32.load	$push14=, buildargv.arglist($pop45)
+	i32.const	$push39=, 0
+	i32.load	$push14=, buildargv.arglist($pop39)
 	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)
+# %bb.9:                                # %if.end
+	i32.const	$push41=, 0
+	i32.load	$push17=, buildargv.arglist+4($pop41)
 	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)
+# %bb.10:                               # %if.end8
+	i32.const	$push42=, 0
+	i32.load	$push20=, buildargv.arglist+8($pop42)
 	br_if   	0, $pop20       # 0: down to label8
-# BB#11:                                # %if.end11
-	i32.const	$push49=, 0
-	call    	exit@FUNCTION, $pop49
+# %bb.11:                               # %if.end11
+	i32.const	$push43=, 0
+	call    	exit@FUNCTION, $pop43
 	unreachable
 .LBB1_12:                               # %if.then
 	end_block                       # label8:
@@ -231,7 +226,7 @@ buildargv.arglist:
 	.size	.L.str.2, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7432b13f9..5b13166a9 100644
--- a/test/torture-s/980709-1.c.s
+++ b/test/torture-s/980709-1.c.s
@@ -7,39 +7,35 @@
 main:                                   # @main
 	.result 	i32
 	.local  	f64, f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push22=, $pop12, $pop14
-	tee_local	$push21=, $2=, $pop22
-	i32.store	__stack_pointer($pop15), $pop21
+	i32.sub 	$2=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $2
 	i64.const	$push0=, 4629700416936869888
 	i64.store	8($2), $pop0
-	block   	
 	f64.load	$push2=, 8($2)
 	f64.const	$push1=, 0x1.5555555555555p-2
-	f64.call	$push20=, pow@FUNCTION, $pop2, $pop1
-	tee_local	$push19=, $0=, $pop20
+	f64.call	$0=, pow@FUNCTION, $pop2, $pop1
 	f64.const	$push3=, 0x1.999999999999ap-4
-	f64.add 	$push18=, $pop19, $pop3
-	tee_local	$push17=, $1=, $pop18
+	f64.add 	$1=, $0, $pop3
+	block   	
 	f64.const	$push16=, 0x1.965fe974a3401p1
-	f64.le  	$push4=, $pop17, $pop16
+	f64.le  	$push4=, $1, $pop16
 	f64.ne  	$push5=, $1, $1
 	i32.or  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.const	$push7=, -0x1.999999999999ap-4
-	f64.add 	$push25=, $0, $pop7
-	tee_local	$push24=, $1=, $pop25
-	f64.const	$push23=, 0x1.965fe974a3401p1
-	f64.ge  	$push8=, $pop24, $pop23
+	f64.add 	$1=, $0, $pop7
+	f64.const	$push17=, 0x1.965fe974a3401p1
+	f64.ge  	$push8=, $1, $pop17
 	f64.ne  	$push9=, $1, $1
 	i32.or  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
 	i32.const	$push11=, 0
 	call    	exit@FUNCTION, $pop11
 	unreachable
@@ -52,6 +48,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6011c0b07..620a49388 100644
--- a/test/torture-s/980716-1.c.s
+++ b/test/torture-s/980716-1.c.s
@@ -7,38 +7,35 @@
 stub:                                   # @stub
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push4=, $pop0, $pop2
-	tee_local	$push3=, $5=, $pop4
-	i32.store	12($pop3), $1
+	i32.sub 	$5=, $pop0, $pop2
+	i32.store	12($5), $1
 	copy_local	$4=, $1
 .LBB0_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push7=, 4
-	i32.add 	$push6=, $4, $pop7
-	tee_local	$push5=, $2=, $pop6
-	i32.store	12($5), $pop5
+	i32.const	$push3=, 4
+	i32.add 	$2=, $4, $pop3
+	i32.store	12($5), $2
 	i32.load	$3=, 0($4)
 	copy_local	$4=, $2
 	br_if   	0, $3           # 0: up to label0
-# BB#2:                                 # %while.end
+# %bb.2:                                # %while.end
 	end_loop
 	i32.store	12($5), $1
 .LBB0_3:                                # %while.cond.1
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push10=, 4
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $4=, $pop9
-	i32.store	12($5), $pop8
+	i32.const	$push4=, 4
+	i32.add 	$4=, $1, $pop4
+	i32.store	12($5), $4
 	i32.load	$2=, 0($1)
 	copy_local	$1=, $4
 	br_if   	0, $2           # 0: up to label1
-# BB#4:                                 # %while.end.1
+# %bb.4:                                # %while.end.1
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -52,14 +49,13 @@ stub:                                   # @stub
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop4, $pop6
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop7), $pop9
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push0=, 0
 	i32.store	12($0), $pop0
 	i32.const	$push1=, .L.str.2
@@ -93,5 +89,5 @@ main:                                   # @main
 	.size	.L.str.2, 3
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/980929-1.c.s b/test/torture-s/980929-1.c.s
index 0b5d38110..ce018a631 100644
--- a/test/torture-s/980929-1.c.s
+++ b/test/torture-s/980929-1.c.s
@@ -6,12 +6,12 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1000
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond
+# %bb.0:                                # %for.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -36,6 +36,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c8ecb9685..aec8f2345 100644
--- a/test/torture-s/981001-1.c.s
+++ b/test/torture-s/981001-1.c.s
@@ -8,40 +8,38 @@ sub:                                    # @sub
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, 2
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push14=, 1
 	i32.shr_u	$1=, $0, $pop14
 	i32.const	$push13=, 1
 	i32.and 	$push2=, $0, $pop13
 	br_if   	1, $pop2        # 1: down to label0
-# BB#2:                                 # %if.then2
-	i32.call	$push17=, sub@FUNCTION, $1
-	tee_local	$push16=, $0=, $pop17
+# %bb.2:                                # %if.then2
+	i32.call	$0=, sub@FUNCTION, $1
 	i32.const	$push7=, -1
 	i32.add 	$push8=, $1, $pop7
 	i32.call	$push9=, sub@FUNCTION, $pop8
 	i32.const	$push15=, 1
 	i32.shl 	$push10=, $pop9, $pop15
 	i32.add 	$push11=, $0, $pop10
-	i32.mul 	$push12=, $pop16, $pop11
+	i32.mul 	$push12=, $0, $pop11
 	return  	$pop12
 .LBB0_3:                                # %cleanup
 	end_block                       # label1:
 	return  	$0
 .LBB0_4:                                # %if.else
 	end_block                       # label0:
-	i32.const	$push20=, 1
-	i32.add 	$push3=, $1, $pop20
+	i32.const	$push16=, 1
+	i32.add 	$push3=, $1, $pop16
 	i32.call	$0=, sub@FUNCTION, $pop3
-	i32.call	$push19=, sub@FUNCTION, $1
-	tee_local	$push18=, $1=, $pop19
-	i32.mul 	$push5=, $pop18, $1
+	i32.call	$1=, sub@FUNCTION, $1
+	i32.mul 	$push5=, $1, $1
 	i32.mul 	$push4=, $0, $0
 	i32.add 	$push6=, $pop5, $pop4
                                         # fallthrough-return: $pop6
@@ -56,7 +54,7 @@ sub:                                    # @sub
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$0=, flg($pop7)
 	block   	
@@ -66,9 +64,9 @@ main:                                   # @main
 	i32.const	$push2=, 832040
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	br_if   	1, $0           # 1: down to label2
-# BB#2:                                 # %if.end2
+# %bb.2:                                # %if.end2
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
 	unreachable
@@ -98,6 +96,6 @@ flg:
 	.size	flg, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 77461bb0a..cd49171e1 100644
--- a/test/torture-s/981019-1.c.s
+++ b/test/torture-s/981019-1.c.s
@@ -7,34 +7,32 @@
 ff:                                     # @ff
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push9=, $0
-	br_if   	0, $pop9        # 0: down to label2
-# BB#1:                                 # %entry
+	i32.eqz 	$push5=, $0
+	br_if   	0, $pop5        # 0: down to label2
+# %bb.1:                                # %entry
 	br_if   	1, $2           # 1: down to label1
 .LBB0_2:                                # %if.end3
 	end_block                       # label2:
 	i32.const	$push0=, 0
-	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
+	i32.load	$0=, f3.x($pop0)
+	i32.eqz 	$3=, $0
+	i32.const	$push4=, 0
+	i32.store	f3.x($pop4), $3
 	block   	
-	i32.eqz 	$push10=, $0
-	br_if   	0, $pop10       # 0: down to label3
-# BB#3:                                 # %while.end
+	i32.eqz 	$push6=, $0
+	br_if   	0, $pop6        # 0: down to label3
+# %bb.3:                                # %while.end
 	br_if   	1, $2           # 1: down to label1
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	return
 .LBB0_5:                                # %while.body.lr.ph
 	end_block                       # label3:
 	br_if   	1, $2           # 1: down to label0
-# BB#6:                                 # %while.end.thread
+# %bb.6:                                # %while.end.thread
 	i32.const	$push3=, 0
 	i32.const	$push1=, 1
 	i32.xor 	$push2=, $3, $pop1
@@ -57,7 +55,7 @@ ff:                                     # @ff
 	.globl	f1
 	.type	f1,@function
 f1:                                     # @f1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -71,15 +69,14 @@ f1:                                     # @f1
 f3:                                     # @f3
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push4=, 0
-	i32.load	$push1=, f3.x($pop4)
-	i32.eqz 	$push3=, $pop1
-	tee_local	$push2=, $0=, $pop3
-	i32.store	f3.x($pop0), $pop2
-	copy_local	$push5=, $0
-                                        # fallthrough-return: $pop5
+	i32.load	$push1=, f3.x($pop0)
+	i32.eqz 	$0=, $pop1
+	i32.const	$push2=, 0
+	i32.store	f3.x($pop2), $0
+	copy_local	$push3=, $0
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end2:
 	.size	f3, .Lfunc_end2-f3
@@ -90,7 +87,7 @@ f3:                                     # @f3
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -103,7 +100,7 @@ f2:                                     # @f2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	f3.x($pop0), $pop2
@@ -121,5 +118,5 @@ f3.x:
 	.size	f3.x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/981130-1.c.s b/test/torture-s/981130-1.c.s
index 84f91d180..185a14888 100644
--- a/test/torture-s/981130-1.c.s
+++ b/test/torture-s/981130-1.c.s
@@ -6,11 +6,11 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push1=, 0
 	call    	exit@FUNCTION, $pop1
 	unreachable
@@ -29,12 +29,11 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i64.load	$push4=, s2($pop5)
-	tee_local	$push3=, $0=, $pop4
-	i64.store	s1($pop0), $pop3
+	i64.load	$0=, s2($pop0)
+	i32.const	$push3=, 0
+	i64.store	s1($pop3), $0
 	i32.wrap/i64	$push1=, $0
 	i32.const	$push2=, 1
 	call    	check@FUNCTION, $pop1, $pop2
@@ -63,6 +62,6 @@ s1:
 	.size	s1, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f93f9d160..bf8bd084f 100644
--- a/test/torture-s/981206-1.c.s
+++ b/test/torture-s/981206-1.c.s
@@ -5,13 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i32.const	$push0=, 1
-	i32.store8	y($pop1), $pop0
-	i32.const	$push3=, 0
-	i32.const	$push2=, 1
-	i32.store8	x($pop3), $pop2
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -23,34 +17,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
-	i32.const	$push1=, 0
-	i32.const	$push0=, 1
-	i32.store8	y($pop1), $pop0
-	i32.const	$push4=, 0
-	i32.const	$push3=, 1
-	i32.store8	x($pop4), $pop3
-	i32.const	$push2=, 0
-	call    	exit@FUNCTION, $pop2
+# %bb.0:                                # %if.end
+	i32.const	$push0=, 0
+	call    	exit@FUNCTION, $pop0
 	unreachable
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
-	.type	x,@object               # @x
-	.section	.bss.x,"aw",@nobits
-	.p2align	1
-x:
-	.int8	0                       # 0x0
-	.size	x, 1
 
-	.type	y,@object               # @y
-	.section	.bss.y,"aw",@nobits
-	.p2align	1
-y:
-	.int8	0                       # 0x0
-	.size	y, 1
-
-
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990106-1.c.s b/test/torture-s/990106-1.c.s
index 0446c0738..eb757d17b 100644
--- a/test/torture-s/990106-1.c.s
+++ b/test/torture-s/990106-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 97
 	i32.store8	0($0), $pop0
 	i32.const	$push1=, 97
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990106-2.c.s b/test/torture-s/990106-2.c.s
index 2a58150a8..4625d5fb8 100644
--- a/test/torture-s/990106-2.c.s
+++ b/test/torture-s/990106-2.c.s
@@ -8,16 +8,15 @@ calc_mp:                                # @calc_mp
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.rem_u	$push1=, $pop0, $0
 	i32.const	$push2=, 1
-	i32.add 	$push8=, $pop1, $pop2
-	tee_local	$push7=, $1=, $pop8
+	i32.add 	$1=, $pop1, $pop2
 	i32.const	$push4=, 0
 	i32.gt_u	$push3=, $1, $0
 	i32.select	$push5=, $0, $pop4, $pop3
-	i32.sub 	$push6=, $pop7, $pop5
+	i32.sub 	$push6=, $1, $pop5
                                         # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
@@ -30,7 +29,7 @@ calc_mp:                                # @calc_mp
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -39,5 +38,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990117-1.c.s b/test/torture-s/990117-1.c.s
index d3c490bd1..1eaa80077 100644
--- a/test/torture-s/990117-1.c.s
+++ b/test/torture-s/990117-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.convert_s/i32	$push4=, $0
 	f64.convert_s/i32	$push3=, $1
 	f64.div 	$push5=, $pop4, $pop3
@@ -26,7 +26,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,4 +34,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/990127-1.c.s b/test/torture-s/990127-1.c.s
index 4da9346ad..0f09ee5b3 100644
--- a/test/torture-s/990127-1.c.s
+++ b/test/torture-s/990127-1.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $4
 	i32.const	$push0=, 20
 	i32.store	8($4), $pop0
 	i32.const	$push26=, 10
@@ -35,65 +34,61 @@ main:                                   # @main
 	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
+	i32.select	$1=, $pop21, $pop23, $pop1
+	i32.load	$2=, 0($1)
+	i32.const	$push27=, -1
+	i32.add 	$push2=, $2, $pop27
+	i32.store	0($1), $pop2
 	block   	
-	i32.eqz 	$push45=, $2
-	br_if   	0, $pop45       # 0: down to label1
-# BB#2:                                 # %while.body.preheader
+	i32.eqz 	$push35=, $2
+	br_if   	0, $pop35       # 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
+	i32.const	$push28=, 1
+	i32.add 	$1=, $3, $pop28
 .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
+	i32.const	$push29=, 3
+	i32.le_s	$push3=, $2, $pop29
 	br_if   	1, $pop3        # 1: down to label1
-# BB#4:                                 # %while.cond
+# %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.load	$2=, 8($4)
+	i32.const	$push31=, -1
+	i32.add 	$push4=, $2, $pop31
 	i32.store	8($4), $pop4
-	i32.const	$push36=, 1
-	i32.add 	$1=, $3, $pop36
+	i32.const	$push30=, 1
+	i32.add 	$1=, $3, $pop30
 	br_if   	0, $2           # 0: up to label2
 .LBB0_5:                                # %while.end
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
 	end_block                       # label1:
-	i32.const	$push44=, 1
-	i32.add 	$3=, $3, $pop44
+	i32.const	$push34=, 1
+	i32.add 	$3=, $3, $pop34
+	i32.const	$push33=, 1
+	i32.add 	$0=, $0, $pop33
 	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
+	i32.const	$push32=, 10
+	i32.ne  	$push5=, $0, $pop32
 	br_if   	0, $pop5        # 0: up to label0
-# BB#6:                                 # %for.end
+# %bb.6:                                # %for.end
 	end_loop
 	block   	
 	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
+# %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
+# %bb.8:                                # %if.end13
 	i32.const	$push11=, 0
 	call    	exit@FUNCTION, $pop11
 	unreachable
@@ -106,6 +101,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ec18e1359..1fe09295e 100644
--- a/test/torture-s/990127-2.c.s
+++ b/test/torture-s/990127-2.c.s
@@ -6,11 +6,11 @@
 	.type	fpEq,@function
 fpEq:                                   # @fpEq
 	.param  	f64, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -26,7 +26,7 @@ fpEq:                                   # @fpEq
 	.type	fpTest,@function
 fpTest:                                 # @fpTest
 	.param  	f64, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, 0x1.9p6
 	f64.mul 	$push1=, $0, $pop0
@@ -34,7 +34,7 @@ fpTest:                                 # @fpTest
 	f64.const	$push3=, 0x1.3d55555555556p6
 	f64.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %fpEq.exit
+# %bb.1:                                # %fpEq.exit
 	return
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
@@ -50,7 +50,7 @@ fpTest:                                 # @fpTest
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -59,6 +59,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7a0060af9..13df8eaa2 100644
--- a/test/torture-s/990128-1.c.s
+++ b/test/torture-s/990128-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, sss
 	i32.store	ss($pop1), $pop0
@@ -57,31 +57,28 @@ main:                                   # @main
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label1:
-	i32.load	$push29=, 0($2)
-	tee_local	$push28=, $2=, $pop29
-	br_if   	0, $pop28       # 0: up to label1
-# BB#3:                                 # %if.then.i
+	i32.load	$2=, 0($2)
+	br_if   	0, $2           # 0: up to label1
+# %bb.3:                                # %if.then.i
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push32=, 1
-	i32.add 	$2=, $0, $pop32
-	i32.load	$push31=, 0($1)
-	tee_local	$push30=, $1=, $pop31
-	br_if   	0, $pop30       # 0: up to label0
-# BB#4:                                 # %sub.exit
+	i32.const	$push28=, 1
+	i32.add 	$2=, $0, $pop28
+	i32.load	$1=, 0($1)
+	br_if   	0, $1           # 0: up to label0
+# %bb.4:                                # %sub.exit
 	end_loop
-	i32.const	$push35=, 0
 	i32.const	$push11=, 2
-	i32.add 	$push34=, $0, $pop11
-	tee_local	$push33=, $2=, $pop34
-	i32.store	count($pop35), $pop33
+	i32.add 	$2=, $0, $pop11
+	i32.const	$push29=, 0
+	i32.store	count($pop29), $2
 	block   	
 	i32.const	$push12=, 12
 	i32.ne  	$push13=, $2, $pop12
 	br_if   	0, $pop13       # 0: down to label2
-# BB#5:                                 # %if.end
-	i32.const	$push36=, 0
-	call    	exit@FUNCTION, $pop36
+# %bb.5:                                # %if.end
+	i32.const	$push30=, 0
+	call    	exit@FUNCTION, $pop30
 	unreachable
 .LBB0_6:                                # %if.then
 	end_block                       # label2:
@@ -98,13 +95,13 @@ main:                                   # @main
 sub:                                    # @sub
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$2=, count($pop3)
 	block   	
-	i32.eqz 	$push12=, $0
-	br_if   	0, $pop12       # 0: down to label3
-# BB#1:
+	i32.eqz 	$push8=, $0
+	br_if   	0, $pop8        # 0: down to label3
+# %bb.1:
 .LBB1_2:                                # %for.inc.lr.ph.i
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_3 Depth 2
@@ -114,31 +111,29 @@ sub:                                    # @sub
                                         #   Parent Loop BB1_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label5:
-	i32.load	$push5=, 0($3)
-	tee_local	$push4=, $3=, $pop5
-	br_if   	0, $pop4        # 0: up to label5
-# BB#4:                                 # %if.then
+	i32.load	$3=, 0($3)
+	br_if   	0, $3           # 0: up to label5
+# %bb.4:                                # %if.then
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_loop
-	i32.const	$push9=, 0
-	i32.store	0($1), $pop9
-	i32.const	$push8=, 1
-	i32.add 	$2=, $2, $pop8
-	i32.load	$push7=, 0($0)
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label4
-# BB#5:                                 # %for.cond.look.exit.thread_crit_edge
+	i32.const	$push5=, 0
+	i32.store	0($1), $pop5
+	i32.const	$push4=, 1
+	i32.add 	$2=, $2, $pop4
+	i32.load	$0=, 0($0)
+	br_if   	0, $0           # 0: up to label4
+# %bb.5:                                # %for.cond.look.exit.thread_crit_edge
 	end_loop
 	i32.const	$push0=, 0
 	i32.store	count($pop0), $2
 .LBB1_6:                                # %for.end
 	end_block                       # label3:
-	i32.const	$push11=, 0
-	i32.store	0($1), $pop11
-	i32.const	$push10=, 0
+	i32.const	$push7=, 0
+	i32.store	0($1), $pop7
+	i32.const	$push6=, 0
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $2, $pop1
-	i32.store	count($pop10), $pop2
+	i32.store	count($pop6), $pop2
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -151,29 +146,28 @@ sub:                                    # @sub
 look:                                   # @look
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push9=, $0
-	br_if   	0, $pop9        # 0: down to label6
+	i32.eqz 	$push7=, $0
+	br_if   	0, $pop7        # 0: down to label6
 .LBB2_1:                                # %for.inc
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.load	$push5=, 0($0)
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label7
+	i32.load	$0=, 0($0)
+	br_if   	0, $0           # 0: up to label7
 .LBB2_2:                                # %for.end
 	end_loop
 	end_block                       # label6:
 	i32.const	$push0=, 0
 	i32.store	0($1), $pop0
-	i32.const	$push8=, 0
-	i32.const	$push7=, 0
-	i32.load	$push1=, count($pop7)
+	i32.const	$push6=, 0
+	i32.const	$push5=, 0
+	i32.load	$push1=, count($pop5)
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $pop1, $pop2
-	i32.store	count($pop8), $pop3
-	i32.const	$push6=, 1
-                                        # fallthrough-return: $pop6
+	i32.store	count($pop6), $pop3
+	i32.const	$push4=, 1
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end2:
 	.size	look, .Lfunc_end2-look
@@ -215,6 +209,6 @@ sss:
 	.size	sss, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0390eaa92..1623e2e5d 100644
--- a/test/torture-s/990130-1.c.s
+++ b/test/torture-s/990130-1.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, count($pop6)
-	tee_local	$push4=, $1=, $pop5
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$1=, count($pop5)
+	i32.const	$push4=, 0
 	i32.const	$push0=, 1
-	i32.add 	$push1=, $pop4, $pop0
-	i32.store	count($pop7), $pop1
+	i32.add 	$push1=, $1, $pop0
+	i32.store	count($pop4), $pop1
 	i32.const	$push3=, 0
 	i32.load	$0=, dummy($pop3)
 	#APP
@@ -23,9 +22,9 @@ main:                                   # @main
 	i32.store	dummy($pop2), $0
 	block   	
 	br_if   	0, $1           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push8=, 0
-	call    	exit@FUNCTION, $pop8
+# %bb.1:                                # %if.end
+	i32.const	$push6=, 0
+	call    	exit@FUNCTION, $pop6
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -54,6 +53,6 @@ dummy:
 	.size	dummy, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fc6374b13..d8b6b62b8 100644
--- a/test/torture-s/990211-1.c.s
+++ b/test/torture-s/990211-1.c.s
@@ -6,7 +6,7 @@
 	.type	func,@function
 func:                                   # @func
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ func:                                   # @func
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -26,4 +26,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/990222-1.c.s b/test/torture-s/990222-1.c.s
index 3c9f26344..1efbb71da 100644
--- a/test/torture-s/990222-1.c.s
+++ b/test/torture-s/990222-1.c.s
@@ -7,68 +7,66 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	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.store8	line+2($pop23), $pop19
+# %bb.0:                                # %entry
+	i32.const	$push21=, 0
+	i32.load8_u	$push0=, line+2($pop21)
+	i32.const	$push20=, 1
+	i32.add 	$1=, $pop0, $pop20
+	i32.const	$push19=, 0
+	i32.store8	line+2($pop19), $1
 	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
+# %bb.1:                                # %while.body.preheader
 	i32.const	$1=, line+1
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push31=, 1
-	i32.add 	$push4=, $1, $pop31
-	i32.const	$push30=, 48
-	i32.store8	0($pop4), $pop30
+	i32.const	$push27=, 1
+	i32.add 	$push4=, $1, $pop27
+	i32.const	$push26=, 48
+	i32.store8	0($pop4), $pop26
 	i32.load8_u	$push5=, 0($1)
-	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
+	i32.const	$push25=, 1
+	i32.add 	$0=, $pop5, $pop25
+	i32.store8	0($1), $0
+	i32.const	$push24=, -1
+	i32.add 	$1=, $1, $pop24
+	i32.const	$push23=, 24
+	i32.shl 	$push6=, $0, $pop23
+	i32.const	$push22=, 956301312
+	i32.gt_s	$push7=, $pop6, $pop22
 	br_if   	0, $pop7        # 0: up to label1
-# BB#3:                                 # %while.end.loopexit
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i32.const	$push8=, 0
 	i32.load8_u	$1=, line+2($pop8)
 .LBB0_4:                                # %while.end
 	end_block                       # label0:
 	block   	
-	i32.const	$push32=, 0
-	i32.load8_u	$push10=, line($pop32)
+	i32.const	$push28=, 0
+	i32.load8_u	$push10=, line($pop28)
 	i32.const	$push11=, 50
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label2
-# BB#5:                                 # %while.end
-	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
+# %bb.5:                                # %while.end
+	i32.const	$push31=, 0
+	i32.load8_u	$push9=, line+1($pop31)
+	i32.const	$push30=, 255
+	i32.and 	$push13=, $pop9, $pop30
+	i32.const	$push29=, 48
+	i32.ne  	$push14=, $pop13, $pop29
 	br_if   	0, $pop14       # 0: down to label2
-# BB#6:                                 # %while.end
-	i32.const	$push37=, 255
-	i32.and 	$push15=, $1, $pop37
-	i32.const	$push36=, 48
-	i32.ne  	$push16=, $pop15, $pop36
+# %bb.6:                                # %while.end
+	i32.const	$push33=, 255
+	i32.and 	$push15=, $1, $pop33
+	i32.const	$push32=, 48
+	i32.ne  	$push16=, $pop15, $pop32
 	br_if   	0, $pop16       # 0: down to label2
-# BB#7:                                 # %if.end
+# %bb.7:                                # %if.end
 	i32.const	$push17=, 0
 	return  	$pop17
 .LBB0_8:                                # %if.then
@@ -88,5 +86,5 @@ line:
 	.size	line, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/990324-1.c.s b/test/torture-s/990324-1.c.s
index ccc654d74..5b6ebe02c 100644
--- a/test/torture-s/990324-1.c.s
+++ b/test/torture-s/990324-1.c.s
@@ -6,14 +6,14 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 24
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push3=, 0
 	i32.gt_s	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.else
@@ -31,7 +31,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -255
 	call    	f@FUNCTION, $pop0
 	unreachable
@@ -40,6 +40,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 52f63c279..bc23f994f 100644
--- a/test/torture-s/990326-1.c.s
+++ b/test/torture-s/990326-1.c.s
@@ -6,7 +6,7 @@
 	.type	a1,@function
 a1:                                     # @a1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ a1:                                     # @a1
 	.type	a2,@function
 a2:                                     # @a2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ a2:                                     # @a2
 	.type	a3,@function
 a3:                                     # @a3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ a3:                                     # @a3
 	.type	b1,@function
 b1:                                     # @b1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -58,7 +58,7 @@ b1:                                     # @b1
 	.type	b2,@function
 b2:                                     # @b2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -71,7 +71,7 @@ b2:                                     # @b2
 	.type	b3,@function
 b3:                                     # @b3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -84,7 +84,7 @@ b3:                                     # @b3
 	.type	c1,@function
 c1:                                     # @c1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -97,7 +97,7 @@ c1:                                     # @c1
 	.type	c2,@function
 c2:                                     # @c2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -110,7 +110,7 @@ c2:                                     # @c2
 	.type	c3,@function
 c3:                                     # @c3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -123,7 +123,7 @@ c3:                                     # @c3
 	.type	d1,@function
 d1:                                     # @d1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -136,7 +136,7 @@ d1:                                     # @d1
 	.type	d2,@function
 d2:                                     # @d2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -149,7 +149,7 @@ d2:                                     # @d2
 	.type	d3,@function
 d3:                                     # @d3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -162,7 +162,7 @@ d3:                                     # @d3
 	.type	e1,@function
 e1:                                     # @e1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -175,7 +175,7 @@ e1:                                     # @e1
 	.type	e2,@function
 e2:                                     # @e2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -188,7 +188,7 @@ e2:                                     # @e2
 	.type	e3,@function
 e3:                                     # @e3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -201,7 +201,7 @@ e3:                                     # @e3
 	.type	e4,@function
 e4:                                     # @e4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -214,7 +214,7 @@ e4:                                     # @e4
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -227,7 +227,7 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -240,7 +240,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -253,7 +253,7 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -266,7 +266,7 @@ f4:                                     # @f4
 	.type	g1,@function
 g1:                                     # @g1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -279,7 +279,7 @@ g1:                                     # @g1
 	.type	g2,@function
 g2:                                     # @g2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -292,7 +292,7 @@ g2:                                     # @g2
 	.type	g3,@function
 g3:                                     # @g3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -305,7 +305,7 @@ g3:                                     # @g3
 	.type	g4,@function
 g4:                                     # @g4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -318,7 +318,7 @@ g4:                                     # @g4
 	.type	g5,@function
 g5:                                     # @g5
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -331,7 +331,7 @@ g5:                                     # @g5
 	.type	g6,@function
 g6:                                     # @g6
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -344,7 +344,7 @@ g6:                                     # @g6
 	.type	g7,@function
 g7:                                     # @g7
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -357,7 +357,7 @@ g7:                                     # @g7
 	.type	h1,@function
 h1:                                     # @h1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -370,7 +370,7 @@ h1:                                     # @h1
 	.type	h2,@function
 h2:                                     # @h2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -383,7 +383,7 @@ h2:                                     # @h2
 	.type	h3,@function
 h3:                                     # @h3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -396,7 +396,7 @@ h3:                                     # @h3
 	.type	h4,@function
 h4:                                     # @h4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -409,7 +409,7 @@ h4:                                     # @h4
 	.type	h5,@function
 h5:                                     # @h5
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -422,7 +422,7 @@ h5:                                     # @h5
 	.type	h6,@function
 h6:                                     # @h6
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -435,7 +435,7 @@ h6:                                     # @h6
 	.type	h7,@function
 h7:                                     # @h7
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -448,7 +448,7 @@ h7:                                     # @h7
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end132
+# %bb.0:                                # %if.end132
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -457,5 +457,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end34-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990404-1.c.s b/test/torture-s/990404-1.c.s
index 885b682fe..27c48c487 100644
--- a/test/torture-s/990404-1.c.s
+++ b/test/torture-s/990404-1.c.s
@@ -6,123 +6,92 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$11=, -1
-                                        # implicit-def: %vreg122
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$12=, -1
+                                        # implicit-def: %122
 .LBB0_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push83=, 0
-	i32.load	$push82=, x+36($pop83)
-	tee_local	$push81=, $10=, $pop82
-	i32.const	$push80=, 0
-	i32.load	$push79=, x+32($pop80)
-	tee_local	$push78=, $9=, $pop79
-	i32.const	$push77=, 0
-	i32.load	$push76=, x+28($pop77)
-	tee_local	$push75=, $8=, $pop76
-	i32.const	$push74=, 0
-	i32.load	$push73=, x+24($pop74)
-	tee_local	$push72=, $7=, $pop73
-	i32.const	$push71=, 0
-	i32.load	$push70=, x+20($pop71)
-	tee_local	$push69=, $6=, $pop70
-	i32.const	$push68=, 0
-	i32.load	$push67=, x+16($pop68)
-	tee_local	$push66=, $5=, $pop67
-	i32.const	$push65=, 0
-	i32.load	$push64=, x+12($pop65)
-	tee_local	$push63=, $4=, $pop64
-	i32.const	$push62=, 0
-	i32.load	$push61=, x+8($pop62)
-	tee_local	$push60=, $3=, $pop61
-	i32.const	$push59=, 0
-	i32.load	$push58=, x+4($pop59)
-	tee_local	$push57=, $2=, $pop58
-	i32.const	$push56=, 0
-	i32.load	$push55=, x($pop56)
-	tee_local	$push54=, $0=, $pop55
-	i32.const	$push53=, 0
-	i32.const	$push52=, 0
-	i32.gt_s	$push51=, $0, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.select	$push49=, $pop54, $pop53, $pop50
-	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=, $1=, $pop45
-	i32.gt_s	$push43=, $3, $1
-	tee_local	$push42=, $3=, $pop43
-	i32.select	$push41=, $pop60, $pop44, $pop42
-	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=, $1=, $pop37
-	i32.gt_s	$push35=, $5, $1
-	tee_local	$push34=, $5=, $pop35
-	i32.select	$push33=, $pop66, $pop36, $pop34
-	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=, $1=, $pop29
-	i32.gt_s	$push27=, $7, $1
-	tee_local	$push26=, $7=, $pop27
-	i32.select	$push25=, $pop72, $pop28, $pop26
-	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=, $1=, $pop21
-	i32.gt_s	$push19=, $9, $1
-	tee_local	$push18=, $9=, $pop19
-	i32.select	$push17=, $pop78, $pop20, $pop18
-	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
-	br_if   	1, $pop103      # 1: down to label0
-# BB#2:                                 # %if.end7
+	i32.const	$push25=, 0
+	i32.load	$0=, x($pop25)
+	i32.const	$push24=, 0
+	i32.gt_s	$1=, $0, $pop24
+	i32.const	$push23=, 0
+	i32.select	$0=, $0, $pop23, $1
+	i32.const	$push22=, 0
+	i32.load	$2=, x+4($pop22)
+	i32.gt_s	$3=, $2, $0
+	i32.select	$0=, $2, $0, $3
+	i32.const	$push21=, 0
+	i32.load	$2=, x+8($pop21)
+	i32.gt_s	$4=, $2, $0
+	i32.select	$0=, $2, $0, $4
+	i32.const	$push20=, 0
+	i32.load	$2=, x+12($pop20)
+	i32.gt_s	$5=, $2, $0
+	i32.select	$0=, $2, $0, $5
+	i32.const	$push19=, 0
+	i32.load	$2=, x+16($pop19)
+	i32.gt_s	$6=, $2, $0
+	i32.select	$0=, $2, $0, $6
+	i32.const	$push18=, 0
+	i32.load	$2=, x+20($pop18)
+	i32.gt_s	$7=, $2, $0
+	i32.select	$0=, $2, $0, $7
+	i32.const	$push17=, 0
+	i32.load	$2=, x+24($pop17)
+	i32.gt_s	$8=, $2, $0
+	i32.select	$0=, $2, $0, $8
+	i32.const	$push16=, 0
+	i32.load	$2=, x+28($pop16)
+	i32.gt_s	$9=, $2, $0
+	i32.select	$0=, $2, $0, $9
+	i32.const	$push15=, 0
+	i32.load	$2=, x+32($pop15)
+	i32.gt_s	$10=, $2, $0
+	i32.select	$0=, $2, $0, $10
+	i32.const	$push14=, 0
+	i32.load	$2=, x+36($pop14)
+	i32.gt_s	$11=, $2, $0
+	i32.select	$push9=, $2, $0, $11
+	i32.eqz 	$push41=, $pop9
+	br_if   	1, $pop41       # 1: down to label0
+# %bb.2:                                # %if.end7
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push102=, 9
-	i32.const	$push101=, 8
-	i32.const	$push100=, 7
-	i32.const	$push99=, 6
-	i32.const	$push98=, 5
-	i32.const	$push97=, 4
-	i32.const	$push96=, 3
-	i32.const	$push95=, 2
-	i32.const	$push94=, 1
-	i32.const	$push93=, 0
-	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
-	i32.shl 	$push10=, $pop91, $pop90
-	i32.const	$push89=, x
-	i32.add 	$push11=, $pop10, $pop89
-	i32.const	$push88=, 0
-	i32.store	0($pop11), $pop88
-	i32.const	$push87=, 1
-	i32.add 	$push86=, $11, $pop87
-	tee_local	$push85=, $11=, $pop86
-	i32.const	$push84=, 10
-	i32.lt_u	$push12=, $pop85, $pop84
+	i32.const	$push40=, 9
+	i32.const	$push39=, 8
+	i32.const	$push38=, 7
+	i32.const	$push37=, 6
+	i32.const	$push36=, 5
+	i32.const	$push35=, 4
+	i32.const	$push34=, 3
+	i32.const	$push33=, 2
+	i32.const	$push32=, 1
+	i32.const	$push31=, 0
+	i32.select	$push0=, $pop31, $13, $1
+	i32.select	$push1=, $pop32, $pop0, $3
+	i32.select	$push2=, $pop33, $pop1, $4
+	i32.select	$push3=, $pop34, $pop2, $5
+	i32.select	$push4=, $pop35, $pop3, $6
+	i32.select	$push5=, $pop36, $pop4, $7
+	i32.select	$push6=, $pop37, $pop5, $8
+	i32.select	$push7=, $pop38, $pop6, $9
+	i32.select	$push8=, $pop39, $pop7, $10
+	i32.select	$13=, $pop40, $pop8, $11
+	i32.const	$push30=, 2
+	i32.shl 	$push10=, $13, $pop30
+	i32.const	$push29=, x
+	i32.add 	$push11=, $pop10, $pop29
+	i32.const	$push28=, 0
+	i32.store	0($pop11), $pop28
+	i32.const	$push27=, 1
+	i32.add 	$12=, $12, $pop27
+	i32.const	$push26=, 10
+	i32.lt_u	$push12=, $12, $pop26
 	br_if   	0, $pop12       # 0: up to label1
-# BB#3:                                 # %if.then11
+# %bb.3:                                # %if.then11
 	end_loop
 	call    	abort@FUNCTION
 	unreachable
@@ -154,6 +123,6 @@ x:
 	.size	x, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2e2442d2a..b3493d995 100644
--- a/test/torture-s/990513-1.c.s
+++ b/test/torture-s/990513-1.c.s
@@ -7,30 +7,28 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 1024
 .LBB0_1:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.add 	$push12=, $0, $3
-	tee_local	$push11=, $2=, $pop12
-	i32.const	$push10=, -8
-	i32.add 	$push0=, $pop11, $pop10
+	i32.add 	$2=, $0, $3
+	i32.const	$push8=, -8
+	i32.add 	$push0=, $2, $pop8
 	i32.store	0($pop0), $1
-	i32.const	$push9=, -4
-	i32.add 	$push1=, $2, $pop9
+	i32.const	$push7=, -4
+	i32.add 	$push1=, $2, $pop7
 	i32.store	0($pop1), $1
-	i32.const	$push8=, -12
-	i32.add 	$push2=, $2, $pop8
+	i32.const	$push6=, -12
+	i32.add 	$push2=, $2, $pop6
 	i32.store	0($pop2), $1
-	i32.const	$push7=, -16
-	i32.add 	$push3=, $2, $pop7
+	i32.const	$push5=, -16
+	i32.add 	$push3=, $2, $pop5
 	i32.store	0($pop3), $1
-	i32.const	$push6=, -16
-	i32.add 	$push5=, $3, $pop6
-	tee_local	$push4=, $3=, $pop5
-	br_if   	0, $pop4        # 0: up to label0
-# BB#2:                                 # %while.end
+	i32.const	$push4=, -16
+	i32.add 	$3=, $3, $pop4
+	br_if   	0, $3           # 0: up to label0
+# %bb.2:                                # %while.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -44,14 +42,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 1024
-	i32.sub 	$push16=, $pop7, $pop9
-	tee_local	$push15=, $1=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
+	i32.sub 	$1=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $1
 	i32.const	$2=, 1024
 	i32.const	$push0=, 0
 	i32.const	$push14=, 1024
@@ -59,28 +56,26 @@ main:                                   # @main
 .LBB1_1:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.add 	$push25=, $0, $2
-	tee_local	$push24=, $1=, $pop25
-	i32.const	$push23=, -8
-	i32.add 	$push1=, $pop24, $pop23
-	i64.const	$push22=, 25769803782
-	i64.store	0($pop1):p2align=2, $pop22
-	i32.const	$push21=, -16
-	i32.add 	$push2=, $1, $pop21
-	i64.const	$push20=, 25769803782
-	i64.store	0($pop2):p2align=2, $pop20
-	i32.const	$push19=, -16
-	i32.add 	$push18=, $2, $pop19
-	tee_local	$push17=, $2=, $pop18
-	br_if   	0, $pop17       # 0: up to label1
-# BB#2:                                 # %foo.exit
+	i32.add 	$1=, $0, $2
+	i32.const	$push19=, -8
+	i32.add 	$push1=, $1, $pop19
+	i64.const	$push18=, 25769803782
+	i64.store	0($pop1):p2align=2, $pop18
+	i32.const	$push17=, -16
+	i32.add 	$push2=, $1, $pop17
+	i64.const	$push16=, 25769803782
+	i64.store	0($pop2):p2align=2, $pop16
+	i32.const	$push15=, -16
+	i32.add 	$2=, $2, $pop15
+	br_if   	0, $2           # 0: up to label1
+# %bb.2:                                # %foo.exit
 	end_loop
 	block   	
 	i32.load	$push4=, 0($0)
 	i32.const	$push3=, 6
 	i32.ne  	$push5=, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label2
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push13=, 0
 	i32.const	$push11=, 1024
 	i32.add 	$push12=, $0, $pop11
@@ -96,5 +91,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/990524-1.c.s b/test/torture-s/990524-1.c.s
index df8850933..8107728b1 100644
--- a/test/torture-s/990524-1.c.s
+++ b/test/torture-s/990524-1.c.s
@@ -7,15 +7,13 @@
 loop:                                   # @loop
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 .LBB0_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	copy_local	$push22=, $1
-	tee_local	$push21=, $2=, $pop22
-	i32.load8_u	$push20=, 0($pop21)
-	tee_local	$push19=, $4=, $pop20
-	i32.store8	0($0), $pop19
+	copy_local	$2=, $1
+	i32.load8_u	$4=, 0($2)
+	i32.store8	0($0), $4
 	i32.const	$push18=, 1
 	i32.add 	$1=, $2, $pop18
 	i32.const	$push17=, 24
@@ -27,10 +25,10 @@ loop:                                   # @loop
 	i32.const	$push15=, 34
 	i32.eq  	$push1=, $4, $pop15
 	br_if   	0, $pop1        # 0: down to label2
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push23=, 92
-	i32.ne  	$push2=, $3, $pop23
+	i32.const	$push19=, 92
+	i32.ne  	$push2=, $3, $pop19
 	br_if   	1, $pop2        # 1: down to label1
 .LBB0_3:                                # %sw.bb2
                                         #   in Loop: Header=BB0_1 Depth=1
@@ -47,10 +45,10 @@ loop:                                   # @loop
 .LBB0_4:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
-	i32.const	$push24=, 1
-	i32.add 	$0=, $0, $pop24
+	i32.const	$push20=, 1
+	i32.add 	$0=, $0, $pop20
 	br_if   	0, $3           # 0: up to label0
-# BB#5:                                 # %loopDone2
+# %bb.5:                                # %loopDone2
 	end_loop
 	block   	
 	i32.const	$push5=, a
@@ -61,7 +59,7 @@ loop:                                   # @loop
 	i32.sub 	$push10=, $pop9, $pop8
 	i32.ne  	$push11=, $pop6, $pop10
 	br_if   	0, $pop11       # 0: down to label3
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	return
 .LBB0_7:                                # %if.then
 	end_block                       # label3:
@@ -77,7 +75,7 @@ loop:                                   # @loop
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, a
 	i32.const	$push0=, b
 	call    	loop@FUNCTION, $pop1, $pop0
@@ -105,6 +103,6 @@ b:
 	.size	b, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4d4d62a27..c9de773b6 100644
--- a/test/torture-s/990525-1.c.s
+++ b/test/torture-s/990525-1.c.s
@@ -6,13 +6,13 @@
 	.type	die,@function
 die:                                    # @die
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,14 +29,13 @@ die:                                    # @die
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop2, $pop4
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop5), $pop9
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.s($pop0):p2align=2
 	i64.store	8($0), $pop1
@@ -59,6 +58,6 @@ main:                                   # @main
 	.size	.Lmain.s, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 cc7bbf23c..955096e0d 100644
--- a/test/torture-s/990525-2.c.s
+++ b/test/torture-s/990525-2.c.s
@@ -7,7 +7,7 @@
 func1:                                  # @func1
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end15
+# %bb.0:                                # %if.end15
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ func1:                                  # @func1
 	.type	func2,@function
 func2:                                  # @func2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 85899345930
 	i64.store	0($0):p2align=2, $pop0
 	i64.const	$push1=, 171798691870
@@ -36,7 +36,7 @@ func2:                                  # @func2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -45,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990527-1.c.s b/test/torture-s/990527-1.c.s
index f20056312..408b95a10 100644
--- a/test/torture-s/990527-1.c.s
+++ b/test/torture-s/990527-1.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
 	i32.load	$push1=, sum($pop3)
@@ -23,7 +23,7 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, sum($pop5)
@@ -43,19 +43,18 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, sum($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, sum($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 81
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	sum($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	sum($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+# %bb.1:                                # %if.end
+	i32.const	$push4=, 0
+	call    	exit@FUNCTION, $pop4
 	unreachable
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
@@ -75,6 +74,6 @@ sum:
 	.size	sum, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d2a6b7f7d..284d40eb8 100644
--- a/test/torture-s/990531-1.c.s
+++ b/test/torture-s/990531-1.c.s
@@ -8,13 +8,12 @@ bad:                                    # @bad
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push9=, $pop3, $pop5
-	tee_local	$push8=, $2=, $pop9
-	i32.store	8($pop8), $1
+	i32.sub 	$2=, $pop3, $pop5
+	i32.store	8($2), $1
 	i32.const	$push6=, 8
 	i32.add 	$push7=, $2, $pop6
 	i32.add 	$push0=, $pop7, $0
@@ -32,7 +31,7 @@ bad:                                    # @bad
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990604-1.c.s b/test/torture-s/990604-1.c.s
index 2e8548b3c..72e85cffa 100644
--- a/test/torture-s/990604-1.c.s
+++ b/test/torture-s/990604-1.c.s
@@ -5,13 +5,13 @@
 	.globl	f
 	.type	f,@function
 f:                                      # @f
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, b($pop2)
 	i32.eqz 	$push4=, $pop0
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,25 +30,24 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	i32.load	$0=, b($pop4)
 	block   	
 	block   	
-	i32.const	$push6=, 0
-	i32.load	$push5=, b($pop6)
-	tee_local	$push4=, $0=, $pop5
 	i32.const	$push0=, 9
-	i32.eq  	$push1=, $pop4, $pop0
+	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	br_if   	1, $0           # 1: down to label1
-# BB#2:                                 # %f.exit.thread
+# %bb.2:                                # %f.exit.thread
 	i32.const	$push3=, 0
 	i32.const	$push2=, 9
 	i32.store	b($pop3), $pop2
 .LBB1_3:                                # %if.end
 	end_block                       # label2:
-	i32.const	$push7=, 0
-	return  	$pop7
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB1_4:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -67,5 +66,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/990628-1.c.s b/test/torture-s/990628-1.c.s
index 3a320aa16..7deee05c8 100644
--- a/test/torture-s/990628-1.c.s
+++ b/test/torture-s/990628-1.c.s
@@ -6,7 +6,7 @@
 	.type	num_records,@function
 num_records:                            # @num_records
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,18 +19,17 @@ num_records:                            # @num_records
 	.type	fetch,@function
 fetch:                                  # @fetch
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, data_tmp
 	i32.const	$push1=, 85
 	i32.const	$push0=, 404
 	i32.call	$drop=, memset@FUNCTION, $pop2, $pop1, $pop0
 	i32.const	$push3=, 0
-	i32.const	$push14=, 0
-	i32.load	$push13=, fetch.fetch_count($pop14)
-	tee_local	$push12=, $0=, $pop13
+	i32.load	$0=, fetch.fetch_count($pop3)
+	i32.const	$push12=, 0
 	i32.const	$push4=, 1
-	i32.add 	$push5=, $pop12, $pop4
-	i32.store	fetch.fetch_count($pop3), $pop5
+	i32.add 	$push5=, $0, $pop4
+	i32.store	fetch.fetch_count($pop12), $pop5
 	i32.const	$push11=, 0
 	i32.const	$push7=, 100
 	i32.const	$push10=, 0
@@ -49,65 +48,61 @@ fetch:                                  # @fetch
 	.type	load_data,@function
 load_data:                              # @load_data
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push20=, 404
+	i32.call	$3=, malloc@FUNCTION, $pop20
 	i32.const	$push0=, 0
-	i32.const	$push26=, 404
-	i32.call	$push25=, malloc@FUNCTION, $pop26
-	tee_local	$push24=, $3=, $pop25
-	i32.store	data_ptr($pop0), $pop24
+	i32.store	data_ptr($pop0), $3
 	i32.const	$push1=, 170
-	i32.const	$push23=, 404
-	i32.call	$drop=, memset@FUNCTION, $3, $pop1, $pop23
+	i32.const	$push19=, 404
+	i32.call	$drop=, memset@FUNCTION, $3, $pop1, $pop19
 	i32.const	$push2=, data_tmp
-	i32.const	$push22=, 85
-	i32.const	$push21=, 404
-	i32.call	$0=, memset@FUNCTION, $pop2, $pop22, $pop21
-	i32.const	$push20=, 0
-	i32.const	$push19=, 0
-	i32.load	$push18=, fetch.fetch_count($pop19)
-	tee_local	$push17=, $2=, $pop18
-	i32.const	$push16=, 1
-	i32.add 	$push3=, $pop17, $pop16
-	i32.store	fetch.fetch_count($pop20), $pop3
+	i32.const	$push18=, 85
+	i32.const	$push17=, 404
+	i32.call	$0=, memset@FUNCTION, $pop2, $pop18, $pop17
+	i32.const	$push16=, 0
+	i32.load	$2=, fetch.fetch_count($pop16)
 	i32.const	$push15=, 0
-	i32.const	$push4=, 100
-	i32.const	$push14=, 0
+	i32.const	$push14=, 1
+	i32.add 	$push3=, $2, $pop14
+	i32.store	fetch.fetch_count($pop15), $pop3
 	i32.const	$push13=, 0
-	i32.gt_s	$push12=, $2, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.select	$push5=, $pop4, $pop14, $pop11
-	i32.store	sqlca($pop15), $pop5
+	i32.gt_s	$1=, $2, $pop13
+	i32.const	$push12=, 0
+	i32.const	$push4=, 100
+	i32.const	$push11=, 0
+	i32.select	$push5=, $pop4, $pop11, $1
+	i32.store	sqlca($pop12), $pop5
 	block   	
-	i32.eqz 	$push36=, $1
-	br_if   	0, $pop36       # 0: down to label0
-# BB#1:                                 # %while.end
+	i32.eqz 	$push28=, $1
+	br_if   	0, $pop28       # 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
-	i32.const	$push33=, 85
-	i32.const	$push32=, 404
-	i32.call	$drop=, memset@FUNCTION, $0, $pop33, $pop32
-	i32.const	$push31=, 404
-	i32.add 	$3=, $3, $pop31
-	i32.const	$push30=, 1
-	i32.add 	$push29=, $2, $pop30
-	tee_local	$push28=, $2=, $pop29
-	i32.const	$push27=, 1
-	i32.lt_s	$push6=, $pop28, $pop27
+	i32.const	$push26=, 404
+	i32.call	$drop=, memcpy@FUNCTION, $3, $0, $pop26
+	i32.const	$push25=, 85
+	i32.const	$push24=, 404
+	i32.call	$drop=, memset@FUNCTION, $0, $pop25, $pop24
+	i32.const	$push23=, 404
+	i32.add 	$3=, $3, $pop23
+	i32.const	$push22=, 1
+	i32.add 	$2=, $2, $pop22
+	i32.const	$push21=, 1
+	i32.lt_s	$push6=, $2, $pop21
 	br_if   	0, $pop6        # 0: up to label1
-# BB#3:                                 # %while.cond.while.end_crit_edge
+# %bb.3:                                # %while.cond.while.end_crit_edge
 	end_loop
 	i32.const	$push8=, 0
 	i32.const	$push7=, 100
 	i32.store	sqlca($pop8), $pop7
-	i32.const	$push35=, 0
+	i32.const	$push27=, 0
 	i32.const	$push9=, 1
 	i32.add 	$push10=, $2, $pop9
-	i32.store	fetch.fetch_count($pop35), $pop10
+	i32.store	fetch.fetch_count($pop27), $pop10
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -120,69 +115,65 @@ load_data:                              # @load_data
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push21=, 404
+	i32.call	$2=, malloc@FUNCTION, $pop21
 	i32.const	$push0=, 0
-	i32.const	$push27=, 404
-	i32.call	$push26=, malloc@FUNCTION, $pop27
-	tee_local	$push25=, $1=, $pop26
-	i32.store	data_ptr($pop0), $pop25
+	i32.store	data_ptr($pop0), $2
 	i32.const	$push1=, 170
-	i32.const	$push24=, 404
-	i32.call	$0=, memset@FUNCTION, $1, $pop1, $pop24
+	i32.const	$push20=, 404
+	i32.call	$0=, memset@FUNCTION, $2, $pop1, $pop20
 	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	$push19=, 85
+	i32.const	$push18=, 404
+	i32.call	$1=, memset@FUNCTION, $pop2, $pop19, $pop18
+	i32.const	$push17=, 0
+	i32.load	$2=, fetch.fetch_count($pop17)
 	i32.const	$push16=, 0
-	i32.const	$push4=, 100
-	i32.const	$push15=, 0
+	i32.const	$push15=, 1
+	i32.add 	$push3=, $2, $pop15
+	i32.store	fetch.fetch_count($pop16), $pop3
 	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
+	i32.gt_s	$3=, $2, $pop14
+	i32.const	$push13=, 0
+	i32.const	$push4=, 100
+	i32.const	$push12=, 0
+	i32.select	$push5=, $pop4, $pop12, $3
+	i32.store	sqlca($pop13), $pop5
 	block   	
 	br_if   	0, $3           # 0: down to label2
-# BB#1:                                 # %while.body.lr.ph.i
+# %bb.1:                                # %while.body.lr.ph.i
 	copy_local	$3=, $0
 .LBB3_2:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push35=, 404
-	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
+	i32.const	$push27=, 404
+	i32.call	$drop=, memcpy@FUNCTION, $3, $1, $pop27
+	i32.const	$push26=, 85
+	i32.const	$push25=, 404
+	i32.call	$drop=, memset@FUNCTION, $1, $pop26, $pop25
+	i32.const	$push24=, 404
+	i32.add 	$3=, $3, $pop24
+	i32.const	$push23=, 1
+	i32.add 	$2=, $2, $pop23
+	i32.const	$push22=, 1
+	i32.lt_s	$push6=, $2, $pop22
 	br_if   	0, $pop6        # 0: up to label3
-# BB#3:                                 # %load_data.exit
+# %bb.3:                                # %load_data.exit
 	end_loop
-	i32.const	$push37=, 0
+	i32.const	$push29=, 0
 	i32.const	$push7=, 100
-	i32.store	sqlca($pop37), $pop7
-	i32.const	$push36=, 0
+	i32.store	sqlca($pop29), $pop7
+	i32.const	$push28=, 0
 	i32.const	$push8=, 2
-	i32.store	fetch.fetch_count($pop36), $pop8
+	i32.store	fetch.fetch_count($pop28), $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
-	call    	exit@FUNCTION, $pop38
+# %bb.4:                                # %if.end
+	i32.const	$push30=, 0
+	call    	exit@FUNCTION, $pop30
 	unreachable
 .LBB3_5:                                # %if.then
 	end_block                       # label2:
@@ -227,7 +218,7 @@ data_ptr:
 	.size	data_ptr, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4835a9af8..6c18a2300 100644
--- a/test/torture-s/990804-1.c.s
+++ b/test/torture-s/990804-1.c.s
@@ -6,7 +6,7 @@
 	.type	gfbyte,@function
 gfbyte:                                 # @gfbyte
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ gfbyte:                                 # @gfbyte
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990811-1.c.s b/test/torture-s/990811-1.c.s
index 76b6d633d..f44743952 100644
--- a/test/torture-s/990811-1.c.s
+++ b/test/torture-s/990811-1.c.s
@@ -7,20 +7,20 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, 2
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	i32.const	$push2=, 1
 	i32.eq  	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	br_if   	2, $0           # 2: down to label0
-# BB#3:                                 # %sw.bb
+# %bb.3:                                # %sw.bb
 	i32.load	$push6=, 0($1)
 	return  	$pop6
 .LBB0_4:                                # %sw.bb1
@@ -45,7 +45,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end16
+# %bb.0:                                # %if.end16
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -54,6 +54,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0550c01cd..7317db5f0 100644
--- a/test/torture-s/990826-0.c.s
+++ b/test/torture-s/990826-0.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/990827-1.c.s b/test/torture-s/990827-1.c.s
index 98faf3cab..637dae640 100644
--- a/test/torture-s/990827-1.c.s
+++ b/test/torture-s/990827-1.c.s
@@ -7,7 +7,7 @@
 test:                                   # @test
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.and 	$push2=, $1, $pop0
 	i32.const	$push8=, 1
@@ -28,7 +28,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -37,5 +37,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990829-1.c.s b/test/torture-s/990829-1.c.s
index adfa57347..0f831db50 100644
--- a/test/torture-s/990829-1.c.s
+++ b/test/torture-s/990829-1.c.s
@@ -7,7 +7,7 @@
 test:                                   # @test
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.sub 	$push0=, $1, $0
 	f64.const	$push1=, 0x1p0
 	f64.add 	$push2=, $0, $pop1
@@ -24,7 +24,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/990923-1.c.s b/test/torture-s/990923-1.c.s
index 6e0bcfbfe..91de8d1a5 100644
--- a/test/torture-s/990923-1.c.s
+++ b/test/torture-s/990923-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push6=, 1
@@ -27,7 +27,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -36,5 +36,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991014-1.c.s b/test/torture-s/991014-1.c.s
index ef29c6830..e5a2f95d5 100644
--- a/test/torture-s/991014-1.c.s
+++ b/test/torture-s/991014-1.c.s
@@ -6,7 +6,7 @@
 	.type	union_size,@function
 union_size:                             # @union_size
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1073741568
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ union_size:                             # @union_size
 	.type	struct_size,@function
 struct_size:                            # @struct_size
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483152
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ struct_size:                            # @struct_size
 	.type	struct_a_offset,@function
 struct_a_offset:                        # @struct_a_offset
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483136
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ struct_a_offset:                        # @struct_a_offset
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -53,4 +53,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/991016-1.c.s b/test/torture-s/991016-1.c.s
index 3a9283b81..efe4236b9 100644
--- a/test/torture-s/991016-1.c.s
+++ b/test/torture-s/991016-1.c.s
@@ -8,33 +8,31 @@ doit:                                   # @doit
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i64, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, 2
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	i32.const	$push6=, 1
 	i32.eq  	$push2=, $0, $pop6
 	br_if   	0, $pop2        # 0: down to label2
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	br_if   	2, $0           # 2: down to label0
-# BB#3:                                 # %sw.bb
+# %bb.3:                                # %sw.bb
 	i32.load	$0=, 0($2)
 .LBB0_4:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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.end
+	copy_local	$3=, $0
+	i32.const	$push8=, -1
+	i32.add 	$1=, $1, $pop8
+	i32.const	$push7=, 1
+	i32.shl 	$0=, $3, $pop7
+	br_if   	0, $1           # 0: up to label3
+# %bb.5:                                # %do.end
 	end_loop
 	i32.store	0($2), $0
 	i32.eqz 	$push5=, $3
@@ -45,15 +43,13 @@ doit:                                   # @doit
 .LBB0_7:                                # %do.body2
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
-	copy_local	$push18=, $0
-	tee_local	$push17=, $3=, $pop18
-	i32.const	$push16=, 1
-	i32.shl 	$0=, $pop17, $pop16
-	i32.const	$push15=, -1
-	i32.add 	$push14=, $1, $pop15
-	tee_local	$push13=, $1=, $pop14
-	br_if   	0, $pop13       # 0: up to label4
-# BB#8:                                 # %do.end7
+	copy_local	$3=, $0
+	i32.const	$push10=, -1
+	i32.add 	$1=, $1, $pop10
+	i32.const	$push9=, 1
+	i32.shl 	$0=, $3, $pop9
+	br_if   	0, $1           # 0: up to label4
+# %bb.8:                                # %do.end7
 	end_loop
 	i32.store	0($2), $0
 	i32.eqz 	$push4=, $3
@@ -64,15 +60,13 @@ doit:                                   # @doit
 .LBB0_10:                               # %do.body11
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	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.end16
+	copy_local	$4=, $5
+	i32.const	$push12=, -1
+	i32.add 	$1=, $1, $pop12
+	i64.const	$push11=, 1
+	i64.shl 	$5=, $4, $pop11
+	br_if   	0, $1           # 0: up to label5
+# %bb.11:                               # %do.end16
 	end_loop
 	i64.store	0($2), $5
 	i64.eqz 	$push3=, $4
@@ -91,7 +85,7 @@ doit:                                   # @doit
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -100,6 +94,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 06ef324a8..5dcb8a213 100644
--- a/test/torture-s/991019-1.c.s
+++ b/test/torture-s/991019-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x1p0
 	f64.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991023-1.c.s b/test/torture-s/991023-1.c.s
index ce274d99f..d3a003040 100644
--- a/test/torture-s/991023-1.c.s
+++ b/test/torture-s/991023-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 4044
 	i32.store	blah($pop1), $pop0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 4044
 	i32.store	blah($pop1), $pop0
@@ -43,5 +43,5 @@ blah:
 	.size	blah, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991030-1.c.s b/test/torture-s/991030-1.c.s
index fb57fda06..f788ecf6c 100644
--- a/test/torture-s/991030-1.c.s
+++ b/test/torture-s/991030-1.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	f64.load	$push0=, x($pop3)
 	f64.const	$push1=, 0x1.fp1
 	f64.eq  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -35,6 +35,6 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6c5b4536a..ebb996b5d 100644
--- a/test/torture-s/991112-1.c.s
+++ b/test/torture-s/991112-1.c.s
@@ -7,7 +7,7 @@
 rl_show_char:                           # @rl_show_char
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ rl_show_char:                           # @rl_show_char
 rl_character_len:                       # @rl_character_len
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 1
 	i32.const	$push1=, 2
 	i32.call	$push0=, isprint@FUNCTION, $0
@@ -37,17 +37,17 @@ rl_character_len:                       # @rl_character_len
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 97
 	i32.call	$push1=, isprint@FUNCTION, $pop0
 	i32.eqz 	$push5=, $pop1
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 2
 	i32.call	$push3=, isprint@FUNCTION, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB2_3:                                # %if.then
@@ -59,6 +59,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9fca4861a..1d27b6c26 100644
--- a/test/torture-s/991118-1.c.s
+++ b/test/torture-s/991118-1.c.s
@@ -6,7 +6,7 @@
 	.type	sub,@function
 sub:                                    # @sub
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, -8690468286197432320
 	i64.xor 	$push2=, $pop0, $pop1
@@ -22,7 +22,7 @@ sub:                                    # @sub
 	.type	sub2,@function
 sub2:                                   # @sub2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, 2381903268435576
 	i64.xor 	$push2=, $pop0, $pop1
@@ -38,7 +38,7 @@ sub2:                                   # @sub2
 	.type	sub3,@function
 sub3:                                   # @sub3
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, -4345234143098716160
 	i64.xor 	$push2=, $pop0, $pop1
@@ -54,7 +54,7 @@ sub3:                                   # @sub3
 	.type	sub4,@function
 sub4:                                   # @sub4
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, 6885502895806072
 	i64.xor 	$push2=, $pop0, $pop1
@@ -71,96 +71,88 @@ sub4:                                   # @sub4
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64, i64, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
-	i32.const	$push51=, 0
-	i64.load	$push50=, tmp($pop51)
-	tee_local	$push49=, $2=, $pop50
+	i64.load	$2=, tmp($pop1)
 	i64.const	$push2=, -8690468286197432320
-	i64.xor 	$push48=, $pop49, $pop2
-	tee_local	$push47=, $3=, $pop48
-	i64.store	tmp($pop1), $pop47
-	i32.const	$push46=, 0
-	i32.const	$push45=, 0
-	i64.load	$push44=, tmp2($pop45)
-	tee_local	$push43=, $0=, $pop44
+	i64.xor 	$3=, $2, $pop2
+	i32.const	$push43=, 0
+	i64.store	tmp($pop43), $3
+	i32.const	$push42=, 0
+	i64.load	$0=, tmp2($pop42)
 	i64.const	$push3=, 2381903268435576
-	i64.xor 	$push42=, $pop43, $pop3
-	tee_local	$push41=, $1=, $pop42
-	i64.store	tmp2($pop46), $pop41
+	i64.xor 	$1=, $0, $pop3
+	i32.const	$push41=, 0
+	i64.store	tmp2($pop41), $1
 	block   	
 	i64.const	$push4=, -4096
 	i64.and 	$push5=, $3, $pop4
 	i64.const	$push6=, -7687337405579571200
 	i64.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i64.const	$push8=, 52
 	i64.shl 	$push9=, $2, $pop8
-	i64.const	$push53=, 52
-	i64.shr_s	$push10=, $pop9, $pop53
+	i64.const	$push45=, 52
+	i64.shr_s	$push10=, $pop9, $pop45
 	i32.wrap/i64	$push0=, $pop10
-	i32.const	$push52=, 291
-	i32.ne  	$push11=, $pop0, $pop52
+	i32.const	$push44=, 291
+	i32.ne  	$push11=, $pop0, $pop44
 	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i64.const	$push14=, 52
 	i64.shr_s	$push15=, $0, $pop14
 	i32.wrap/i64	$push16=, $pop15
-	i32.const	$push54=, 291
-	i32.ne  	$push17=, $pop16, $pop54
+	i32.const	$push46=, 291
+	i32.ne  	$push17=, $pop16, $pop46
 	br_if   	0, $pop17       # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i64.const	$push13=, 4503599627370495
 	i64.and 	$push12=, $1, $pop13
 	i64.const	$push18=, 2626808268586421
 	i64.ne  	$push19=, $pop12, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#4:                                 # %if.end19
+# %bb.4:                                # %if.end19
 	i32.const	$push21=, 0
-	i32.const	$push65=, 0
-	i64.load	$push64=, tmp3($pop65)
-	tee_local	$push63=, $2=, $pop64
+	i64.load	$2=, tmp3($pop21)
 	i64.const	$push22=, -4345234143098716160
-	i64.xor 	$push62=, $pop63, $pop22
-	tee_local	$push61=, $3=, $pop62
-	i64.store	tmp3($pop21), $pop61
-	i32.const	$push60=, 0
-	i32.const	$push59=, 0
-	i64.load	$push58=, tmp4($pop59)
-	tee_local	$push57=, $0=, $pop58
+	i64.xor 	$3=, $2, $pop22
+	i32.const	$push49=, 0
+	i64.store	tmp3($pop49), $3
+	i32.const	$push48=, 0
+	i64.load	$0=, tmp4($pop48)
 	i64.const	$push23=, 6885502895806072
-	i64.xor 	$push56=, $pop57, $pop23
-	tee_local	$push55=, $1=, $pop56
-	i64.store	tmp4($pop60), $pop55
+	i64.xor 	$1=, $0, $pop23
+	i32.const	$push47=, 0
+	i64.store	tmp4($pop47), $1
 	i64.const	$push24=, -2048
 	i64.and 	$push25=, $3, $pop24
 	i64.const	$push26=, -3725223934242340864
 	i64.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#5:                                 # %if.end19
+# %bb.5:                                # %if.end19
 	i64.const	$push28=, 53
 	i64.shl 	$push29=, $2, $pop28
-	i64.const	$push67=, 53
-	i64.shr_s	$push30=, $pop29, $pop67
+	i64.const	$push51=, 53
+	i64.shr_s	$push30=, $pop29, $pop51
 	i32.wrap/i64	$push20=, $pop30
-	i32.const	$push66=, 291
-	i32.ne  	$push31=, $pop20, $pop66
+	i32.const	$push50=, 291
+	i32.ne  	$push31=, $pop20, $pop50
 	br_if   	0, $pop31       # 0: down to label0
-# BB#6:                                 # %if.end34
+# %bb.6:                                # %if.end34
 	i64.const	$push34=, 53
 	i64.shr_s	$push35=, $0, $pop34
 	i32.wrap/i64	$push36=, $pop35
-	i32.const	$push68=, 291
-	i32.ne  	$push37=, $pop36, $pop68
+	i32.const	$push52=, 291
+	i32.ne  	$push37=, $pop36, $pop52
 	br_if   	0, $pop37       # 0: down to label0
-# BB#7:                                 # %if.end34
+# %bb.7:                                # %if.end34
 	i64.const	$push33=, 9007199254740991
 	i64.and 	$push32=, $1, $pop33
 	i64.const	$push38=, 7188242255599224
 	i64.ne  	$push39=, $pop32, $pop38
 	br_if   	0, $pop39       # 0: down to label0
-# BB#8:                                 # %if.end47
+# %bb.8:                                # %if.end47
 	i32.const	$push40=, 0
 	call    	exit@FUNCTION, $pop40
 	unreachable
@@ -237,6 +229,6 @@ tmp4:
 	.size	tmp4, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6f5f50678..3edfcde8c 100644
--- a/test/torture-s/991201-1.c.s
+++ b/test/torture-s/991201-1.c.s
@@ -7,45 +7,44 @@
 reset_palette:                          # @reset_palette
 	.param  	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, vc_cons
 	i32.add 	$1=, $pop1, $pop2
-	i32.const	$0=, 6
-	i32.const	$2=, -64
+	i32.const	$2=, 6
+	i32.const	$0=, -64
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
 	i32.load	$push3=, 0($1)
-	i32.add 	$push4=, $pop3, $0
-	i32.const	$push25=, -2
-	i32.add 	$push5=, $pop4, $pop25
-	i32.const	$push24=, default_red+64
-	i32.add 	$push6=, $2, $pop24
+	i32.add 	$push4=, $pop3, $2
+	i32.const	$push23=, -2
+	i32.add 	$push5=, $pop4, $pop23
+	i32.const	$push22=, default_red+64
+	i32.add 	$push6=, $0, $pop22
 	i32.load	$push7=, 0($pop6)
 	i32.store8	0($pop5), $pop7
 	i32.load	$push8=, 0($1)
-	i32.add 	$push9=, $pop8, $0
-	i32.const	$push23=, -1
-	i32.add 	$push10=, $pop9, $pop23
-	i32.const	$push22=, default_grn+64
-	i32.add 	$push11=, $2, $pop22
+	i32.add 	$push9=, $pop8, $2
+	i32.const	$push21=, -1
+	i32.add 	$push10=, $pop9, $pop21
+	i32.const	$push20=, default_grn+64
+	i32.add 	$push11=, $0, $pop20
 	i32.load	$push12=, 0($pop11)
 	i32.store8	0($pop10), $pop12
 	i32.load	$push13=, 0($1)
-	i32.add 	$push14=, $pop13, $0
-	i32.const	$push21=, default_blu+64
-	i32.add 	$push15=, $2, $pop21
+	i32.add 	$push14=, $pop13, $2
+	i32.const	$push19=, default_blu+64
+	i32.add 	$push15=, $0, $pop19
 	i32.load	$push16=, 0($pop15)
 	i32.store8	0($pop14), $pop16
-	i32.const	$push20=, 3
-	i32.add 	$0=, $0, $pop20
-	i32.const	$push19=, 4
-	i32.add 	$push18=, $2, $pop19
-	tee_local	$push17=, $2=, $pop18
-	br_if   	0, $pop17       # 0: up to label0
-# BB#2:                                 # %bar.exit
+	i32.const	$push18=, 4
+	i32.add 	$0=, $0, $pop18
+	i32.const	$push17=, 3
+	i32.add 	$2=, $2, $pop17
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %bar.exit
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -58,12 +57,12 @@ reset_palette:                          # @reset_palette
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 48
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
@@ -79,7 +78,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	reset_palette@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -197,6 +196,6 @@ default_blu:
 	.size	default_blu, 64
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9d1bffaab..0e26645a5 100644
--- a/test/torture-s/991202-1.c.s
+++ b/test/torture-s/991202-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 64
 	i32.store	y($pop1), $pop0
@@ -39,5 +39,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991202-2.c.s b/test/torture-s/991202-2.c.s
index b732d724c..324e1405c 100644
--- a/test/torture-s/991202-2.c.s
+++ b/test/torture-s/991202-2.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f1:                                     # @f1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991202-3.c.s b/test/torture-s/991202-3.c.s
index bee60f04b..7e5f33fd2 100644
--- a/test/torture-s/991202-3.c.s
+++ b/test/torture-s/991202-3.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 13
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 536862720
@@ -24,7 +24,7 @@ f:                                      # @f
 g:                                      # @g
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -39,7 +39,7 @@ g:                                      # @g
 h:                                      # @h
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.shr_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -53,7 +53,7 @@ h:                                      # @h
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -62,5 +62,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991216-1.c.s b/test/torture-s/991216-1.c.s
index 8d66dfe16..7aa2a7c77 100644
--- a/test/torture-s/991216-1.c.s
+++ b/test/torture-s/991216-1.c.s
@@ -6,20 +6,20 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i64.const	$push2=, 81985529216486895
 	i64.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 85
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -35,24 +35,24 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.param  	i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i64.const	$push4=, 81985529216486895
 	i64.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 85
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return
 .LBB1_5:                                # %if.then
 	end_block                       # label1:
@@ -68,28 +68,28 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.param  	i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label2
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i64.const	$push6=, 81985529216486895
 	i64.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label2
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push8=, 85
 	i32.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label2
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	return
 .LBB2_6:                                # %if.then
 	end_block                       # label2:
@@ -105,32 +105,32 @@ test3:                                  # @test3
 	.type	test4,@function
 test4:                                  # @test4
 	.param  	i32, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label3
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label3
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label3
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i64.const	$push8=, 81985529216486895
 	i64.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label3
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.const	$push10=, 85
 	i32.ne  	$push11=, $5, $pop10
 	br_if   	0, $pop11       # 0: down to label3
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	return
 .LBB3_7:                                # %if.then
 	end_block                       # label3:
@@ -146,36 +146,36 @@ test4:                                  # @test4
 	.type	test5,@function
 test5:                                  # @test5
 	.param  	i32, i32, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label4
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label4
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label4
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label4
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push8=, 5
 	i32.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label4
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i64.const	$push10=, 81985529216486895
 	i64.ne  	$push11=, $5, $pop10
 	br_if   	0, $pop11       # 0: down to label4
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i32.const	$push12=, 85
 	i32.ne  	$push13=, $6, $pop12
 	br_if   	0, $pop13       # 0: down to label4
-# BB#7:                                 # %if.end
+# %bb.7:                                # %if.end
 	return
 .LBB4_8:                                # %if.then
 	end_block                       # label4:
@@ -191,40 +191,40 @@ test5:                                  # @test5
 	.type	test6,@function
 test6:                                  # @test6
 	.param  	i32, i32, i32, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label5
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label5
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label5
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label5
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push8=, 5
 	i32.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label5
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.const	$push10=, 6
 	i32.ne  	$push11=, $5, $pop10
 	br_if   	0, $pop11       # 0: down to label5
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i64.const	$push12=, 81985529216486895
 	i64.ne  	$push13=, $6, $pop12
 	br_if   	0, $pop13       # 0: down to label5
-# BB#7:                                 # %entry
+# %bb.7:                                # %entry
 	i32.const	$push14=, 85
 	i32.ne  	$push15=, $7, $pop14
 	br_if   	0, $pop15       # 0: down to label5
-# BB#8:                                 # %if.end
+# %bb.8:                                # %if.end
 	return
 .LBB5_9:                                # %if.then
 	end_block                       # label5:
@@ -240,44 +240,44 @@ test6:                                  # @test6
 	.type	test7,@function
 test7:                                  # @test7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label6
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label6
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label6
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label6
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push8=, 5
 	i32.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label6
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.const	$push10=, 6
 	i32.ne  	$push11=, $5, $pop10
 	br_if   	0, $pop11       # 0: down to label6
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i32.const	$push12=, 7
 	i32.ne  	$push13=, $6, $pop12
 	br_if   	0, $pop13       # 0: down to label6
-# BB#7:                                 # %entry
+# %bb.7:                                # %entry
 	i64.const	$push14=, 81985529216486895
 	i64.ne  	$push15=, $7, $pop14
 	br_if   	0, $pop15       # 0: down to label6
-# BB#8:                                 # %entry
+# %bb.8:                                # %entry
 	i32.const	$push16=, 85
 	i32.ne  	$push17=, $8, $pop16
 	br_if   	0, $pop17       # 0: down to label6
-# BB#9:                                 # %if.end
+# %bb.9:                                # %if.end
 	return
 .LBB6_10:                               # %if.then
 	end_block                       # label6:
@@ -293,48 +293,48 @@ test7:                                  # @test7
 	.type	test8,@function
 test8:                                  # @test8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label7
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label7
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push4=, 3
 	i32.ne  	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label7
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label7
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push8=, 5
 	i32.ne  	$push9=, $4, $pop8
 	br_if   	0, $pop9        # 0: down to label7
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.const	$push10=, 6
 	i32.ne  	$push11=, $5, $pop10
 	br_if   	0, $pop11       # 0: down to label7
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i32.const	$push12=, 7
 	i32.ne  	$push13=, $6, $pop12
 	br_if   	0, $pop13       # 0: down to label7
-# BB#7:                                 # %entry
+# %bb.7:                                # %entry
 	i32.const	$push14=, 8
 	i32.ne  	$push15=, $7, $pop14
 	br_if   	0, $pop15       # 0: down to label7
-# BB#8:                                 # %entry
+# %bb.8:                                # %entry
 	i64.const	$push16=, 81985529216486895
 	i64.ne  	$push17=, $8, $pop16
 	br_if   	0, $pop17       # 0: down to label7
-# BB#9:                                 # %entry
+# %bb.9:                                # %entry
 	i32.const	$push18=, 85
 	i32.ne  	$push19=, $9, $pop18
 	br_if   	0, $pop19       # 0: down to label7
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	return
 .LBB7_11:                               # %if.then
 	end_block                       # label7:
@@ -350,7 +350,7 @@ test8:                                  # @test8
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -359,6 +359,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end8-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2ce2d48a6..5d116cf72 100644
--- a/test/torture-s/991216-2.c.s
+++ b/test/torture-s/991216-2.c.s
@@ -7,14 +7,13 @@
 test:                                   # @test
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	i32.const	$push18=, 0
 	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push25=, $pop17, $pop19
-	tee_local	$push24=, $4=, $pop25
-	i32.store	__stack_pointer($pop20), $pop24
+	i32.sub 	$4=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $4
 	i32.store	12($4), $1
 	block   	
 	block   	
@@ -22,7 +21,7 @@ test:                                   # @test
 	i32.const	$push0=, 2
 	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:
+# %bb.1:
 	copy_local	$3=, $1
 	br      	1               # 1: down to label1
 .LBB0_2:                                # %for.body.preheader
@@ -31,17 +30,15 @@ test:                                   # @test
 .LBB0_3:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push31=, 4
-	i32.add 	$push30=, $1, $pop31
-	tee_local	$push29=, $3=, $pop30
-	i32.store	12($4), $pop29
-	i32.const	$push28=, 1
-	i32.add 	$push27=, $2, $pop28
-	tee_local	$push26=, $2=, $pop27
+	i32.const	$push25=, 4
+	i32.add 	$3=, $1, $pop25
+	i32.store	12($4), $3
+	i32.const	$push24=, 1
+	i32.add 	$2=, $2, $pop24
 	i32.load	$push2=, 0($1)
-	i32.ne  	$push3=, $pop26, $pop2
+	i32.ne  	$push3=, $2, $pop2
 	br_if   	2, $pop3        # 2: down to label0
-# BB#4:                                 # %for.cond
+# %bb.4:                                # %for.cond
                                         #   in Loop: Header=BB0_3 Depth=1
 	copy_local	$1=, $3
 	i32.lt_s	$push4=, $2, $0
@@ -52,25 +49,23 @@ test:                                   # @test
 	i32.const	$push5=, 7
 	i32.add 	$push6=, $3, $pop5
 	i32.const	$push7=, -8
-	i32.and 	$push35=, $pop6, $pop7
-	tee_local	$push34=, $1=, $pop35
+	i32.and 	$2=, $pop6, $pop7
 	i32.const	$push8=, 8
-	i32.add 	$push33=, $pop34, $pop8
-	tee_local	$push32=, $2=, $pop33
-	i32.store	12($4), $pop32
-	i64.load	$push9=, 0($1)
+	i32.add 	$1=, $2, $pop8
+	i32.store	12($4), $1
+	i64.load	$push9=, 0($2)
 	i64.const	$push10=, 81985529216486895
 	i64.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#6:                                 # %if.end7
+# %bb.6:                                # %if.end7
 	i32.const	$push12=, 12
-	i32.add 	$push13=, $1, $pop12
+	i32.add 	$push13=, $2, $pop12
 	i32.store	12($4), $pop13
-	i32.load	$push14=, 0($2)
+	i32.load	$push14=, 0($1)
 	i32.const	$push15=, 85
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#7:                                 # %if.end12
+# %bb.7:                                # %if.end12
 	i32.const	$push23=, 0
 	i32.const	$push21=, 16
 	i32.add 	$push22=, $4, $pop21
@@ -91,14 +86,13 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push37=, 0
+# %bb.0:                                # %entry
 	i32.const	$push35=, 0
 	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 288
-	i32.sub 	$push116=, $pop34, $pop36
-	tee_local	$push115=, $0=, $pop116
-	i32.store	__stack_pointer($pop37), $pop115
+	i32.sub 	$0=, $pop34, $pop36
+	i32.const	$push37=, 0
+	i32.store	__stack_pointer($pop37), $0
 	i32.const	$push0=, 85
 	i32.store	280($0), $pop0
 	i64.const	$push1=, 81985529216486895
@@ -257,6 +251,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c65042ef6..cb9dd2ce4 100644
--- a/test/torture-s/991216-4.c.s
+++ b/test/torture-s/991216-4.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991221-1.c.s b/test/torture-s/991221-1.c.s
index d2627ba10..071c2a40c 100644
--- a/test/torture-s/991221-1.c.s
+++ b/test/torture-s/991221-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991227-1.c.s b/test/torture-s/991227-1.c.s
index d0559b608..7f9f9bbd9 100644
--- a/test/torture-s/991227-1.c.s
+++ b/test/torture-s/991227-1.c.s
@@ -7,7 +7,7 @@
 doit:                                   # @doit
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, .L.str
 	i32.const	$push0=, .L.str.1
 	i32.select	$push2=, $pop1, $pop0, $0
@@ -24,7 +24,7 @@ doit:                                   # @doit
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	.L.str.1, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/991228-1.c.s b/test/torture-s/991228-1.c.s
index bde74f1cc..9ecf45783 100644
--- a/test/torture-s/991228-1.c.s
+++ b/test/torture-s/991228-1.c.s
@@ -8,13 +8,12 @@ signbit:                                # @signbit
 	.param  	f64
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push14=, $pop8, $pop10
-	tee_local	$push13=, $1=, $pop14
-	f64.store	8($pop13), $0
+	i32.sub 	$1=, $pop8, $pop10
+	f64.store	8($1), $0
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $1, $pop11
 	i32.const	$push0=, 0
@@ -37,29 +36,27 @@ signbit:                                # @signbit
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push22=, $pop11, $pop13
-	tee_local	$push21=, $1=, $pop22
-	i32.store	__stack_pointer($pop14), $pop21
-	block   	
-	i32.const	$push20=, 0
-	i32.load	$push0=, endianness_test($pop20)
+	i32.sub 	$1=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $1
+	i32.const	$push18=, 0
+	i32.load	$push0=, endianness_test($pop18)
 	i32.const	$push1=, 2
-	i32.shl 	$push19=, $pop0, $pop1
-	tee_local	$push18=, $0=, $pop19
+	i32.shl 	$0=, $pop0, $pop1
+	block   	
 	i32.const	$push2=, u
-	i32.add 	$push3=, $pop18, $pop2
+	i32.add 	$push3=, $0, $pop2
 	i32.load	$push4=, 0($pop3)
 	i32.const	$push17=, 0
 	i32.lt_s	$push5=, $pop4, $pop17
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push23=, 0
-	call    	exit@FUNCTION, $pop23
+# %bb.1:                                # %if.then
+	i32.const	$push19=, 0
+	call    	exit@FUNCTION, $pop19
 	unreachable
 .LBB1_2:                                # %if.end
 	end_block                       # label0:
@@ -70,10 +67,10 @@ main:                                   # @main
 	i32.add 	$push16=, $1, $pop15
 	i32.add 	$push7=, $pop16, $0
 	i32.load	$push8=, 0($pop7)
-	i32.const	$push24=, 0
-	i32.lt_s	$push9=, $pop8, $pop24
+	i32.const	$push20=, 0
+	i32.lt_s	$push9=, $pop8, $pop20
 	br_if   	0, $pop9        # 0: down to label1
-# BB#3:                                 # %if.then1
+# %bb.3:                                # %if.then1
 	call    	abort@FUNCTION
 	unreachable
 .LBB1_4:                                # %if.end2
@@ -104,6 +101,6 @@ endianness_test:
 	.size	endianness_test, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8a4e170f0..d704a395f 100644
--- a/test/torture-s/align-1.c.s
+++ b/test/torture-s/align-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/align-2.c.s b/test/torture-s/align-2.c.s
index 57bebd098..5f0486fd9 100644
--- a/test/torture-s/align-2.c.s
+++ b/test/torture-s/align-2.c.s
@@ -6,122 +6,122 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push95=, 0
 	i32.load8_u	$push0=, s_c_s($pop95)
 	i32.const	$push1=, 97
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push96=, 0
 	i32.load16_u	$push3=, s_c_s+2($pop96)
 	i32.const	$push4=, 13
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push97=, 0
 	i32.load8_u	$push6=, s_c_i($pop97)
 	i32.const	$push7=, 98
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push98=, 0
 	i32.load	$push9=, s_c_i+4($pop98)
 	i32.const	$push10=, 14
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end15
+# %bb.4:                                # %if.end15
 	i32.const	$push99=, 0
 	i32.load16_u	$push12=, s_s_i($pop99)
 	i32.const	$push13=, 15
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %if.end20
+# %bb.5:                                # %if.end20
 	i32.const	$push100=, 0
 	i32.load	$push15=, s_s_i+4($pop100)
 	i32.const	$push16=, 16
 	i32.ne  	$push17=, $pop15, $pop16
 	br_if   	0, $pop17       # 0: down to label0
-# BB#6:                                 # %if.end24
+# %bb.6:                                # %if.end24
 	i32.const	$push101=, 0
 	i32.load8_u	$push18=, s_c_f($pop101)
 	i32.const	$push19=, 99
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#7:                                 # %if.end29
+# %bb.7:                                # %if.end29
 	i32.const	$push102=, 0
 	f32.load	$push21=, s_c_f+4($pop102)
 	f32.const	$push22=, 0x1.1p4
 	f32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#8:                                 # %if.end34
+# %bb.8:                                # %if.end34
 	i32.const	$push103=, 0
 	i32.load16_u	$push24=, s_s_f($pop103)
 	i32.const	$push25=, 18
 	i32.ne  	$push26=, $pop24, $pop25
 	br_if   	0, $pop26       # 0: down to label0
-# BB#9:                                 # %if.end39
+# %bb.9:                                # %if.end39
 	i32.const	$push104=, 0
 	f32.load	$push27=, s_s_f+4($pop104)
 	f32.const	$push28=, 0x1.3p4
 	f32.ne  	$push29=, $pop27, $pop28
 	br_if   	0, $pop29       # 0: down to label0
-# BB#10:                                # %if.end44
+# %bb.10:                               # %if.end44
 	i32.const	$push105=, 0
 	i32.load8_u	$push30=, s_c_d($pop105)
 	i32.const	$push31=, 100
 	i32.ne  	$push32=, $pop30, $pop31
 	br_if   	0, $pop32       # 0: down to label0
-# BB#11:                                # %if.end49
+# %bb.11:                               # %if.end49
 	i32.const	$push106=, 0
 	f64.load	$push33=, s_c_d+8($pop106)
 	f64.const	$push34=, 0x1.4p4
 	f64.ne  	$push35=, $pop33, $pop34
 	br_if   	0, $pop35       # 0: down to label0
-# BB#12:                                # %if.end53
+# %bb.12:                               # %if.end53
 	i32.const	$push107=, 0
 	i32.load16_u	$push36=, s_s_d($pop107)
 	i32.const	$push37=, 21
 	i32.ne  	$push38=, $pop36, $pop37
 	br_if   	0, $pop38       # 0: down to label0
-# BB#13:                                # %if.end58
+# %bb.13:                               # %if.end58
 	i32.const	$push108=, 0
 	f64.load	$push39=, s_s_d+8($pop108)
 	f64.const	$push40=, 0x1.6p4
 	f64.ne  	$push41=, $pop39, $pop40
 	br_if   	0, $pop41       # 0: down to label0
-# BB#14:                                # %if.end62
+# %bb.14:                               # %if.end62
 	i32.const	$push109=, 0
 	i32.load	$push42=, s_i_d($pop109)
 	i32.const	$push43=, 23
 	i32.ne  	$push44=, $pop42, $pop43
 	br_if   	0, $pop44       # 0: down to label0
-# BB#15:                                # %if.end66
+# %bb.15:                               # %if.end66
 	i32.const	$push110=, 0
 	f64.load	$push45=, s_i_d+8($pop110)
 	f64.const	$push46=, 0x1.8p4
 	f64.ne  	$push47=, $pop45, $pop46
 	br_if   	0, $pop47       # 0: down to label0
-# BB#16:                                # %if.end70
+# %bb.16:                               # %if.end70
 	i32.const	$push111=, 0
 	f32.load	$push48=, s_f_d($pop111)
 	f32.const	$push49=, 0x1.9p4
 	f32.ne  	$push50=, $pop48, $pop49
 	br_if   	0, $pop50       # 0: down to label0
-# BB#17:                                # %if.end75
+# %bb.17:                               # %if.end75
 	i32.const	$push112=, 0
 	f64.load	$push51=, s_f_d+8($pop112)
 	f64.const	$push52=, 0x1.ap4
 	f64.ne  	$push53=, $pop51, $pop52
 	br_if   	0, $pop53       # 0: down to label0
-# BB#18:                                # %if.end79
+# %bb.18:                               # %if.end79
 	i32.const	$push113=, 0
 	i32.load8_u	$push54=, s_c_ld($pop113)
 	i32.const	$push55=, 101
 	i32.ne  	$push56=, $pop54, $pop55
 	br_if   	0, $pop56       # 0: down to label0
-# BB#19:                                # %if.end84
+# %bb.19:                               # %if.end84
 	i32.const	$push115=, 0
 	i64.load	$push58=, s_c_ld+16($pop115)
 	i32.const	$push114=, 0
@@ -130,13 +130,13 @@ main:                                   # @main
 	i64.const	$push59=, 4612723957404008448
 	i32.call	$push61=, __eqtf2@FUNCTION, $pop58, $pop57, $pop60, $pop59
 	br_if   	0, $pop61       # 0: down to label0
-# BB#20:                                # %if.end88
+# %bb.20:                               # %if.end88
 	i32.const	$push116=, 0
 	i32.load16_u	$push62=, s_s_ld($pop116)
 	i32.const	$push63=, 28
 	i32.ne  	$push64=, $pop62, $pop63
 	br_if   	0, $pop64       # 0: down to label0
-# BB#21:                                # %if.end93
+# %bb.21:                               # %if.end93
 	i32.const	$push118=, 0
 	i64.load	$push66=, s_s_ld+16($pop118)
 	i32.const	$push117=, 0
@@ -145,13 +145,13 @@ main:                                   # @main
 	i64.const	$push67=, 4612759141776097280
 	i32.call	$push69=, __eqtf2@FUNCTION, $pop66, $pop65, $pop68, $pop67
 	br_if   	0, $pop69       # 0: down to label0
-# BB#22:                                # %if.end97
+# %bb.22:                               # %if.end97
 	i32.const	$push119=, 0
 	i32.load	$push70=, s_i_ld($pop119)
 	i32.const	$push71=, 30
 	i32.ne  	$push72=, $pop70, $pop71
 	br_if   	0, $pop72       # 0: down to label0
-# BB#23:                                # %if.end101
+# %bb.23:                               # %if.end101
 	i32.const	$push121=, 0
 	i64.load	$push74=, s_i_ld+16($pop121)
 	i32.const	$push120=, 0
@@ -160,13 +160,13 @@ main:                                   # @main
 	i64.const	$push75=, 4612794326148186112
 	i32.call	$push77=, __eqtf2@FUNCTION, $pop74, $pop73, $pop76, $pop75
 	br_if   	0, $pop77       # 0: down to label0
-# BB#24:                                # %if.end105
+# %bb.24:                               # %if.end105
 	i32.const	$push122=, 0
 	f32.load	$push78=, s_f_ld($pop122)
 	f32.const	$push79=, 0x1p5
 	f32.ne  	$push80=, $pop78, $pop79
 	br_if   	0, $pop80       # 0: down to label0
-# BB#25:                                # %if.end110
+# %bb.25:                               # %if.end110
 	i32.const	$push124=, 0
 	i64.load	$push82=, s_f_ld+16($pop124)
 	i32.const	$push123=, 0
@@ -175,13 +175,13 @@ main:                                   # @main
 	i64.const	$push83=, 4612820714427252736
 	i32.call	$push85=, __eqtf2@FUNCTION, $pop82, $pop81, $pop84, $pop83
 	br_if   	0, $pop85       # 0: down to label0
-# BB#26:                                # %if.end114
+# %bb.26:                               # %if.end114
 	i32.const	$push125=, 0
 	f64.load	$push86=, s_d_ld($pop125)
 	f64.const	$push87=, 0x1.1p5
 	f64.ne  	$push88=, $pop86, $pop87
 	br_if   	0, $pop88       # 0: down to label0
-# BB#27:                                # %if.end118
+# %bb.27:                               # %if.end118
 	i32.const	$push127=, 0
 	i64.load	$push90=, s_d_ld+16($pop127)
 	i32.const	$push126=, 0
@@ -190,7 +190,7 @@ main:                                   # @main
 	i64.const	$push91=, 4612838306613297152
 	i32.call	$push93=, __eqtf2@FUNCTION, $pop90, $pop89, $pop92, $pop91
 	br_if   	0, $pop93       # 0: down to label0
-# BB#28:                                # %if.end122
+# %bb.28:                               # %if.end122
 	i32.const	$push94=, 0
 	return  	$pop94
 .LBB0_29:                               # %if.then
@@ -361,5 +361,5 @@ s_d_ld:
 	.size	s_d_ld, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/align-3.c.s b/test/torture-s/align-3.c.s
index b3d4e3bf5..8b4afdc0c 100644
--- a/test/torture-s/align-3.c.s
+++ b/test/torture-s/align-3.c.s
@@ -6,7 +6,7 @@
 	.p2align	8
 	.type	func,@function
 func:                                   # @func
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ func:                                   # @func
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -26,4 +26,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/alloca-1.c.s b/test/torture-s/alloca-1.c.s
index 887fae75a..4284e31c8 100644
--- a/test/torture-s/alloca-1.c.s
+++ b/test/torture-s/alloca-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/anon-1.c.s b/test/torture-s/anon-1.c.s
index 63f32bfc8..e28076c4b 100644
--- a/test/torture-s/anon-1.c.s
+++ b/test/torture-s/anon-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 25769803781
 	i64.store	foo+4($pop1):p2align=2, $pop0
@@ -27,4 +27,4 @@ foo:
 	.size	foo, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/arith-1.c.s b/test/torture-s/arith-1.c.s
index 998379c5b..1864a93a7 100644
--- a/test/torture-s/arith-1.c.s
+++ b/test/torture-s/arith-1.c.s
@@ -7,7 +7,7 @@
 sat_add:                                # @sat_add
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $0, $pop2
@@ -25,7 +25,7 @@ sat_add:                                # @sat_add
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -34,5 +34,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 39d9e0dc9..ab6944079 100644
--- a/test/torture-s/arith-rand-ll.c.s
+++ b/test/torture-s/arith-rand-ll.c.s
@@ -7,16 +7,15 @@
 simple_rand:                            # @simple_rand
 	.result 	i64
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i64.load	$push1=, simple_rand.seed($pop9)
+	i64.load	$push1=, simple_rand.seed($pop0)
 	i64.const	$push2=, 1103515245
 	i64.mul 	$push3=, $pop1, $pop2
 	i64.const	$push4=, 12345
-	i64.add 	$push8=, $pop3, $pop4
-	tee_local	$push7=, $0=, $pop8
-	i64.store	simple_rand.seed($pop0), $pop7
+	i64.add 	$0=, $pop3, $pop4
+	i32.const	$push7=, 0
+	i64.store	simple_rand.seed($pop7), $0
 	i64.const	$push5=, 8
 	i64.shr_u	$push6=, $0, $pop5
                                         # fallthrough-return: $pop6
@@ -31,77 +30,71 @@ simple_rand:                            # @simple_rand
 random_bitstring:                       # @random_bitstring
 	.result 	i64
 	.local  	i32, i32, i64, i64, i64
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push17=, 0
+	i64.load	$push0=, simple_rand.seed($pop17)
+	i64.const	$push16=, 1103515245
+	i64.mul 	$push1=, $pop0, $pop16
+	i64.const	$push15=, 12345
+	i64.add 	$3=, $pop1, $pop15
+	i32.const	$push14=, 0
+	i64.store	simple_rand.seed($pop14), $3
+	i64.const	$push13=, 9
+	i64.shr_u	$2=, $3, $pop13
 	i64.const	$4=, 0
+	i32.wrap/i64	$push2=, $2
+	i32.const	$push12=, 15
+	i32.and 	$0=, $pop2, $pop12
 	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
+	i32.eqz 	$push28=, $0
+	br_if   	0, $pop28       # 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	$push25=, 15
-	i64.and 	$push3=, $2, $pop25
+	i64.const	$push19=, 15
+	i64.and 	$push3=, $2, $pop19
 	i64.shl 	$4=, $4, $pop3
 	block   	
-	i64.const	$push24=, 256
-	i64.and 	$push4=, $3, $pop24
+	i64.const	$push18=, 256
+	i64.and 	$push4=, $3, $pop18
 	i64.eqz 	$push5=, $pop4
 	br_if   	0, $pop5        # 0: down to label2
-# BB#3:                                 # %if.then2
+# %bb.3:                                # %if.then2
                                         #   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
+	i32.const	$push21=, 1
+	i32.shl 	$push6=, $pop21, $1
+	i32.const	$push20=, -1
+	i32.add 	$push7=, $pop6, $pop20
 	i64.extend_s/i32	$push8=, $pop7
 	i64.or  	$4=, $4, $pop8
 .LBB1_4:                                # %if.end
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label2:
-	i32.const	$push28=, 71
-	i32.ge_u	$push9=, $0, $pop28
+	i32.const	$push22=, 71
+	i32.ge_u	$push9=, $0, $pop22
 	br_if   	1, $pop9        # 1: down to label0
-# BB#5:                                 # %for.cond
+# %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
+	i64.const	$push27=, 1103515245
+	i64.mul 	$push10=, $3, $pop27
+	i64.const	$push26=, 12345
+	i64.add 	$3=, $pop10, $pop26
+	i32.const	$push25=, 0
+	i64.store	simple_rand.seed($pop25), $3
+	i64.const	$push24=, 9
+	i64.shr_u	$2=, $3, $pop24
+	i32.wrap/i64	$push11=, $2
+	i32.const	$push23=, 15
+	i32.and 	$1=, $pop11, $pop23
+	i32.add 	$0=, $1, $0
 	br_if   	0, $1           # 0: up to label1
 .LBB1_6:                                # %cleanup
 	end_loop
 	end_block                       # label0:
-	copy_local	$push41=, $4
-                                        # fallthrough-return: $pop41
+	copy_local	$push29=, $4
+                                        # fallthrough-return: $pop29
 	.endfunc
 .Lfunc_end1:
 	.size	random_bitstring, .Lfunc_end1-random_bitstring
@@ -112,11 +105,11 @@ random_bitstring:                       # @random_bitstring
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i64, i64, i32, i32, i32, i32, i32, i32, i32, i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push80=, 0
-	i64.load	$2=, simple_rand.seed($pop80)
-	i64.const	$1=, 0
+	.local  	i64, i64, i64, i32, i64, i64, i32, i32, i32, i32, i32, i32, i32, i64, i64
+# %bb.0:                                # %entry
+	i32.const	$push2=, 0
+	i64.load	$2=, simple_rand.seed($pop2)
+	i64.const	$0=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
@@ -126,362 +119,327 @@ main:                                   # @main
 	block   	
 	block   	
 	loop    	                # label7:
-	copy_local	$0=, $1
+	i64.const	$push78=, 1103515245
+	i64.mul 	$push3=, $2, $pop78
+	i64.const	$push77=, 12345
+	i64.add 	$2=, $pop3, $pop77
+	i64.const	$push76=, 9
+	i64.shr_u	$1=, $2, $pop76
+	i32.wrap/i64	$push4=, $1
+	i32.const	$push75=, 15
+	i32.and 	$11=, $pop4, $pop75
 	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
+	i32.eqz 	$push138=, $11
+	br_if   	0, $pop138      # 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
+	i64.const	$13=, 0
+	copy_local	$12=, $11
 .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
+	i64.const	$push80=, 15
+	i64.and 	$push5=, $1, $pop80
+	i64.shl 	$13=, $13, $pop5
 	block   	
-	i64.const	$push91=, 256
-	i64.and 	$push3=, $1, $pop91
-	i64.eqz 	$push4=, $pop3
-	br_if   	0, $pop4        # 0: down to label11
-# BB#4:                                 # %if.then2.i
+	i64.const	$push79=, 256
+	i64.and 	$push6=, $2, $pop79
+	i64.eqz 	$push7=, $pop6
+	br_if   	0, $pop7        # 0: down to label11
+# %bb.4:                                # %if.then2.i
                                         #   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  	$10=, $10, $pop7
+	i32.const	$push82=, 1
+	i32.shl 	$push8=, $pop82, $12
+	i32.const	$push81=, -1
+	i32.add 	$push9=, $pop8, $pop81
+	i64.extend_s/i32	$push10=, $pop9
+	i64.or  	$13=, $13, $pop10
 .LBB2_5:                                # %if.end.i
                                         #   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
+	i32.const	$push83=, 71
+	i32.ge_u	$push11=, $11, $pop83
+	br_if   	2, $pop11       # 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
+	i64.const	$push87=, 1103515245
+	i64.mul 	$push12=, $2, $pop87
+	i64.const	$push86=, 12345
+	i64.add 	$2=, $pop12, $pop86
+	i64.const	$push85=, 9
+	i64.shr_u	$1=, $2, $pop85
+	i32.wrap/i64	$push13=, $1
+	i32.const	$push84=, 15
+	i32.and 	$12=, $pop13, $pop84
+	i32.add 	$11=, $12, $11
+	br_if   	0, $12          # 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
+	i64.const	$13=, 0
 .LBB2_8:                                # %random_bitstring.exit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label8:
+	i64.const	$push91=, 1103515245
+	i64.mul 	$push14=, $2, $pop91
+	i64.const	$push90=, 12345
+	i64.add 	$2=, $pop14, $pop90
+	i64.const	$push89=, 9
+	i64.shr_u	$14=, $2, $pop89
+	i32.wrap/i64	$push15=, $14
+	i32.const	$push88=, 15
+	i32.and 	$11=, $pop15, $pop88
 	block   	
-	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
+	i32.eqz 	$push139=, $11
+	br_if   	0, $pop139      # 0: down to label12
+# %bb.9:                                # %if.else.i459.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
 	i64.const	$1=, 0
-	copy_local	$9=, $8
+	copy_local	$12=, $11
 .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
+	i64.const	$push93=, 15
+	i64.and 	$push16=, $14, $pop93
+	i64.shl 	$1=, $1, $pop16
 	block   	
-	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
+	i64.const	$push92=, 256
+	i64.and 	$push17=, $2, $pop92
+	i64.eqz 	$push18=, $pop17
+	br_if   	0, $pop18       # 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
+	i32.const	$push95=, 1
+	i32.shl 	$push19=, $pop95, $12
+	i32.const	$push94=, -1
+	i32.add 	$push20=, $pop19, $pop94
+	i64.extend_s/i32	$push21=, $pop20
+	i64.or  	$1=, $1, $pop21
 .LBB2_12:                               # %if.end.i467
                                         #   in Loop: Header=BB2_10 Depth=2
 	end_block                       # label14:
 	block   	
-	i32.const	$push120=, 71
-	i32.ge_u	$push19=, $8, $pop120
-	br_if   	0, $pop19       # 0: down to label15
-# BB#13:                                # %for.cond.i451
+	i32.const	$push96=, 71
+	i32.ge_u	$push22=, $11, $pop96
+	br_if   	0, $pop22       # 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
+	i64.const	$push100=, 1103515245
+	i64.mul 	$push23=, $2, $pop100
+	i64.const	$push99=, 12345
+	i64.add 	$2=, $pop23, $pop99
+	i64.const	$push98=, 9
+	i64.shr_u	$14=, $2, $pop98
+	i32.wrap/i64	$push24=, $14
+	i32.const	$push97=, 15
+	i32.and 	$12=, $pop24, $pop97
+	i32.add 	$11=, $12, $11
+	br_if   	1, $12          # 1: up to label13
 .LBB2_14:                               # %random_bitstring.exit469
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label15:
 	end_loop
-	i64.eqz 	$push22=, $1
-	br_if   	0, $pop22       # 0: down to label12
-# BB#15:                                # %cleanup.cont
+	i64.eqz 	$push25=, $1
+	br_if   	0, $pop25       # 0: down to label12
+# %bb.15:                               # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
-	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
+	i64.const	$push102=, 9223372036854775807
+	i64.and 	$push26=, $13, $pop102
+	i64.const	$push101=, 0
+	i64.ne  	$push27=, $pop26, $pop101
+	br_if   	0, $pop27       # 0: down to label16
+# %bb.16:                               # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
-	i64.const	$push133=, -1
-	i64.eq  	$push25=, $1, $pop133
-	br_if   	1, $pop25       # 1: down to label12
+	i64.const	$push103=, -1
+	i64.eq  	$push28=, $1, $pop103
+	br_if   	1, $pop28       # 1: down to label12
 .LBB2_17:                               # %if.end17
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label16:
-	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
+	i64.const	$push105=, 63
+	i64.shr_s	$14=, $1, $pop105
+	i64.rem_s	$4=, $13, $1
+	i64.const	$push104=, 63
+	i64.shr_s	$5=, $4, $pop104
+	i64.add 	$push31=, $4, $5
+	i64.xor 	$push32=, $pop31, $5
+	i64.add 	$push29=, $1, $14
+	i64.xor 	$push30=, $pop29, $14
+	i64.ge_u	$push33=, $pop32, $pop30
+	br_if   	2, $pop33       # 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
+	i32.wrap/i64	$12=, $1
+	i32.eqz 	$push140=, $12
+	br_if   	0, $pop140      # 0: down to label12
+# %bb.19:                               # %cleanup.cont65
                                         #   in Loop: Header=BB2_1 Depth=1
+	i32.wrap/i64	$11=, $13
 	block   	
-	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
+	i32.const	$push106=, 2147483647
+	i32.and 	$push35=, $11, $pop106
+	br_if   	0, $pop35       # 0: down to label17
+# %bb.20:                               # %cleanup.cont65
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push147=, -1
-	i32.eq  	$push33=, $8, $pop147
-	br_if   	1, $pop33       # 1: down to label12
+	i32.const	$push107=, -1
+	i32.eq  	$push36=, $12, $pop107
+	br_if   	1, $pop36       # 1: down to label12
 .LBB2_21:                               # %if.end79
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label17:
-	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.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
+	i32.const	$push109=, 31
+	i32.shr_s	$6=, $12, $pop109
+	i32.rem_s	$3=, $11, $12
+	i32.const	$push108=, 31
+	i32.shr_s	$7=, $3, $pop108
+	i32.add 	$push39=, $3, $7
+	i32.xor 	$push40=, $pop39, $7
+	i32.add 	$push37=, $12, $6
+	i32.xor 	$push38=, $pop37, $6
+	i32.ge_u	$push41=, $pop40, $pop38
+	br_if   	3, $pop41       # 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
+	i32.eqz 	$push141=, $3
+	br_if   	0, $pop141      # 0: down to label18
+# %bb.23:                               # %lor.lhs.false103
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.xor 	$push39=, $3, $9
-	i32.const	$push156=, -1
-	i32.le_s	$push40=, $pop39, $pop156
-	br_if   	4, $pop40       # 4: down to label5
+	i32.xor 	$push42=, $3, $11
+	i32.const	$push110=, -1
+	i32.le_s	$push43=, $pop42, $pop110
+	br_if   	4, $pop43       # 4: down to label5
 .LBB2_24:                               # %cleanup.cont118
                                         #   in Loop: Header=BB2_1 Depth=1
 	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
+	i32.const	$push111=, 65535
+	i32.and 	$push44=, $12, $pop111
+	i32.eqz 	$push142=, $pop44
+	br_if   	0, $pop142      # 0: down to label12
+# %bb.25:                               # %cleanup.cont158
                                         #   in Loop: Header=BB2_1 Depth=1
-	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=, 16
-	i32.shr_s	$push170=, $pop172, $pop171
-	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=, $4=, $pop164
-	i32.const	$push162=, 0
-	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 	$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
+	i32.const	$push120=, 16
+	i32.shl 	$7=, $12, $pop120
+	i32.const	$push119=, 16
+	i32.shr_s	$3=, $7, $pop119
+	i32.const	$push118=, 16
+	i32.shl 	$push45=, $11, $pop118
+	i32.const	$push117=, 16
+	i32.shr_s	$6=, $pop45, $pop117
+	i32.div_s	$push0=, $6, $3
+	i32.mul 	$8=, $pop0, $3
+	i32.sub 	$push46=, $6, $8
+	i32.const	$push116=, 16
+	i32.shl 	$9=, $pop46, $pop116
+	i32.const	$push115=, 31
+	i32.shr_s	$10=, $9, $pop115
+	i32.const	$push114=, 16
+	i32.shr_s	$9=, $9, $pop114
+	i32.const	$push113=, 31
+	i32.shr_s	$7=, $7, $pop113
+	i32.add 	$push47=, $9, $10
+	i32.xor 	$push48=, $pop47, $10
+	i32.add 	$push49=, $3, $7
+	i32.xor 	$push50=, $pop49, $7
+	i32.const	$push112=, 65535
+	i32.and 	$push51=, $pop50, $pop112
+	i32.ge_s	$push52=, $pop48, $pop51
+	br_if   	4, $pop52       # 4: down to label4
+# %bb.26:                               # %lor.lhs.false197
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.add 	$push53=, $8, $9
+	i32.const	$push122=, 16
+	i32.shl 	$push54=, $pop53, $pop122
+	i32.const	$push121=, 16
+	i32.shr_s	$push55=, $pop54, $pop121
+	i32.ne  	$push56=, $pop55, $6
+	br_if   	4, $pop56       # 4: down to label4
+# %bb.27:                               # %if.end209
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.const	$push123=, 255
+	i32.and 	$push58=, $12, $pop123
+	i32.eqz 	$push143=, $pop58
+	br_if   	0, $pop143      # 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
+	i32.const	$push132=, 24
+	i32.shl 	$3=, $12, $pop132
+	i32.const	$push131=, 24
+	i32.shr_s	$12=, $3, $pop131
+	i32.const	$push130=, 24
+	i32.shl 	$push59=, $11, $pop130
+	i32.const	$push129=, 24
+	i32.shr_s	$11=, $pop59, $pop129
+	i32.div_s	$push1=, $11, $12
+	i32.mul 	$6=, $pop1, $12
+	i32.sub 	$push60=, $11, $6
+	i32.const	$push128=, 24
+	i32.shl 	$7=, $pop60, $pop128
+	i32.const	$push127=, 31
+	i32.shr_s	$8=, $7, $pop127
+	i32.const	$push126=, 24
+	i32.shr_s	$7=, $7, $pop126
+	i32.const	$push125=, 31
+	i32.shr_s	$3=, $3, $pop125
+	i32.add 	$push61=, $7, $8
+	i32.xor 	$push62=, $pop61, $8
+	i32.add 	$push63=, $12, $3
+	i32.xor 	$push64=, $pop63, $3
+	i32.const	$push124=, 255
+	i32.and 	$push65=, $pop64, $pop124
+	i32.ge_s	$push66=, $pop62, $pop65
+	br_if   	5, $pop66       # 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
+	i32.add 	$push67=, $6, $7
+	i32.const	$push134=, 24
+	i32.shl 	$push68=, $pop67, $pop134
+	i32.const	$push133=, 24
+	i32.shr_s	$push69=, $pop68, $pop133
+	i32.ne  	$push70=, $pop69, $11
+	br_if   	5, $pop70       # 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
+	i64.const	$push136=, 1
+	i64.add 	$0=, $0, $pop136
+	i64.const	$push135=, 10000
+	i64.lt_u	$push73=, $0, $pop135
+	br_if   	0, $pop73       # 0: up to label7
+# %bb.31:                               # %for.end
 	end_loop
-	i32.const	$push79=, 0
-	i64.store	simple_rand.seed($pop79), $2
-	i32.const	$push207=, 0
-	call    	exit@FUNCTION, $pop207
+	i32.const	$push74=, 0
+	i64.store	simple_rand.seed($pop74), $2
+	i32.const	$push137=, 0
+	call    	exit@FUNCTION, $pop137
 	unreachable
 .LBB2_32:                               # %if.then32
 	end_block                       # label6:
-	i32.const	$push31=, 0
-	i64.store	simple_rand.seed($pop31), $2
+	i32.const	$push34=, 0
+	i64.store	simple_rand.seed($pop34), $2
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_33:                               # %if.then111
 	end_block                       # label5:
-	i32.const	$push77=, 0
-	i64.store	simple_rand.seed($pop77), $2
+	i32.const	$push72=, 0
+	i64.store	simple_rand.seed($pop72), $2
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_34:                               # %if.then208
 	end_block                       # label4:
-	i32.const	$push58=, 0
-	i64.store	simple_rand.seed($pop58), $2
+	i32.const	$push57=, 0
+	i64.store	simple_rand.seed($pop57), $2
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_35:                               # %if.then299
 	end_block                       # label3:
-	i32.const	$push76=, 0
-	i64.store	simple_rand.seed($pop76), $2
+	i32.const	$push71=, 0
+	i64.store	simple_rand.seed($pop71), $2
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -496,6 +454,6 @@ simple_rand.seed:
 	.size	simple_rand.seed, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 291b11f80..05cc486b8 100644
--- a/test/torture-s/arith-rand.c.s
+++ b/test/torture-s/arith-rand.c.s
@@ -7,16 +7,15 @@
 simple_rand:                            # @simple_rand
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push9=, 0
-	i32.load	$push1=, simple_rand.seed($pop9)
+	i32.load	$push1=, simple_rand.seed($pop0)
 	i32.const	$push2=, 1103515245
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 12345
-	i32.add 	$push8=, $pop3, $pop4
-	tee_local	$push7=, $0=, $pop8
-	i32.store	simple_rand.seed($pop0), $pop7
+	i32.add 	$0=, $pop3, $pop4
+	i32.const	$push7=, 0
+	i32.store	simple_rand.seed($pop7), $0
 	i32.const	$push5=, 8
 	i32.shr_u	$push6=, $0, $pop5
                                         # fallthrough-return: $pop6
@@ -31,26 +30,24 @@ simple_rand:                            # @simple_rand
 random_bitstring:                       # @random_bitstring
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
-	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
+	i32.const	$push14=, 0
+	i32.load	$push0=, simple_rand.seed($pop14)
+	i32.const	$push13=, 1103515245
+	i32.mul 	$push1=, $pop0, $pop13
+	i32.const	$push12=, 12345
+	i32.add 	$2=, $pop1, $pop12
+	i32.const	$push11=, 0
+	i32.store	simple_rand.seed($pop11), $2
+	i32.const	$push10=, 9
+	i32.shr_u	$push2=, $2, $pop10
+	i32.const	$push9=, 15
+	i32.and 	$0=, $pop2, $pop9
 	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
+	i32.eqz 	$push24=, $0
+	br_if   	0, $pop24       # 0: down to label0
+# %bb.1:                                # %if.else.preheader
 	copy_local	$1=, $0
 	i32.const	$3=, 0
 .LBB1_2:                                # %if.else
@@ -58,44 +55,42 @@ random_bitstring:                       # @random_bitstring
 	loop    	                # label1:
 	i32.shl 	$3=, $3, $1
 	block   	
-	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
+	i32.const	$push15=, 256
+	i32.and 	$push3=, $2, $pop15
+	i32.eqz 	$push25=, $pop3
+	br_if   	0, $pop25       # 0: down to label2
+# %bb.3:                                # %if.then1
                                         #   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.const	$push17=, 1
+	i32.shl 	$push4=, $pop17, $1
+	i32.const	$push16=, -1
+	i32.add 	$push5=, $pop4, $pop16
 	i32.or  	$3=, $pop5, $3
 .LBB1_4:                                # %if.end
                                         #   in Loop: Header=BB1_2 Depth=1
 	end_block                       # label2:
-	i32.const	$push22=, 39
-	i32.ge_u	$push6=, $0, $pop22
+	i32.const	$push18=, 39
+	i32.ge_u	$push6=, $0, $pop18
 	br_if   	1, $pop6        # 1: down to label0
-# BB#5:                                 # %for.cond
+# %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
+	i32.const	$push23=, 1103515245
+	i32.mul 	$push7=, $2, $pop23
+	i32.const	$push22=, 12345
+	i32.add 	$2=, $pop7, $pop22
+	i32.const	$push21=, 0
+	i32.store	simple_rand.seed($pop21), $2
+	i32.const	$push20=, 9
+	i32.shr_u	$push8=, $2, $pop20
+	i32.const	$push19=, 15
+	i32.and 	$1=, $pop8, $pop19
+	i32.add 	$0=, $1, $0
 	br_if   	0, $1           # 0: up to label1
 .LBB1_6:                                # %cleanup
 	end_loop
 	end_block                       # label0:
-	copy_local	$push34=, $3
-                                        # fallthrough-return: $pop34
+	copy_local	$push26=, $3
+                                        # fallthrough-return: $pop26
 	.endfunc
 .Lfunc_end1:
 	.size	random_bitstring, .Lfunc_end1-random_bitstring
@@ -106,11 +101,11 @@ random_bitstring:                       # @random_bitstring
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push62=, 0
-	i32.load	$3=, simple_rand.seed($pop62)
-	i32.const	$7=, 0
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$0=, 0
+	i32.const	$push56=, 0
+	i32.load	$3=, simple_rand.seed($pop56)
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
@@ -119,62 +114,57 @@ main:                                   # @main
 	block   	
 	block   	
 	loop    	                # label6:
-	copy_local	$0=, $7
+	i32.const	$push60=, 1103515245
+	i32.mul 	$push2=, $3, $pop60
+	i32.const	$push59=, 12345
+	i32.add 	$3=, $pop2, $pop59
+	i32.const	$push58=, 9
+	i32.shr_u	$push3=, $3, $pop58
+	i32.const	$push57=, 15
+	i32.and 	$2=, $pop3, $pop57
 	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
+	i32.eqz 	$push112=, $2
+	br_if   	0, $pop112      # 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
+	copy_local	$8=, $2
 .LBB2_3:                                # %if.else.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label9:
-	i32.shl 	$1=, $1, $7
+	i32.shl 	$1=, $1, $8
 	block   	
-	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
+	i32.const	$push61=, 256
+	i32.and 	$push4=, $3, $pop61
+	i32.eqz 	$push113=, $pop4
+	br_if   	0, $pop113      # 0: down to label10
+# %bb.4:                                # %if.then1.i
                                         #   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
+	i32.const	$push63=, 1
+	i32.shl 	$push5=, $pop63, $8
+	i32.const	$push62=, -1
+	i32.add 	$push6=, $pop5, $pop62
+	i32.or  	$1=, $1, $pop6
 .LBB2_5:                                # %if.end.i
                                         #   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
+	i32.const	$push64=, 39
+	i32.ge_u	$push7=, $2, $pop64
+	br_if   	2, $pop7        # 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
+	i32.const	$push68=, 1103515245
+	i32.mul 	$push8=, $3, $pop68
+	i32.const	$push67=, 12345
+	i32.add 	$3=, $pop8, $pop67
+	i32.const	$push66=, 9
+	i32.shr_u	$push9=, $3, $pop66
+	i32.const	$push65=, 15
+	i32.and 	$8=, $pop9, $pop65
+	i32.add 	$2=, $8, $2
+	br_if   	0, $8           # 0: up to label9
 	br      	2               # 2: down to label7
 .LBB2_7:                                #   in Loop: Header=BB2_1 Depth=1
 	end_loop
@@ -183,228 +173,207 @@ main:                                   # @main
 .LBB2_8:                                # %random_bitstring.exit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label7:
+	i32.const	$push72=, 1103515245
+	i32.mul 	$push10=, $3, $pop72
+	i32.const	$push71=, 12345
+	i32.add 	$3=, $pop10, $pop71
+	i32.const	$push70=, 9
+	i32.shr_u	$push11=, $3, $pop70
+	i32.const	$push69=, 15
+	i32.and 	$9=, $pop11, $pop69
 	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
+	i32.eqz 	$push114=, $9
+	br_if   	0, $pop114      # 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
+	copy_local	$8=, $9
 .LBB2_10:                               # %if.else.i346
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label12:
-	i32.shl 	$2=, $2, $7
+	i32.shl 	$2=, $2, $8
 	block   	
-	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
+	i32.const	$push73=, 256
+	i32.and 	$push12=, $3, $pop73
+	i32.eqz 	$push115=, $pop12
+	br_if   	0, $pop115      # 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
+	i32.const	$push75=, 1
+	i32.shl 	$push13=, $pop75, $8
+	i32.const	$push74=, -1
+	i32.add 	$push14=, $pop13, $pop74
+	i32.or  	$2=, $2, $pop14
 .LBB2_12:                               # %if.end.i353
                                         #   in Loop: Header=BB2_10 Depth=2
 	end_block                       # label13:
 	block   	
-	i32.const	$push94=, 39
-	i32.ge_u	$push13=, $8, $pop94
-	br_if   	0, $pop13       # 0: down to label14
-# BB#13:                                # %for.cond.i339
+	i32.const	$push76=, 39
+	i32.ge_u	$push15=, $9, $pop76
+	br_if   	0, $pop15       # 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
+	i32.const	$push80=, 1103515245
+	i32.mul 	$push16=, $3, $pop80
+	i32.const	$push79=, 12345
+	i32.add 	$3=, $pop16, $pop79
+	i32.const	$push78=, 9
+	i32.shr_u	$push17=, $3, $pop78
+	i32.const	$push77=, 15
+	i32.and 	$8=, $pop17, $pop77
+	i32.add 	$9=, $8, $9
+	br_if   	1, $8           # 1: up to label12
 .LBB2_14:                               # %random_bitstring.exit355
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label14:
 	end_loop
-	i32.eqz 	$push168=, $2
-	br_if   	0, $pop168      # 0: down to label11
-# BB#15:                                # %cleanup.cont
+	i32.eqz 	$push116=, $2
+	br_if   	0, $pop116      # 0: down to label11
+# %bb.15:                               # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
-	i32.const	$push103=, 2147483647
-	i32.and 	$push16=, $1, $pop103
-	br_if   	0, $pop16       # 0: down to label15
-# BB#16:                                # %cleanup.cont
+	i32.const	$push81=, 2147483647
+	i32.and 	$push18=, $1, $pop81
+	br_if   	0, $pop18       # 0: down to label15
+# %bb.16:                               # %cleanup.cont
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push104=, -1
-	i32.eq  	$push17=, $2, $pop104
-	br_if   	1, $pop17       # 1: down to label11
+	i32.const	$push82=, -1
+	i32.eq  	$push19=, $2, $pop82
+	br_if   	1, $pop19       # 1: down to label11
 .LBB2_17:                               # %if.end25
                                         #   in Loop: Header=BB2_1 Depth=1
 	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
+	i32.const	$push84=, 31
+	i32.shr_s	$8=, $2, $pop84
+	i32.rem_s	$9=, $1, $2
+	i32.const	$push83=, 31
+	i32.shr_s	$4=, $9, $pop83
+	i32.add 	$push22=, $9, $4
+	i32.xor 	$push23=, $pop22, $4
+	i32.add 	$push20=, $2, $8
+	i32.xor 	$push21=, $pop20, $8
+	i32.ge_u	$push24=, $pop23, $pop21
+	br_if   	3, $pop24       # 3: down to label4
+# %bb.18:                               # %cleanup.cont47
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.const	$push85=, 65535
+	i32.and 	$push26=, $2, $pop85
+	i32.eqz 	$push117=, $pop26
+	br_if   	0, $pop117      # 0: down to label11
+# %bb.19:                               # %cleanup.cont86
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.const	$push94=, 16
+	i32.shl 	$4=, $2, $pop94
+	i32.const	$push93=, 16
+	i32.shr_s	$8=, $4, $pop93
+	i32.const	$push92=, 16
+	i32.shl 	$push27=, $1, $pop92
+	i32.const	$push91=, 16
+	i32.shr_s	$9=, $pop27, $pop91
+	i32.div_s	$push0=, $9, $8
+	i32.mul 	$5=, $pop0, $8
+	i32.sub 	$push28=, $9, $5
+	i32.const	$push90=, 16
+	i32.shl 	$6=, $pop28, $pop90
+	i32.const	$push89=, 31
+	i32.shr_s	$7=, $6, $pop89
+	i32.const	$push88=, 16
+	i32.shr_s	$6=, $6, $pop88
+	i32.const	$push87=, 31
+	i32.shr_s	$4=, $4, $pop87
+	i32.add 	$push29=, $6, $7
+	i32.xor 	$push30=, $pop29, $7
+	i32.add 	$push31=, $8, $4
+	i32.xor 	$push32=, $pop31, $4
+	i32.const	$push86=, 65535
+	i32.and 	$push33=, $pop32, $pop86
+	i32.ge_s	$push34=, $pop30, $pop33
 	br_if   	2, $pop34       # 2: down to label5
-# BB#20:                                # %lor.lhs.false125
+# %bb.20:                               # %lor.lhs.false125
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.add 	$push35=, $5, $6
+	i32.const	$push96=, 16
+	i32.shl 	$push36=, $pop35, $pop96
+	i32.const	$push95=, 16
+	i32.shr_s	$push37=, $pop36, $pop95
+	i32.ne  	$push38=, $pop37, $9
+	br_if   	2, $pop38       # 2: down to label5
+# %bb.21:                               # %if.end137
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.const	$push97=, 255
+	i32.and 	$push40=, $2, $pop97
+	i32.eqz 	$push118=, $pop40
+	br_if   	0, $pop118      # 0: down to label11
+# %bb.22:                               # %cleanup.cont177
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.const	$push106=, 24
+	i32.shl 	$9=, $2, $pop106
+	i32.const	$push105=, 24
+	i32.shr_s	$8=, $9, $pop105
+	i32.const	$push104=, 24
+	i32.shl 	$push41=, $1, $pop104
+	i32.const	$push103=, 24
+	i32.shr_s	$2=, $pop41, $pop103
+	i32.div_s	$push1=, $2, $8
+	i32.mul 	$1=, $pop1, $8
+	i32.sub 	$push42=, $2, $1
+	i32.const	$push102=, 24
+	i32.shl 	$4=, $pop42, $pop102
+	i32.const	$push101=, 31
+	i32.shr_s	$5=, $4, $pop101
+	i32.const	$push100=, 24
+	i32.shr_s	$4=, $4, $pop100
+	i32.const	$push99=, 31
+	i32.shr_s	$9=, $9, $pop99
+	i32.add 	$push43=, $4, $5
+	i32.xor 	$push44=, $pop43, $5
+	i32.add 	$push45=, $8, $9
+	i32.xor 	$push46=, $pop45, $9
+	i32.const	$push98=, 255
+	i32.and 	$push47=, $pop46, $pop98
+	i32.ge_s	$push48=, $pop44, $pop47
+	br_if   	4, $pop48       # 4: down to label3
+# %bb.23:                               # %lor.lhs.false216
                                         #   in Loop: Header=BB2_1 Depth=1
-	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
+	i32.add 	$push49=, $1, $4
+	i32.const	$push108=, 24
+	i32.shl 	$push50=, $pop49, $pop108
+	i32.const	$push107=, 24
+	i32.shr_s	$push51=, $pop50, $pop107
+	i32.ne  	$push52=, $pop51, $2
+	br_if   	4, $pop52       # 4: down to label3
 .LBB2_24:                               # %cleanup229
                                         #   in Loop: Header=BB2_1 Depth=1
 	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
+	i32.const	$push110=, 1
+	i32.add 	$0=, $0, $pop110
+	i32.const	$push109=, 1000
+	i32.lt_u	$push54=, $0, $pop109
+	br_if   	0, $pop54       # 0: up to label6
+# %bb.25:                               # %for.end
 	end_loop
-	i32.const	$push61=, 0
-	i32.store	simple_rand.seed($pop61), $3
-	i32.const	$push163=, 0
-	call    	exit@FUNCTION, $pop163
+	i32.const	$push55=, 0
+	i32.store	simple_rand.seed($pop55), $3
+	i32.const	$push111=, 0
+	call    	exit@FUNCTION, $pop111
 	unreachable
 .LBB2_26:                               # %if.then136
 	end_block                       # label5:
-	i32.const	$push41=, 0
-	i32.store	simple_rand.seed($pop41), $3
+	i32.const	$push39=, 0
+	i32.store	simple_rand.seed($pop39), $3
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_27:                               # %if.then40
 	end_block                       # label4:
-	i32.const	$push23=, 0
-	i32.store	simple_rand.seed($pop23), $3
+	i32.const	$push25=, 0
+	i32.store	simple_rand.seed($pop25), $3
 	call    	abort@FUNCTION
 	unreachable
 .LBB2_28:                               # %if.then227
 	end_block                       # label3:
-	i32.const	$push59=, 0
-	i32.store	simple_rand.seed($pop59), $3
+	i32.const	$push53=, 0
+	i32.store	simple_rand.seed($pop53), $3
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -419,6 +388,6 @@ simple_rand.seed:
 	.size	simple_rand.seed, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2a06d40b8..9b0e47909 100644
--- a/test/torture-s/ashldi-1.c.s
+++ b/test/torture-s/ashldi-1.c.s
@@ -6,59 +6,58 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i64
-# BB#0:                                 # %entry
-	i64.const	$3=, -1
+	.local  	i32, i32, i64
+# %bb.0:                                # %entry
+	i64.const	$2=, 0
 	i32.const	$1=, .Lswitch.table.main
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	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
+	i64.const	$push8=, 81985529216486895
+	i64.shl 	$push0=, $pop8, $2
+	i64.load	$push1=, 0($1)
+	i64.ne  	$push2=, $pop0, $pop1
+	br_if   	1, $pop2        # 1: down to label0
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i64.const	$push11=, 1
+	i64.add 	$2=, $2, $pop11
+	i32.const	$push10=, 8
+	i32.add 	$1=, $1, $pop10
+	i64.const	$push9=, 64
+	i64.lt_u	$push3=, $2, $pop9
+	br_if   	0, $pop3        # 0: up to label1
+# %bb.3:                                # %for.body4.preheader
 	end_loop
 	i32.const	$1=, 0
 	i32.const	$0=, .Lswitch.table.main
 .LBB0_4:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push13=, 64
-	i32.ge_u	$push5=, $1, $pop13
+	i32.const	$push13=, 2147483647
+	i32.and 	$push4=, $1, $pop13
+	i32.const	$push12=, 64
+	i32.ge_u	$push5=, $pop4, $pop12
 	br_if   	1, $pop5        # 1: down to label0
-# BB#5:                                 # %switch.lookup
+# %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
+# %bb.6:                                # %for.cond2
                                         #   in Loop: Header=BB0_4 Depth=1
-	i32.const	$push17=, 8
-	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
+	i32.const	$push17=, 1
+	i32.add 	$1=, $1, $pop17
+	i32.const	$push16=, 8
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, 63
+	i32.le_u	$push6=, $1, $pop15
+	br_if   	0, $pop6        # 0: up to label2
+# %bb.7:                                # %for.end13
 	end_loop
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
 .LBB0_8:                                # %if.then
 	end_block                       # label0:
@@ -139,6 +138,6 @@ main:                                   # @main
 	.size	.Lswitch.table.main, 512
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c73b45997..6c0ad9c47 100644
--- a/test/torture-s/ashrdi-1.c.s
+++ b/test/torture-s/ashrdi-1.c.s
@@ -7,95 +7,91 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32, i32
-# BB#0:                                 # %entry
-	i64.const	$0=, -1
+# %bb.0:                                # %entry
+	i64.const	$0=, 0
 	i32.const	$2=, zext
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	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.const	$push17=, 8526495107234113920
+	i64.shr_u	$push0=, $pop17, $0
 	i64.load	$push1=, 0($2)
 	i64.ne  	$push2=, $pop0, $pop1
 	br_if   	1, $pop2        # 1: down to label0
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push22=, 8
-	i32.add 	$2=, $2, $pop22
-	i64.const	$push21=, 63
-	i64.lt_u	$push3=, $0, $pop21
+	i64.const	$push20=, 1
+	i64.add 	$0=, $0, $pop20
+	i32.const	$push19=, 8
+	i32.add 	$2=, $2, $pop19
+	i64.const	$push18=, 64
+	i64.lt_u	$push3=, $0, $pop18
 	br_if   	0, $pop3        # 0: up to label1
-# BB#3:                                 # %for.body4.preheader
+# %bb.3:                                # %for.body4.preheader
 	end_loop
-	i64.const	$0=, -1
+	i64.const	$0=, 0
 	i32.const	$2=, sext
 .LBB0_4:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	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.const	$push21=, -8152436031399644656
+	i64.shr_s	$push4=, $pop21, $0
 	i64.load	$push5=, 0($2)
 	i64.ne  	$push6=, $pop4, $pop5
 	br_if   	1, $pop6        # 1: down to label0
-# BB#5:                                 # %for.cond2
+# %bb.5:                                # %for.cond2
                                         #   in Loop: Header=BB0_4 Depth=1
-	i32.const	$push28=, 8
-	i32.add 	$2=, $2, $pop28
-	i64.const	$push27=, 63
-	i64.lt_u	$push7=, $0, $pop27
+	i64.const	$push24=, 1
+	i64.add 	$0=, $0, $pop24
+	i32.const	$push23=, 8
+	i32.add 	$2=, $2, $pop23
+	i64.const	$push22=, 64
+	i64.lt_u	$push7=, $0, $pop22
 	br_if   	0, $pop7        # 0: up to label2
-# BB#6:                                 # %for.body16.preheader
+# %bb.6:                                # %for.body16.preheader
 	end_loop
-	i32.const	$2=, -1
+	i32.const	$2=, 0
 	i32.const	$1=, zext
 .LBB0_7:                                # %for.body16
                                         # =>This Inner Loop Header: Depth=1
 	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.const	$push25=, 8526495107234113920
+	i64.call	$push8=, constant_shift@FUNCTION, $pop25, $2
 	i64.load	$push9=, 0($1)
 	i64.ne  	$push10=, $pop8, $pop9
 	br_if   	1, $pop10       # 1: down to label0
-# BB#8:                                 # %for.cond14
+# %bb.8:                                # %for.cond14
                                         #   in Loop: Header=BB0_7 Depth=1
-	i32.const	$push34=, 8
-	i32.add 	$1=, $1, $pop34
-	i32.const	$push33=, 63
-	i32.lt_u	$push11=, $2, $pop33
+	i32.const	$push28=, 1
+	i32.add 	$2=, $2, $pop28
+	i32.const	$push27=, 8
+	i32.add 	$1=, $1, $pop27
+	i32.const	$push26=, 64
+	i32.lt_u	$push11=, $2, $pop26
 	br_if   	0, $pop11       # 0: up to label3
-# BB#9:                                 # %for.body28.preheader
+# %bb.9:                                # %for.body28.preheader
 	end_loop
-	i32.const	$2=, -1
+	i32.const	$2=, 0
 	i32.const	$1=, sext
 .LBB0_10:                               # %for.body28
                                         # =>This Inner Loop Header: Depth=1
 	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.const	$push29=, -8152436031399644656
+	i64.call	$push12=, constant_shift@FUNCTION, $pop29, $2
 	i64.load	$push13=, 0($1)
 	i64.ne  	$push14=, $pop12, $pop13
 	br_if   	1, $pop14       # 1: down to label0
-# BB#11:                                # %for.cond26
+# %bb.11:                               # %for.cond26
                                         #   in Loop: Header=BB0_10 Depth=1
-	i32.const	$push40=, 8
-	i32.add 	$1=, $1, $pop40
-	i32.const	$push39=, 62
-	i32.le_u	$push15=, $2, $pop39
+	i32.const	$push32=, 1
+	i32.add 	$2=, $2, $pop32
+	i32.const	$push31=, 8
+	i32.add 	$1=, $1, $pop31
+	i32.const	$push30=, 63
+	i32.le_u	$push15=, $2, $pop30
 	br_if   	0, $pop15       # 0: up to label4
-# BB#12:                                # %for.end37
+# %bb.12:                               # %for.end37
 	end_loop
 	i32.const	$push16=, 0
 	call    	exit@FUNCTION, $pop16
@@ -113,12 +109,12 @@ main:                                   # @main
 constant_shift:                         # @constant_shift
 	.param  	i64, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 63
 	i32.gt_u	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label5
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -713,6 +709,6 @@ sext:
 	.size	sext, 512
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ee2eb4cb0..54fe1f234 100644
--- a/test/torture-s/bcp-1.c.s
+++ b/test/torture-s/bcp-1.c.s
@@ -6,7 +6,7 @@
 	.type	bad0,@function
 bad0:                                   # @bad0
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ bad0:                                   # @bad0
 	.type	bad1,@function
 bad1:                                   # @bad1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,7 +33,7 @@ bad1:                                   # @bad1
 bad2:                                   # @bad2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -47,7 +47,7 @@ bad2:                                   # @bad2
 bad3:                                   # @bad3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -61,7 +61,7 @@ bad3:                                   # @bad3
 bad4:                                   # @bad4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -74,7 +74,7 @@ bad4:                                   # @bad4
 	.type	bad5,@function
 bad5:                                   # @bad5
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -88,7 +88,7 @@ bad5:                                   # @bad5
 bad6:                                   # @bad6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -101,7 +101,7 @@ bad6:                                   # @bad6
 	.type	bad7,@function
 bad7:                                   # @bad7
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -114,7 +114,7 @@ bad7:                                   # @bad7
 	.type	bad8,@function
 bad8:                                   # @bad8
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -128,7 +128,7 @@ bad8:                                   # @bad8
 bad9:                                   # @bad9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -141,7 +141,7 @@ bad9:                                   # @bad9
 	.type	bad10,@function
 bad10:                                  # @bad10
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -154,7 +154,7 @@ bad10:                                  # @bad10
 	.type	good0,@function
 good0:                                  # @good0
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -167,7 +167,7 @@ good0:                                  # @good0
 	.type	good1,@function
 good1:                                  # @good1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -180,7 +180,7 @@ good1:                                  # @good1
 	.type	good2,@function
 good2:                                  # @good2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -193,7 +193,7 @@ good2:                                  # @good2
 	.type	opt0,@function
 opt0:                                   # @opt0
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -206,7 +206,7 @@ opt0:                                   # @opt0
 	.type	opt1,@function
 opt1:                                   # @opt1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -219,7 +219,7 @@ opt1:                                   # @opt1
 	.type	opt2,@function
 opt2:                                   # @opt2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -232,99 +232,99 @@ opt2:                                   # @opt2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push35=, 0
 	i32.load	$push0=, bad_t0($pop35)
 	i32.call_indirect	$push1=, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %for.cond
+# %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 label1
-# BB#2:                                 # %for.cond.1
+# %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 label1
-# BB#3:                                 # %for.cond.2
+# %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 label1
-# BB#4:                                 # %for.cond.3
+# %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 label1
-# BB#5:                                 # %for.cond.4
+# %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 label1
-# BB#6:                                 # %for.cond.5
+# %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   	0, $pop13       # 0: down to label1
-# BB#7:                                 # %for.cond1
+# %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   	0, $pop15       # 0: down to label1
-# BB#8:                                 # %for.cond1.1
+# %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   	0, $pop18       # 0: down to label1
-# BB#9:                                 # %for.cond1.2
+# %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   	0, $pop20       # 0: down to label1
-# BB#10:                                # %for.cond12
+# %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   	0, $pop22       # 0: down to label1
-# BB#11:                                # %for.cond12.1
+# %bb.11:                               # %for.cond12.1
 	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 label1
-# BB#12:                                # %for.cond23
+# %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 label1
-# BB#13:                                # %for.cond23.1
+# %bb.13:                               # %for.cond23.1
 	i32.const	$push52=, 0
 	i32.load	$push27=, good_t0+8($pop52)
 	i32.call_indirect	$push28=, $pop27
 	i32.eqz 	$push59=, $pop28
 	br_if   	0, $pop59       # 0: down to label1
-# BB#14:                                # %for.cond23.2
+# %bb.14:                               # %for.cond23.2
 	i32.const	$push53=, 0
 	i32.load	$push29=, opt_t0($pop53)
 	i32.call_indirect	$push30=, $pop29
 	i32.eqz 	$push60=, $pop30
 	br_if   	0, $pop60       # 0: down to label1
-# BB#15:                                # %for.cond34
+# %bb.15:                               # %for.cond34
 	i32.const	$push54=, 0
 	i32.load	$push31=, opt_t0+4($pop54)
 	i32.call_indirect	$push32=, $pop31
 	i32.eqz 	$push61=, $pop32
 	br_if   	0, $pop61       # 0: down to label1
-# BB#16:                                # %for.cond34.1
+# %bb.16:                               # %for.cond34.1
 	i32.const	$push55=, 0
 	i32.load	$push33=, opt_t0+8($pop55)
 	i32.call_indirect	$push34=, $pop33
@@ -415,6 +415,6 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b512aabe7..ba482ee79 100644
--- a/test/torture-s/bf-layout-1.c.s
+++ b/test/torture-s/bf-layout-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 43e06711b..3c1904805 100644
--- a/test/torture-s/bf-pack-1.c.s
+++ b/test/torture-s/bf-pack-1.c.s
@@ -8,22 +8,21 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i64.load	$1=, 0($0):p2align=2
 	block   	
-	i64.load	$push9=, 0($0):p2align=2
-	tee_local	$push8=, $1=, $pop9
 	i64.const	$push0=, 65535
-	i64.and 	$push1=, $pop8, $pop0
+	i64.and 	$push1=, $1, $pop0
 	i64.const	$push2=, 4660
 	i64.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.const	$push4=, 281474976645120
 	i64.and 	$push5=, $1, $pop4
 	i64.const	$push6=, 95075992076288
 	i64.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	return  	$0
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -40,14 +39,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	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
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i64.const	$push0=, 95075992080948
 	i64.store	8($0), $pop0
 	i32.const	$push6=, 8
@@ -61,6 +59,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c8bb0dc38..f31d46c24 100644
--- a/test/torture-s/bf-sign-1.c.s
+++ b/test/torture-s/bf-sign-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7f9b678b8..c7b26b659 100644
--- a/test/torture-s/bf-sign-2.c.s
+++ b/test/torture-s/bf-sign-2.c.s
@@ -7,50 +7,49 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.const	$push21=, 0
-	i32.load8_u	$push0=, x($pop21)
+	i32.const	$push20=, 0
+	i32.load8_u	$push0=, x($pop20)
 	i32.const	$push1=, 6
 	i32.and 	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push22=, 0
-	i32.load	$push3=, x+4($pop22)
+# %bb.1:                                # %if.end
+	i32.const	$push21=, 0
+	i32.load	$push3=, x+4($pop21)
 	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	$push25=, 0
-	i64.load	$push24=, x+8($pop25)
-	tee_local	$push23=, $0=, $pop24
-	i32.wrap/i64	$push8=, $pop23
+# %bb.2:                                # %if.end5
+	i32.const	$push22=, 0
+	i64.load	$0=, x+8($pop22)
+	i32.wrap/i64	$push8=, $0
 	i32.const	$push9=, 2
 	i32.ge_s	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %if.end13
-	i32.const	$push26=, 0
-	i32.load	$push11=, x+28($pop26)
+# %bb.3:                                # %if.end13
+	i32.const	$push23=, 0
+	i32.load	$push11=, x+28($pop23)
 	i32.const	$push12=, 262128
 	i32.and 	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#4:                                 # %if.end20
+# %bb.4:                                # %if.end20
 	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	$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
+	i64.eqz 	$push16=, $pop15
+	i32.eqz 	$push26=, $pop16
+	br_if   	0, $pop26       # 0: down to label0
+# %bb.5:                                # %if.end35
+	i32.const	$push24=, 0
+	i32.load8_u	$push17=, x+20($pop24)
+	i32.const	$push18=, 6
+	i32.and 	$push19=, $pop17, $pop18
+	br_if   	0, $pop19       # 0: down to label0
+# %bb.6:                                # %if.end50
+	i32.const	$push25=, 0
+	call    	exit@FUNCTION, $pop25
 	unreachable
 .LBB0_7:                                # %if.then
 	end_block                       # label0:
@@ -70,6 +69,6 @@ x:
 	.size	x, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a1bace9f9..c01f3ca0c 100644
--- a/test/torture-s/bf64-1.c.s
+++ b/test/torture-s/bf64-1.c.s
@@ -6,7 +6,7 @@
 	.type	sub,@function
 sub:                                    # @sub
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, -8690468286197432320
 	i64.or  	$push2=, $pop0, $pop1
@@ -22,7 +22,7 @@ sub:                                    # @sub
 	.type	sub2,@function
 sub2:                                   # @sub2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.const	$push1=, 2381903268435576
 	i64.or  	$push2=, $pop0, $pop1
@@ -38,7 +38,7 @@ sub2:                                   # @sub2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end21
+# %bb.0:                                # %if.end21
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -47,5 +47,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/bitfld-1.c.s b/test/torture-s/bitfld-1.c.s
index 36b603bdc..980e24ceb 100644
--- a/test/torture-s/bitfld-1.c.s
+++ b/test/torture-s/bitfld-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -15,4 +15,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/bitfld-2.c.s b/test/torture-s/bitfld-2.c.s
index 6b44e4721..f47317f47 100644
--- a/test/torture-s/bitfld-2.c.s
+++ b/test/torture-s/bitfld-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/bitfld-3.c.s b/test/torture-s/bitfld-3.c.s
index 1dfc055e2..691cd8588 100644
--- a/test/torture-s/bitfld-3.c.s
+++ b/test/torture-s/bitfld-3.c.s
@@ -7,24 +7,22 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push12=, 0
-	i64.load	$push0=, a($pop12)
+# %bb.0:                                # %entry
+	i32.const	$push10=, 0
+	i64.load	$push0=, a($pop10)
 	i64.const	$push1=, 8589934591
-	i64.and 	$push11=, $pop0, $pop1
-	tee_local	$push10=, $0=, $pop11
-	i64.mul 	$push2=, $pop10, $0
+	i64.and 	$0=, $pop0, $pop1
+	block   	
+	i64.mul 	$push2=, $0, $0
 	i64.const	$push3=, 0
 	i64.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push15=, 0
-	i64.load	$push5=, a+8($pop15)
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push11=, 0
+	i64.load	$push5=, a+8($pop11)
 	i64.const	$push6=, 1099511627775
-	i64.and 	$push14=, $pop5, $pop6
-	tee_local	$push13=, $1=, $pop14
-	i64.mul 	$push7=, $pop13, $0
+	i64.and 	$1=, $pop5, $pop6
+	i64.mul 	$push7=, $1, $0
 	i64.mul 	$push8=, $1, $1
 	i64.or  	$push9=, $pop7, $pop8
 	i64.eqz 	$drop=, $pop9
@@ -118,5 +116,5 @@ c:
 	.size	c, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/bitfld-4.c.s b/test/torture-s/bitfld-4.c.s
index 8d0bd3e7d..a8ad02629 100644
--- a/test/torture-s/bitfld-4.c.s
+++ b/test/torture-s/bitfld-4.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, x($pop3)
 	i32.const	$push1=, -1863803
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -37,5 +37,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/bitfld-5.c.s b/test/torture-s/bitfld-5.c.s
index ba1d043d1..6628e2bf5 100644
--- a/test/torture-s/bitfld-5.c.s
+++ b/test/torture-s/bitfld-5.c.s
@@ -6,13 +6,13 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i64, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	block   	
 	i64.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	i64.load	$push0=, 0($0)
@@ -49,14 +49,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push17=, $pop5, $pop7
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop8), $pop16
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.s($pop0)
 	i64.store	8($0), $pop1
@@ -107,5 +106,5 @@ main:                                   # @main
 	.size	.Lmain.t, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/bitfld-6.c.s b/test/torture-s/bitfld-6.c.s
index 109ff6a16..e9b6d38d0 100644
--- a/test/torture-s/bitfld-6.c.s
+++ b/test/torture-s/bitfld-6.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/bswap-1.c.s b/test/torture-s/bswap-1.c.s
index 129241950..d032a0a34 100644
--- a/test/torture-s/bswap-1.c.s
+++ b/test/torture-s/bswap-1.c.s
@@ -7,7 +7,7 @@
 g:                                      # @g
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 56
 	i64.shl 	$push24=, $0, $pop0
 	i64.const	$push2=, 40
@@ -55,7 +55,7 @@ g:                                      # @g
 f:                                      # @f
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 56
 	i64.shl 	$push24=, $0, $pop0
 	i64.const	$push2=, 40
@@ -102,56 +102,56 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 18
 	i64.call	$push1=, g@FUNCTION, $pop0
 	i64.const	$push2=, 1297036692682702848
 	i64.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.const	$push4=, 4660
 	i64.call	$push5=, g@FUNCTION, $pop4
 	i64.const	$push6=, 3752061439553044480
 	i64.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i64.const	$push8=, 1193046
 	i64.call	$push9=, g@FUNCTION, $pop8
 	i64.const	$push10=, 6211609577260056576
 	i64.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i64.const	$push12=, 305419896
 	i64.call	$push13=, g@FUNCTION, $pop12
 	i64.const	$push14=, 8671175384462524416
 	i64.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i64.const	$push16=, 78187493520
 	i64.call	$push17=, g@FUNCTION, $pop16
 	i64.const	$push18=, -8036578753402372096
 	i64.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#5:                                 # %if.end21
+# %bb.5:                                # %if.end21
 	i64.const	$push20=, 20015998341138
 	i64.call	$push21=, g@FUNCTION, $pop20
 	i64.const	$push22=, 1337701400965152768
 	i64.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#6:                                 # %if.end26
+# %bb.6:                                # %if.end26
 	i64.const	$push24=, 5124095575331380
 	i64.call	$push25=, g@FUNCTION, $pop24
 	i64.const	$push26=, 3752220286069772800
 	i64.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#7:                                 # %if.end31
+# %bb.7:                                # %if.end31
 	i64.const	$push28=, 1311768467284833366
 	i64.call	$push29=, g@FUNCTION, $pop28
 	i64.const	$push30=, 6211610197754262546
 	i64.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#8:                                 # %if.end36
+# %bb.8:                                # %if.end36
 	i32.const	$push32=, 0
 	return  	$pop32
 .LBB2_9:                                # %if.then
@@ -163,5 +163,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/builtin-bitops-1.c.s b/test/torture-s/builtin-bitops-1.c.s
index 622bfca14..404a4f159 100644
--- a/test/torture-s/builtin-bitops-1.c.s
+++ b/test/torture-s/builtin-bitops-1.c.s
@@ -8,11 +8,11 @@ my_ffs:                                 # @my_ffs
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push11=, $0
-	br_if   	0, $pop11       # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push9=, $0
+	br_if   	0, $pop9        # 0: down to label0
+# %bb.1:                                # %for.body.preheader
 	i32.const	$1=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -22,13 +22,12 @@ my_ffs:                                 # @my_ffs
 	i32.shl 	$push0=, $pop6, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label1
-# BB#3:                                 # %for.inc
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push10=, 1
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$1=, $1, $pop8
 	i32.const	$push7=, 32
-	i32.lt_u	$push2=, $pop8, $pop7
+	i32.lt_u	$push2=, $1, $pop7
 	br_if   	0, $pop2        # 0: up to label2
 .LBB0_4:                                # %for.end
 	end_loop
@@ -52,7 +51,7 @@ my_ctz:                                 # @my_ctz
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -62,18 +61,17 @@ my_ctz:                                 # @my_ctz
 	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label3
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $1, $pop8
-	tee_local	$push6=, $1=, $pop7
+	i32.const	$push6=, 1
+	i32.add 	$1=, $1, $pop6
 	i32.const	$push5=, 32
-	i32.lt_u	$push2=, $pop6, $pop5
+	i32.lt_u	$push2=, $1, $pop5
 	br_if   	0, $pop2        # 0: up to label4
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
-	i32.const	$push9=, 32
-	return  	$pop9
+	i32.const	$push7=, 32
+	return  	$pop7
 .LBB1_4:
 	end_block                       # label3:
 	copy_local	$push3=, $1
@@ -90,7 +88,7 @@ my_clz:                                 # @my_clz
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i32.const	$1=, 31
 .LBB2_1:                                # %for.body
@@ -101,20 +99,19 @@ my_clz:                                 # @my_clz
 	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label5
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB2_1 Depth=1
-	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	$push7=, -1
+	i32.add 	$1=, $1, $pop7
+	i32.const	$push6=, 1
+	i32.add 	$2=, $2, $pop6
 	i32.const	$push5=, 32
-	i32.lt_u	$push2=, $pop6, $pop5
+	i32.lt_u	$push2=, $2, $pop5
 	br_if   	0, $pop2        # 0: up to label6
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
-	i32.const	$push10=, 32
-	return  	$pop10
+	i32.const	$push8=, 32
+	return  	$pop8
 .LBB2_4:
 	end_block                       # label5:
 	copy_local	$push3=, $2
@@ -131,7 +128,7 @@ my_clrsb:                               # @my_clrsb
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$1=, $0, $pop0
 	i32.const	$2=, 30
@@ -146,16 +143,15 @@ my_clrsb:                               # @my_clrsb
 	i32.and 	$push2=, $pop1, $pop7
 	i32.ne  	$push3=, $pop2, $1
 	br_if   	1, $pop3        # 1: down to label8
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB3_1 Depth=1
-	i32.const	$push12=, -1
-	i32.add 	$2=, $2, $pop12
+	i32.const	$push10=, -1
+	i32.add 	$2=, $2, $pop10
+	i32.const	$push9=, 1
+	i32.add 	$3=, $3, $pop9
 	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
+	i32.lt_u	$push4=, $3, $pop8
 	br_if   	0, $pop4        # 0: up to label9
 	br      	2               # 2: down to label7
 .LBB3_3:
@@ -179,28 +175,27 @@ my_popcount:                            # @my_popcount
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	i32.const	$2=, 0
 .LBB4_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label10:
-	i32.const	$push9=, 1
-	i32.shl 	$push0=, $pop9, $2
+	i32.const	$push7=, 1
+	i32.shl 	$push0=, $pop7, $2
 	i32.and 	$push1=, $pop0, $0
-	i32.const	$push8=, 0
-	i32.ne  	$push2=, $pop1, $pop8
+	i32.const	$push6=, 0
+	i32.ne  	$push2=, $pop1, $pop6
 	i32.add 	$1=, $1, $pop2
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $2, $pop7
-	tee_local	$push5=, $2=, $pop6
+	i32.const	$push5=, 1
+	i32.add 	$2=, $2, $pop5
 	i32.const	$push4=, 32
-	i32.ne  	$push3=, $pop5, $pop4
+	i32.ne  	$push3=, $2, $pop4
 	br_if   	0, $pop3        # 0: up to label10
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	copy_local	$push10=, $1
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $1
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end4:
 	.size	my_popcount, .Lfunc_end4-my_popcount
@@ -213,25 +208,24 @@ my_parity:                              # @my_parity
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	i32.const	$2=, 0
 .LBB5_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label11:
-	i32.const	$push11=, 1
-	i32.shl 	$push0=, $pop11, $2
+	i32.const	$push9=, 1
+	i32.shl 	$push0=, $pop9, $2
 	i32.and 	$push1=, $pop0, $0
-	i32.const	$push10=, 0
-	i32.ne  	$push2=, $pop1, $pop10
+	i32.const	$push8=, 0
+	i32.ne  	$push2=, $pop1, $pop8
 	i32.add 	$1=, $1, $pop2
-	i32.const	$push9=, 1
-	i32.add 	$push8=, $2, $pop9
-	tee_local	$push7=, $2=, $pop8
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
 	i32.const	$push6=, 32
-	i32.ne  	$push3=, $pop7, $pop6
+	i32.ne  	$push3=, $2, $pop6
 	br_if   	0, $pop3        # 0: up to label11
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push4=, 1
 	i32.and 	$push5=, $1, $pop4
@@ -248,11 +242,11 @@ my_ffsl:                                # @my_ffsl
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push11=, $0
-	br_if   	0, $pop11       # 0: down to label12
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push9=, $0
+	br_if   	0, $pop9        # 0: down to label12
+# %bb.1:                                # %for.body.preheader
 	i32.const	$1=, 0
 .LBB6_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -262,13 +256,12 @@ my_ffsl:                                # @my_ffsl
 	i32.shl 	$push0=, $pop6, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label13
-# BB#3:                                 # %for.inc
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB6_2 Depth=1
-	i32.const	$push10=, 1
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$1=, $1, $pop8
 	i32.const	$push7=, 32
-	i32.lt_u	$push2=, $pop8, $pop7
+	i32.lt_u	$push2=, $1, $pop7
 	br_if   	0, $pop2        # 0: up to label14
 .LBB6_4:                                # %for.end
 	end_loop
@@ -292,7 +285,7 @@ my_ctzl:                                # @my_ctzl
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 .LBB7_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -302,18 +295,17 @@ my_ctzl:                                # @my_ctzl
 	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label15
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB7_1 Depth=1
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $1, $pop8
-	tee_local	$push6=, $1=, $pop7
+	i32.const	$push6=, 1
+	i32.add 	$1=, $1, $pop6
 	i32.const	$push5=, 32
-	i32.lt_u	$push2=, $pop6, $pop5
+	i32.lt_u	$push2=, $1, $pop5
 	br_if   	0, $pop2        # 0: up to label16
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
-	i32.const	$push9=, 32
-	return  	$pop9
+	i32.const	$push7=, 32
+	return  	$pop7
 .LBB7_4:
 	end_block                       # label15:
 	copy_local	$push3=, $1
@@ -330,7 +322,7 @@ my_clzl:                                # @my_clzl
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i32.const	$1=, 31
 .LBB8_1:                                # %for.body
@@ -341,20 +333,19 @@ my_clzl:                                # @my_clzl
 	i32.shl 	$push0=, $pop4, $1
 	i32.and 	$push1=, $pop0, $0
 	br_if   	1, $pop1        # 1: down to label17
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB8_1 Depth=1
-	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	$push7=, -1
+	i32.add 	$1=, $1, $pop7
+	i32.const	$push6=, 1
+	i32.add 	$2=, $2, $pop6
 	i32.const	$push5=, 32
-	i32.lt_u	$push2=, $pop6, $pop5
+	i32.lt_u	$push2=, $2, $pop5
 	br_if   	0, $pop2        # 0: up to label18
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
-	i32.const	$push10=, 32
-	return  	$pop10
+	i32.const	$push8=, 32
+	return  	$pop8
 .LBB8_4:
 	end_block                       # label17:
 	copy_local	$push3=, $2
@@ -371,7 +362,7 @@ my_clrsbl:                              # @my_clrsbl
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_u	$1=, $0, $pop0
 	i32.const	$2=, 30
@@ -386,16 +377,15 @@ my_clrsbl:                              # @my_clrsbl
 	i32.and 	$push2=, $pop1, $pop7
 	i32.ne  	$push3=, $pop2, $1
 	br_if   	1, $pop3        # 1: down to label20
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB9_1 Depth=1
-	i32.const	$push12=, -1
-	i32.add 	$2=, $2, $pop12
+	i32.const	$push10=, -1
+	i32.add 	$2=, $2, $pop10
+	i32.const	$push9=, 1
+	i32.add 	$3=, $3, $pop9
 	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
+	i32.lt_u	$push4=, $3, $pop8
 	br_if   	0, $pop4        # 0: up to label21
 	br      	2               # 2: down to label19
 .LBB9_3:
@@ -419,28 +409,27 @@ my_popcountl:                           # @my_popcountl
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	i32.const	$2=, 0
 .LBB10_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label22:
-	i32.const	$push9=, 1
-	i32.shl 	$push0=, $pop9, $2
+	i32.const	$push7=, 1
+	i32.shl 	$push0=, $pop7, $2
 	i32.and 	$push1=, $pop0, $0
-	i32.const	$push8=, 0
-	i32.ne  	$push2=, $pop1, $pop8
+	i32.const	$push6=, 0
+	i32.ne  	$push2=, $pop1, $pop6
 	i32.add 	$1=, $1, $pop2
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $2, $pop7
-	tee_local	$push5=, $2=, $pop6
+	i32.const	$push5=, 1
+	i32.add 	$2=, $2, $pop5
 	i32.const	$push4=, 32
-	i32.ne  	$push3=, $pop5, $pop4
+	i32.ne  	$push3=, $2, $pop4
 	br_if   	0, $pop3        # 0: up to label22
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	copy_local	$push10=, $1
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $1
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end10:
 	.size	my_popcountl, .Lfunc_end10-my_popcountl
@@ -453,25 +442,24 @@ my_parityl:                             # @my_parityl
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	i32.const	$2=, 0
 .LBB11_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label23:
-	i32.const	$push11=, 1
-	i32.shl 	$push0=, $pop11, $2
+	i32.const	$push9=, 1
+	i32.shl 	$push0=, $pop9, $2
 	i32.and 	$push1=, $pop0, $0
-	i32.const	$push10=, 0
-	i32.ne  	$push2=, $pop1, $pop10
+	i32.const	$push8=, 0
+	i32.ne  	$push2=, $pop1, $pop8
 	i32.add 	$1=, $1, $pop2
-	i32.const	$push9=, 1
-	i32.add 	$push8=, $2, $pop9
-	tee_local	$push7=, $2=, $pop8
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
 	i32.const	$push6=, 32
-	i32.ne  	$push3=, $pop7, $pop6
+	i32.ne  	$push3=, $2, $pop6
 	br_if   	0, $pop3        # 0: up to label23
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push4=, 1
 	i32.and 	$push5=, $1, $pop4
@@ -488,11 +476,11 @@ my_ffsll:                               # @my_ffsll
 	.param  	i64
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.eqz 	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label24
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 0
 	i64.const	$1=, 0
 .LBB12_2:                               # %for.body
@@ -505,15 +493,14 @@ my_ffsll:                               # @my_ffsll
 	i64.const	$push8=, 0
 	i64.ne  	$push3=, $pop2, $pop8
 	br_if   	1, $pop3        # 1: down to label25
-# BB#3:                                 # %for.inc
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB12_2 Depth=1
-	i32.const	$push14=, 1
-	i32.add 	$2=, $2, $pop14
-	i64.const	$push13=, 1
-	i64.add 	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
+	i32.const	$push12=, 1
+	i32.add 	$2=, $2, $pop12
+	i64.const	$push11=, 1
+	i64.add 	$1=, $1, $pop11
 	i64.const	$push10=, 64
-	i64.lt_u	$push4=, $pop11, $pop10
+	i64.lt_u	$push4=, $1, $pop10
 	br_if   	0, $pop4        # 0: up to label26
 .LBB12_4:                               # %for.end
 	end_loop
@@ -537,7 +524,7 @@ my_ctzll:                               # @my_ctzll
 	.param  	i64
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i64.const	$1=, 0
 .LBB13_1:                               # %for.body
@@ -550,21 +537,20 @@ my_ctzll:                               # @my_ctzll
 	i64.const	$push4=, 0
 	i64.ne  	$push2=, $pop1, $pop4
 	br_if   	1, $pop2        # 1: down to label27
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB13_1 Depth=1
-	i32.const	$push10=, 1
-	i32.add 	$2=, $2, $pop10
-	i64.const	$push9=, 1
-	i64.add 	$push8=, $1, $pop9
-	tee_local	$push7=, $1=, $pop8
+	i32.const	$push8=, 1
+	i32.add 	$2=, $2, $pop8
+	i64.const	$push7=, 1
+	i64.add 	$1=, $1, $pop7
 	i64.const	$push6=, 64
-	i64.lt_u	$push3=, $pop7, $pop6
+	i64.lt_u	$push3=, $1, $pop6
 	br_if   	0, $pop3        # 0: up to label28
 .LBB13_3:                               # %for.end
 	end_loop
 	end_block                       # label27:
-	copy_local	$push11=, $2
-                                        # fallthrough-return: $pop11
+	copy_local	$push9=, $2
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end13:
 	.size	my_ctzll, .Lfunc_end13-my_ctzll
@@ -577,7 +563,7 @@ my_clzll:                               # @my_clzll
 	.param  	i64
 	.result 	i32
 	.local  	i64, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
 	i64.const	$1=, 63
 	i64.const	$2=, 0
@@ -591,23 +577,22 @@ my_clzll:                               # @my_clzll
 	i64.const	$push4=, 0
 	i64.ne  	$push2=, $pop1, $pop4
 	br_if   	1, $pop2        # 1: down to label29
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB14_1 Depth=1
-	i64.const	$push11=, -1
-	i64.add 	$1=, $1, $pop11
-	i32.const	$push10=, 1
-	i32.add 	$3=, $3, $pop10
-	i64.const	$push9=, 1
-	i64.add 	$push8=, $2, $pop9
-	tee_local	$push7=, $2=, $pop8
+	i64.const	$push9=, -1
+	i64.add 	$1=, $1, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$3=, $3, $pop8
+	i64.const	$push7=, 1
+	i64.add 	$2=, $2, $pop7
 	i64.const	$push6=, 64
-	i64.lt_u	$push3=, $pop7, $pop6
+	i64.lt_u	$push3=, $2, $pop6
 	br_if   	0, $pop3        # 0: up to label30
 .LBB14_3:                               # %for.end
 	end_loop
 	end_block                       # label29:
-	copy_local	$push12=, $3
-                                        # fallthrough-return: $pop12
+	copy_local	$push10=, $3
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end14:
 	.size	my_clzll, .Lfunc_end14-my_clzll
@@ -620,7 +605,7 @@ my_clrsbll:                             # @my_clrsbll
 	.param  	i64
 	.result 	i32
 	.local  	i64, i64, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 63
 	i64.shr_u	$1=, $0, $pop0
 	i64.const	$2=, 62
@@ -635,17 +620,16 @@ my_clrsbll:                             # @my_clrsbll
 	i64.and 	$push2=, $pop1, $pop7
 	i64.ne  	$push3=, $pop2, $1
 	br_if   	1, $pop3        # 1: down to label31
-# BB#2:                                 # %for.inc
+# %bb.2:                                # %for.inc
                                         #   in Loop: Header=BB15_1 Depth=1
-	i64.const	$push13=, -1
-	i64.add 	$2=, $2, $pop13
-	i32.const	$push12=, 1
-	i32.add 	$4=, $4, $pop12
-	i64.const	$push11=, 1
-	i64.add 	$push10=, $3, $pop11
-	tee_local	$push9=, $3=, $pop10
+	i64.const	$push11=, -1
+	i64.add 	$2=, $2, $pop11
+	i32.const	$push10=, 1
+	i32.add 	$4=, $4, $pop10
+	i64.const	$push9=, 1
+	i64.add 	$3=, $3, $pop9
 	i64.const	$push8=, 64
-	i64.lt_u	$push4=, $pop9, $pop8
+	i64.lt_u	$push4=, $3, $pop8
 	br_if   	0, $pop4        # 0: up to label32
 .LBB15_3:                               # %for.end
 	end_loop
@@ -665,28 +649,27 @@ my_popcountll:                          # @my_popcountll
 	.param  	i64
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i64.const	$1=, 0
 .LBB16_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label33:
-	i64.const	$push9=, 1
-	i64.shl 	$push0=, $pop9, $1
+	i64.const	$push7=, 1
+	i64.shl 	$push0=, $pop7, $1
 	i64.and 	$push1=, $pop0, $0
-	i64.const	$push8=, 0
-	i64.ne  	$push2=, $pop1, $pop8
+	i64.const	$push6=, 0
+	i64.ne  	$push2=, $pop1, $pop6
 	i32.add 	$2=, $2, $pop2
-	i64.const	$push7=, 1
-	i64.add 	$push6=, $1, $pop7
-	tee_local	$push5=, $1=, $pop6
+	i64.const	$push5=, 1
+	i64.add 	$1=, $1, $pop5
 	i64.const	$push4=, 64
-	i64.ne  	$push3=, $pop5, $pop4
+	i64.ne  	$push3=, $1, $pop4
 	br_if   	0, $pop3        # 0: up to label33
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	copy_local	$push10=, $2
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $2
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end16:
 	.size	my_popcountll, .Lfunc_end16-my_popcountll
@@ -699,25 +682,24 @@ my_parityll:                            # @my_parityll
 	.param  	i64
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i64.const	$1=, 0
 .LBB17_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label34:
-	i64.const	$push11=, 1
-	i64.shl 	$push0=, $pop11, $1
+	i64.const	$push9=, 1
+	i64.shl 	$push0=, $pop9, $1
 	i64.and 	$push1=, $pop0, $0
-	i64.const	$push10=, 0
-	i64.ne  	$push2=, $pop1, $pop10
+	i64.const	$push8=, 0
+	i64.ne  	$push2=, $pop1, $pop8
 	i32.add 	$2=, $2, $pop2
-	i64.const	$push9=, 1
-	i64.add 	$push8=, $1, $pop9
-	tee_local	$push7=, $1=, $pop8
+	i64.const	$push7=, 1
+	i64.add 	$1=, $1, $pop7
 	i64.const	$push6=, 64
-	i64.ne  	$push3=, $pop7, $pop6
+	i64.ne  	$push3=, $1, $pop6
 	br_if   	0, $pop3        # 0: up to label34
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push4=, 1
 	i32.and 	$push5=, $2, $pop4
@@ -732,8 +714,8 @@ my_parityll:                            # @my_parityll
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i64, i32, i32, i32, i64, i64, i64, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32, i32, i64, i32, i32, i32, i32, i64, i64, i64, i32
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB18_1:                               # %for.body
                                         # =>This Loop Header: Depth=1
@@ -745,84 +727,79 @@ main:                                   # @main
                                         #     Child Loop BB18_27 Depth 2
 	block   	
 	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	$push197=, 2
+	i32.shl 	$push0=, $0, $pop197
+	i32.const	$push196=, ints
+	i32.add 	$5=, $pop0, $pop196
+	i32.load	$2=, 0($5)
+	i32.ctz 	$4=, $2
 	i32.const	$push195=, 1
-	i32.add 	$push1=, $pop196, $pop195
+	i32.add 	$push1=, $4, $pop195
 	i32.const	$push194=, 0
-	i32.select	$6=, $pop1, $pop194, $11
-	i32.const	$3=, 0
+	i32.select	$6=, $pop1, $pop194, $2
+	i32.const	$11=, 0
 	block   	
-	i32.eqz 	$push382=, $11
-	br_if   	0, $pop382      # 0: down to label37
-# BB#2:                                 # %for.body.i.preheader
+	i32.eqz 	$push310=, $2
+	br_if   	0, $pop310      # 0: down to label37
+# %bb.2:                                # %for.body.i.preheader
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$3=, 0
+	i32.const	$11=, 0
 .LBB18_3:                               # %for.body.i
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	loop    	                # label39:
-	i32.const	$push204=, 1
-	i32.shl 	$push2=, $pop204, $3
-	i32.and 	$push3=, $pop2, $11
+	i32.const	$push198=, 1
+	i32.shl 	$push2=, $pop198, $11
+	i32.and 	$push3=, $pop2, $2
 	br_if   	1, $pop3        # 1: down to label38
-# BB#4:                                 # %for.inc.i
+# %bb.4:                                # %for.inc.i
                                         #   in Loop: Header=BB18_3 Depth=2
-	i32.const	$push208=, 1
-	i32.add 	$push207=, $3, $pop208
-	tee_local	$push206=, $3=, $pop207
-	i32.const	$push205=, 32
-	i32.lt_u	$push4=, $pop206, $pop205
+	i32.const	$push200=, 1
+	i32.add 	$11=, $11, $pop200
+	i32.const	$push199=, 32
+	i32.lt_u	$push4=, $11, $pop199
 	br_if   	0, $pop4        # 0: up to label39
 .LBB18_5:                               # %for.end.i
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_loop
 	end_block                       # label38:
-	i32.const	$push209=, 1
-	i32.add 	$3=, $3, $pop209
+	i32.const	$push201=, 1
+	i32.add 	$11=, $11, $pop201
 .LBB18_6:                               # %my_ffs.exit
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_block                       # label37:
-	i32.ne  	$push5=, $6, $3
+	i32.ne  	$push5=, $6, $11
 	br_if   	1, $pop5        # 1: down to label35
-# BB#7:                                 # %if.end
+# %bb.7:                                # %if.end
                                         #   in Loop: Header=BB18_1 Depth=1
 	block   	
-	i32.eqz 	$push383=, $11
-	br_if   	0, $pop383      # 0: down to label40
-# BB#8:                                 # %land.lhs.true
+	i32.eqz 	$push311=, $2
+	br_if   	0, $pop311      # 0: down to label40
+# %bb.8:                                # %land.lhs.true
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.clz 	$1=, $11
+	i32.clz 	$1=, $2
 	i32.const	$6=, 0
-	i32.const	$3=, 31
+	i32.const	$11=, 31
 .LBB18_9:                               # %for.body.i822
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	block   	
 	loop    	                # label43:
-	i32.const	$push210=, 1
-	i32.shl 	$push6=, $pop210, $3
-	i32.and 	$push7=, $pop6, $11
+	i32.const	$push202=, 1
+	i32.shl 	$push6=, $pop202, $11
+	i32.and 	$push7=, $pop6, $2
 	br_if   	1, $pop7        # 1: down to label42
-# BB#10:                                # %for.inc.i825
+# %bb.10:                               # %for.inc.i825
                                         #   in Loop: Header=BB18_9 Depth=2
-	i32.const	$push215=, -1
-	i32.add 	$3=, $3, $pop215
+	i32.const	$push205=, -1
+	i32.add 	$11=, $11, $pop205
+	i32.const	$push204=, 1
+	i32.add 	$6=, $6, $pop204
 	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
+	i32.const	$push203=, 32
+	i32.lt_u	$push8=, $6, $pop203
 	br_if   	0, $pop8        # 0: up to label43
 	br      	2               # 2: down to label41
 .LBB18_11:                              #   in Loop: Header=BB18_1 Depth=1
@@ -834,69 +811,66 @@ main:                                   # @main
 	end_block                       # label41:
 	i32.ne  	$push9=, $1, $7
 	br_if   	2, $pop9        # 2: down to label35
-# BB#13:                                # %land.lhs.true13
+# %bb.13:                               # %land.lhs.true13
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$3=, 0
-.LBB18_14:                              # %for.body.i890
+	i32.const	$11=, 0
+.LBB18_14:                              # %for.body.i894
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	block   	
 	loop    	                # label46:
-	i32.const	$push216=, 1
-	i32.shl 	$push10=, $pop216, $3
-	i32.and 	$push11=, $pop10, $11
+	i32.const	$push206=, 1
+	i32.shl 	$push10=, $pop206, $11
+	i32.and 	$push11=, $pop10, $2
 	br_if   	1, $pop11       # 1: down to label45
-# BB#15:                                # %for.inc.i893
+# %bb.15:                               # %for.inc.i897
                                         #   in Loop: Header=BB18_14 Depth=2
+	i32.const	$push208=, 1
+	i32.add 	$11=, $11, $pop208
 	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
+	i32.const	$push207=, 32
+	i32.lt_u	$push12=, $11, $pop207
 	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                       # label45:
-	copy_local	$6=, $3
+	copy_local	$6=, $11
 .LBB18_17:                              # %my_ctz.exit
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_block                       # label44:
-	i32.ne  	$push13=, $2, $6
+	i32.ne  	$push13=, $4, $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.call	$4=, __builtin_clrsb@FUNCTION, $2
+	i32.load	$2=, 0($5)
+	i32.const	$push209=, 31
+	i32.shr_u	$7=, $2, $pop209
 	i32.const	$6=, 1
 	i32.const	$11=, 30
-.LBB18_19:                              # %for.body.i975
+.LBB18_19:                              # %for.body.i983
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	block   	
 	loop    	                # label49:
-	i32.shr_u	$push14=, $3, $11
-	i32.const	$push224=, 1
-	i32.and 	$push15=, $pop14, $pop224
+	i32.shr_u	$push14=, $2, $11
+	i32.const	$push210=, 1
+	i32.and 	$push15=, $pop14, $pop210
 	i32.ne  	$push16=, $pop15, $7
 	br_if   	1, $pop16       # 1: down to label48
-# BB#20:                                # %for.inc.i978
+# %bb.20:                               # %for.inc.i986
                                         #   in Loop: Header=BB18_19 Depth=2
-	i32.const	$push229=, -1
-	i32.add 	$11=, $11, $pop229
+	i32.const	$push213=, -1
+	i32.add 	$11=, $11, $pop213
+	i32.const	$push212=, 1
+	i32.add 	$6=, $6, $pop212
 	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
+	i32.const	$push211=, 32
+	i32.lt_u	$push17=, $6, $pop211
 	br_if   	0, $pop17       # 0: up to label49
 	br      	2               # 2: down to label47
 .LBB18_21:                              #   in Loop: Header=BB18_1 Depth=1
@@ -906,72 +880,69 @@ main:                                   # @main
 .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
+	i32.const	$push214=, -1
+	i32.add 	$push18=, $5, $pop214
+	i32.ne  	$push19=, $4, $pop18
 	br_if   	1, $pop19       # 1: down to label35
-# BB#23:                                # %for.body.i1069.preheader
+# %bb.23:                               # %for.body.i1081.preheader
                                         #   in Loop: Header=BB18_1 Depth=1
 	i32.const	$6=, 0
 	i32.const	$11=, 0
-.LBB18_24:                              # %for.body.i1069
+.LBB18_24:                              # %for.body.i1081
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	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.const	$push218=, 1
+	i32.shl 	$push20=, $pop218, $11
+	i32.and 	$push21=, $pop20, $2
+	i32.const	$push217=, 0
+	i32.ne  	$push22=, $pop21, $pop217
 	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
+	i32.const	$push216=, 1
+	i32.add 	$11=, $11, $pop216
+	i32.const	$push215=, 32
+	i32.ne  	$push23=, $11, $pop215
 	br_if   	0, $pop23       # 0: up to label50
-# BB#25:                                # %my_popcount.exit
+# %bb.25:                               # %my_popcount.exit
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_loop
-	i32.popcnt	$push24=, $3
+	i32.popcnt	$push24=, $2
 	i32.ne  	$push25=, $pop24, $6
 	br_if   	1, $pop25       # 1: down to label35
-# BB#26:                                # %for.body.i1160.preheader
+# %bb.26:                               # %for.body.i1176.preheader
                                         #   in Loop: Header=BB18_1 Depth=1
 	i32.const	$7=, 0
 	i32.const	$11=, 0
-.LBB18_27:                              # %for.body.i1160
+.LBB18_27:                              # %for.body.i1176
                                         #   Parent Loop BB18_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	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.const	$push222=, 1
+	i32.shl 	$push26=, $pop222, $11
+	i32.and 	$push27=, $pop26, $2
+	i32.const	$push221=, 0
+	i32.ne  	$push28=, $pop27, $pop221
 	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
+	i32.const	$push220=, 1
+	i32.add 	$11=, $11, $pop220
+	i32.const	$push219=, 32
+	i32.ne  	$push29=, $11, $pop219
 	br_if   	0, $pop29       # 0: up to label51
-# BB#28:                                # %my_parity.exit
+# %bb.28:                               # %my_parity.exit
                                         #   in Loop: Header=BB18_1 Depth=1
 	end_loop
 	i32.xor 	$push30=, $7, $6
-	i32.const	$push243=, 1
-	i32.and 	$push31=, $pop30, $pop243
+	i32.const	$push223=, 1
+	i32.and 	$push31=, $pop30, $pop223
 	br_if   	1, $pop31       # 1: down to label35
-# BB#29:                                # %for.cond
+# %bb.29:                               # %for.cond
                                         #   in Loop: Header=BB18_1 Depth=1
-	i32.const	$push247=, 1
-	i32.add 	$push246=, $0, $pop247
-	tee_local	$push245=, $0=, $pop246
-	i32.const	$push244=, 13
-	i32.lt_u	$push32=, $pop245, $pop244
+	i32.const	$push225=, 1
+	i32.add 	$0=, $0, $pop225
+	i32.const	$push224=, 13
+	i32.lt_u	$push32=, $0, $pop224
 	br_if   	0, $pop32       # 0: up to label36
-# BB#30:                                # %for.body41.preheader
+# %bb.30:                               # %for.body41.preheader
 	end_loop
 	i32.const	$0=, 0
 .LBB18_31:                              # %for.body41
@@ -983,84 +954,79 @@ main:                                   # @main
                                         #     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
+	i32.const	$push229=, 2
+	i32.shl 	$push33=, $0, $pop229
+	i32.const	$push228=, longs
+	i32.add 	$5=, $pop33, $pop228
+	i32.load	$2=, 0($5)
+	i32.ctz 	$4=, $2
+	i32.const	$push227=, 1
+	i32.add 	$push34=, $4, $pop227
+	i32.const	$push226=, 0
+	i32.select	$6=, $pop34, $pop226, $2
+	i32.const	$11=, 0
 	block   	
-	i32.eqz 	$push384=, $11
-	br_if   	0, $pop384      # 0: down to label53
-# BB#32:                                # %for.body.i1250.preheader
+	i32.eqz 	$push312=, $2
+	br_if   	0, $pop312      # 0: down to label53
+# %bb.32:                               # %for.body.i1270.preheader
                                         #   in Loop: Header=BB18_31 Depth=1
-	i32.const	$3=, 0
-.LBB18_33:                              # %for.body.i1250
+	i32.const	$11=, 0
+.LBB18_33:                              # %for.body.i1270
                                         #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	loop    	                # label55:
-	i32.const	$push258=, 1
-	i32.shl 	$push35=, $pop258, $3
-	i32.and 	$push36=, $pop35, $11
+	i32.const	$push230=, 1
+	i32.shl 	$push35=, $pop230, $11
+	i32.and 	$push36=, $pop35, $2
 	br_if   	1, $pop36       # 1: down to label54
-# BB#34:                                # %for.inc.i1253
+# %bb.34:                               # %for.inc.i1273
                                         #   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
+	i32.const	$push232=, 1
+	i32.add 	$11=, $11, $pop232
+	i32.const	$push231=, 32
+	i32.lt_u	$push37=, $11, $pop231
 	br_if   	0, $pop37       # 0: up to label55
-.LBB18_35:                              # %for.end.i1256
+.LBB18_35:                              # %for.end.i1276
                                         #   in Loop: Header=BB18_31 Depth=1
 	end_loop
 	end_block                       # label54:
-	i32.const	$push263=, 1
-	i32.add 	$3=, $3, $pop263
+	i32.const	$push233=, 1
+	i32.add 	$11=, $11, $pop233
 .LBB18_36:                              # %my_ffsl.exit
                                         #   in Loop: Header=BB18_31 Depth=1
 	end_block                       # label53:
-	i32.ne  	$push38=, $6, $3
+	i32.ne  	$push38=, $6, $11
 	br_if   	1, $pop38       # 1: down to label35
-# BB#37:                                # %if.end49
+# %bb.37:                               # %if.end49
                                         #   in Loop: Header=BB18_31 Depth=1
 	block   	
-	i32.eqz 	$push385=, $11
-	br_if   	0, $pop385      # 0: down to label56
-# BB#38:                                # %land.lhs.true52
+	i32.eqz 	$push313=, $2
+	br_if   	0, $pop313      # 0: down to label56
+# %bb.38:                               # %land.lhs.true52
                                         #   in Loop: Header=BB18_31 Depth=1
-	i32.clz 	$1=, $11
+	i32.clz 	$1=, $2
 	i32.const	$6=, 0
-	i32.const	$3=, 31
-.LBB18_39:                              # %for.body.i1344
+	i32.const	$11=, 31
+.LBB18_39:                              # %for.body.i1368
                                         #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	block   	
 	loop    	                # label59:
-	i32.const	$push264=, 1
-	i32.shl 	$push39=, $pop264, $3
-	i32.and 	$push40=, $pop39, $11
+	i32.const	$push234=, 1
+	i32.shl 	$push39=, $pop234, $11
+	i32.and 	$push40=, $pop39, $2
 	br_if   	1, $pop40       # 1: down to label58
-# BB#40:                                # %for.inc.i1347
+# %bb.40:                               # %for.inc.i1371
                                         #   in Loop: Header=BB18_39 Depth=2
-	i32.const	$push269=, -1
-	i32.add 	$3=, $3, $pop269
+	i32.const	$push237=, -1
+	i32.add 	$11=, $11, $pop237
+	i32.const	$push236=, 1
+	i32.add 	$6=, $6, $pop236
 	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
+	i32.const	$push235=, 32
+	i32.lt_u	$push41=, $6, $pop235
 	br_if   	0, $pop41       # 0: up to label59
 	br      	2               # 2: down to label57
 .LBB18_41:                              #   in Loop: Header=BB18_31 Depth=1
@@ -1072,69 +1038,66 @@ main:                                   # @main
 	end_block                       # label57:
 	i32.ne  	$push42=, $1, $7
 	br_if   	2, $pop42       # 2: down to label35
-# BB#43:                                # %land.lhs.true61
+# %bb.43:                               # %land.lhs.true61
                                         #   in Loop: Header=BB18_31 Depth=1
-	i32.const	$3=, 0
-.LBB18_44:                              # %for.body.i1435
+	i32.const	$11=, 0
+.LBB18_44:                              # %for.body.i1463
                                         #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	block   	
 	loop    	                # label62:
-	i32.const	$push270=, 1
-	i32.shl 	$push43=, $pop270, $3
-	i32.and 	$push44=, $pop43, $11
+	i32.const	$push238=, 1
+	i32.shl 	$push43=, $pop238, $11
+	i32.and 	$push44=, $pop43, $2
 	br_if   	1, $pop44       # 1: down to label61
-# BB#45:                                # %for.inc.i1438
+# %bb.45:                               # %for.inc.i1466
                                         #   in Loop: Header=BB18_44 Depth=2
+	i32.const	$push240=, 1
+	i32.add 	$11=, $11, $pop240
 	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
+	i32.const	$push239=, 32
+	i32.lt_u	$push45=, $11, $pop239
 	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                       # label61:
-	copy_local	$6=, $3
+	copy_local	$6=, $11
 .LBB18_47:                              # %my_ctzl.exit
                                         #   in Loop: Header=BB18_31 Depth=1
 	end_block                       # label60:
-	i32.ne  	$push46=, $2, $6
+	i32.ne  	$push46=, $4, $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.call	$4=, __builtin_clrsbl@FUNCTION, $2
+	i32.load	$2=, 0($5)
+	i32.const	$push241=, 31
+	i32.shr_u	$7=, $2, $pop241
 	i32.const	$6=, 1
 	i32.const	$11=, 30
-.LBB18_49:                              # %for.body.i1528
+.LBB18_49:                              # %for.body.i1560
                                         #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	block   	
 	loop    	                # label65:
-	i32.shr_u	$push47=, $3, $11
-	i32.const	$push278=, 1
-	i32.and 	$push48=, $pop47, $pop278
+	i32.shr_u	$push47=, $2, $11
+	i32.const	$push242=, 1
+	i32.and 	$push48=, $pop47, $pop242
 	i32.ne  	$push49=, $pop48, $7
 	br_if   	1, $pop49       # 1: down to label64
-# BB#50:                                # %for.inc.i1531
+# %bb.50:                               # %for.inc.i1563
                                         #   in Loop: Header=BB18_49 Depth=2
-	i32.const	$push283=, -1
-	i32.add 	$11=, $11, $pop283
+	i32.const	$push245=, -1
+	i32.add 	$11=, $11, $pop245
+	i32.const	$push244=, 1
+	i32.add 	$6=, $6, $pop244
 	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
+	i32.const	$push243=, 32
+	i32.lt_u	$push50=, $6, $pop243
 	br_if   	0, $pop50       # 0: up to label65
 	br      	2               # 2: down to label63
 .LBB18_51:                              #   in Loop: Header=BB18_31 Depth=1
@@ -1144,72 +1107,69 @@ main:                                   # @main
 .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
+	i32.const	$push246=, -1
+	i32.add 	$push51=, $5, $pop246
+	i32.ne  	$push52=, $4, $pop51
 	br_if   	1, $pop52       # 1: down to label35
-# BB#53:                                # %for.body.i1625.preheader
+# %bb.53:                               # %for.body.i1661.preheader
                                         #   in Loop: Header=BB18_31 Depth=1
 	i32.const	$6=, 0
 	i32.const	$11=, 0
-.LBB18_54:                              # %for.body.i1625
+.LBB18_54:                              # %for.body.i1661
                                         #   Parent Loop BB18_31 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	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.const	$push250=, 1
+	i32.shl 	$push53=, $pop250, $11
+	i32.and 	$push54=, $pop53, $2
+	i32.const	$push249=, 0
+	i32.ne  	$push55=, $pop54, $pop249
 	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
+	i32.const	$push248=, 1
+	i32.add 	$11=, $11, $pop248
+	i32.const	$push247=, 32
+	i32.ne  	$push56=, $11, $pop247
 	br_if   	0, $pop56       # 0: up to label66
-# BB#55:                                # %my_popcountl.exit
+# %bb.55:                               # %my_popcountl.exit
                                         #   in Loop: Header=BB18_31 Depth=1
 	end_loop
-	i32.popcnt	$push57=, $3
+	i32.popcnt	$push57=, $2
 	i32.ne  	$push58=, $pop57, $6
 	br_if   	1, $pop58       # 1: down to label35
-# BB#56:                                # %for.body.i1717.preheader
+# %bb.56:                               # %for.body.i1757.preheader
                                         #   in Loop: Header=BB18_31 Depth=1
 	i32.const	$7=, 0
 	i32.const	$11=, 0
-.LBB18_57:                              # %for.body.i1717
+.LBB18_57:                              # %for.body.i1757
                                         #   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.const	$push254=, 1
+	i32.shl 	$push59=, $pop254, $11
+	i32.and 	$push60=, $pop59, $2
+	i32.const	$push253=, 0
+	i32.ne  	$push61=, $pop60, $pop253
 	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
+	i32.const	$push252=, 1
+	i32.add 	$11=, $11, $pop252
+	i32.const	$push251=, 32
+	i32.ne  	$push62=, $11, $pop251
 	br_if   	0, $pop62       # 0: up to label67
-# BB#58:                                # %my_parityl.exit
+# %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
+	i32.const	$push255=, 1
+	i32.and 	$push64=, $pop63, $pop255
 	br_if   	1, $pop64       # 1: down to label35
-# BB#59:                                # %for.cond39
+# %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
+	i32.const	$push257=, 1
+	i32.add 	$0=, $0, $pop257
+	i32.const	$push256=, 13
+	i32.lt_u	$push65=, $0, $pop256
 	br_if   	0, $pop65       # 0: up to label52
-# BB#60:                                # %for.body92.preheader
+# %bb.60:                               # %for.body92.preheader
 	end_loop
 	i32.const	$6=, 0
 .LBB18_61:                              # %for.body92
@@ -1221,399 +1181,386 @@ main:                                   # @main
                                         #     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	$push261=, 3
+	i32.shl 	$push66=, $6, $pop261
+	i32.const	$push260=, longlongs
+	i32.add 	$7=, $pop66, $pop260
+	i64.load	$10=, 0($7)
+	i64.ctz 	$push67=, $10
+	i32.wrap/i64	$5=, $pop67
+	i64.eqz 	$2=, $10
+	i32.const	$push259=, 0
+	i32.const	$push258=, 1
+	i32.add 	$push68=, $5, $pop258
+	i32.select	$0=, $pop259, $pop68, $2
 	i32.const	$11=, 0
 	block   	
-	br_if   	0, $3           # 0: down to label69
-# BB#62:                                # %for.body.i1808.preheader
+	br_if   	0, $2           # 0: down to label69
+# %bb.62:                               # %for.body.i1852.preheader
                                         #   in Loop: Header=BB18_61 Depth=1
 	i32.const	$11=, 0
-	i64.const	$10=, 0
-.LBB18_63:                              # %for.body.i1808
+	i64.const	$9=, 0
+.LBB18_63:                              # %for.body.i1852
                                         #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	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
+	i64.const	$push263=, 1
+	i64.shl 	$push69=, $pop263, $9
+	i64.and 	$push70=, $pop69, $10
+	i64.const	$push262=, 0
+	i64.ne  	$push71=, $pop70, $pop262
 	br_if   	1, $pop71       # 1: down to label70
-# BB#64:                                # %for.inc.i1812
+# %bb.64:                               # %for.inc.i1856
                                         #   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
+	i32.const	$push266=, 1
+	i32.add 	$11=, $11, $pop266
+	i64.const	$push265=, 1
+	i64.add 	$9=, $9, $pop265
+	i64.const	$push264=, 64
+	i64.lt_u	$push72=, $9, $pop264
 	br_if   	0, $pop72       # 0: up to label71
-.LBB18_65:                              # %for.end.i1815
+.LBB18_65:                              # %for.end.i1860
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_loop
 	end_block                       # label70:
-	i32.const	$push321=, 1
-	i32.add 	$11=, $11, $pop321
-.LBB18_66:                              # %my_ffsll.exit1817
+	i32.const	$push267=, 1
+	i32.add 	$11=, $11, $pop267
+.LBB18_66:                              # %my_ffsll.exit1862
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_block                       # label69:
-	i32.ne  	$push73=, $5, $11
+	i32.ne  	$push73=, $0, $11
 	br_if   	1, $pop73       # 1: down to label35
-# BB#67:                                # %if.end100
+# %bb.67:                               # %if.end100
                                         #   in Loop: Header=BB18_61 Depth=1
 	block   	
-	br_if   	0, $3           # 0: down to label72
-# BB#68:                                # %land.lhs.true103
+	br_if   	0, $2           # 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
+	i64.clz 	$push74=, $10
+	i32.wrap/i64	$2=, $pop74
 	i32.const	$11=, 0
 	i64.const	$8=, 0
-	i64.const	$10=, 63
-.LBB18_69:                              # %for.body.i1893
+	i64.const	$9=, 63
+.LBB18_69:                              # %for.body.i1941
                                         #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	loop    	                # label74:
-	i64.const	$push323=, 1
-	i64.shl 	$push75=, $pop323, $10
-	i64.and 	$push76=, $pop75, $9
-	i64.const	$push322=, 0
-	i64.ne  	$push77=, $pop76, $pop322
+	i64.const	$push269=, 1
+	i64.shl 	$push75=, $pop269, $9
+	i64.and 	$push76=, $pop75, $10
+	i64.const	$push268=, 0
+	i64.ne  	$push77=, $pop76, $pop268
 	br_if   	1, $pop77       # 1: down to label73
-# BB#70:                                # %for.inc.i1897
+# %bb.70:                               # %for.inc.i1945
                                         #   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
+	i64.const	$push273=, -1
+	i64.add 	$9=, $9, $pop273
+	i32.const	$push272=, 1
+	i32.add 	$11=, $11, $pop272
+	i64.const	$push271=, 1
+	i64.add 	$8=, $8, $pop271
+	i64.const	$push270=, 64
+	i64.lt_u	$push78=, $8, $pop270
 	br_if   	0, $pop78       # 0: up to label74
-.LBB18_71:                              # %my_clzll.exit1900
+.LBB18_71:                              # %my_clzll.exit1949
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_loop
 	end_block                       # label73:
-	i32.ne  	$push79=, $11, $3
+	i32.ne  	$push79=, $11, $2
 	br_if   	2, $pop79       # 2: down to label35
-# BB#72:                                # %land.lhs.true113
+# %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
+	i64.const	$9=, 0
+.LBB18_73:                              # %for.body.i1988
                                         #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	loop    	                # label76:
-	i64.const	$push331=, 1
-	i64.shl 	$push80=, $pop331, $10
-	i64.and 	$push81=, $pop80, $9
-	i64.const	$push330=, 0
-	i64.ne  	$push82=, $pop81, $pop330
+	i64.const	$push275=, 1
+	i64.shl 	$push80=, $pop275, $9
+	i64.and 	$push81=, $pop80, $10
+	i64.const	$push274=, 0
+	i64.ne  	$push82=, $pop81, $pop274
 	br_if   	1, $pop82       # 1: down to label75
-# BB#74:                                # %for.inc.i1943
+# %bb.74:                               # %for.inc.i1992
                                         #   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
+	i32.const	$push278=, 1
+	i32.add 	$11=, $11, $pop278
+	i64.const	$push277=, 1
+	i64.add 	$9=, $9, $pop277
+	i64.const	$push276=, 64
+	i64.lt_u	$push83=, $9, $pop276
 	br_if   	0, $pop83       # 0: up to label76
-.LBB18_75:                              # %my_ctzll.exit1946
+.LBB18_75:                              # %my_ctzll.exit1996
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_loop
 	end_block                       # label75:
-	i32.ne  	$push84=, $11, $0
+	i32.ne  	$push84=, $11, $5
 	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	$push339=, 0($7)
-	tee_local	$push338=, $10=, $pop339
-	i64.const	$push337=, 63
-	i64.shr_u	$4=, $pop338, $pop337
+	i32.call	$2=, __builtin_clrsbll@FUNCTION, $10
+	i64.load	$10=, 0($7)
+	i64.const	$push279=, 63
+	i64.shr_u	$3=, $10, $pop279
 	i32.const	$11=, 1
 	i64.const	$8=, 1
 	i64.const	$9=, 62
-.LBB18_77:                              # %for.body.i2010
+.LBB18_77:                              # %for.body.i2060
                                         #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
 	loop    	                # label78:
 	i64.shr_u	$push85=, $10, $9
-	i64.const	$push340=, 1
-	i64.and 	$push86=, $pop85, $pop340
-	i64.ne  	$push87=, $pop86, $4
+	i64.const	$push280=, 1
+	i64.and 	$push86=, $pop85, $pop280
+	i64.ne  	$push87=, $pop86, $3
 	br_if   	1, $pop87       # 1: down to label77
-# BB#78:                                # %for.inc.i2014
+# %bb.78:                               # %for.inc.i2064
                                         #   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
+	i64.const	$push284=, -1
+	i64.add 	$9=, $9, $pop284
+	i32.const	$push283=, 1
+	i32.add 	$11=, $11, $pop283
+	i64.const	$push282=, 1
+	i64.add 	$8=, $8, $pop282
+	i64.const	$push281=, 64
+	i64.lt_u	$push88=, $8, $pop281
 	br_if   	0, $pop88       # 0: up to label78
-.LBB18_79:                              # %my_clrsbll.exit2018
+.LBB18_79:                              # %my_clrsbll.exit2069
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_loop
 	end_block                       # label77:
-	i32.const	$push347=, -1
-	i32.add 	$push89=, $11, $pop347
-	i32.ne  	$push90=, $3, $pop89
+	i32.const	$push285=, -1
+	i32.add 	$push89=, $11, $pop285
+	i32.ne  	$push90=, $2, $pop89
 	br_if   	1, $pop90       # 1: down to label35
-# BB#80:                                # %if.end127
+# %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
+.LBB18_81:                              # %for.body.i2154
                                         #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label79:
-	i64.const	$push353=, 1
-	i64.shl 	$push91=, $pop353, $9
+	i64.const	$push289=, 1
+	i64.shl 	$push91=, $pop289, $9
 	i64.and 	$push92=, $pop91, $10
-	i64.const	$push352=, 0
-	i64.ne  	$push93=, $pop92, $pop352
+	i64.const	$push288=, 0
+	i64.ne  	$push93=, $pop92, $pop288
 	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
+	i64.const	$push287=, 1
+	i64.add 	$9=, $9, $pop287
+	i64.const	$push286=, 64
+	i64.ne  	$push94=, $9, $pop286
 	br_if   	0, $pop94       # 0: up to label79
-# BB#82:                                # %my_popcountll.exit2105
+# %bb.82:                               # %my_popcountll.exit2156
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_loop
 	i32.wrap/i64	$push95=, $8
 	i32.ne  	$push96=, $11, $pop95
 	br_if   	1, $pop96       # 1: down to label35
-# BB#83:                                # %for.body.i2190.preheader
+# %bb.83:                               # %for.body.i2241.preheader
                                         #   in Loop: Header=BB18_61 Depth=1
-	i32.const	$3=, 0
+	i32.const	$2=, 0
 	i64.const	$9=, 0
-.LBB18_84:                              # %for.body.i2190
+.LBB18_84:                              # %for.body.i2241
                                         #   Parent Loop BB18_61 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label80:
-	i64.const	$push359=, 1
-	i64.shl 	$push97=, $pop359, $9
+	i64.const	$push293=, 1
+	i64.shl 	$push97=, $pop293, $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
+	i64.const	$push292=, 0
+	i64.ne  	$push99=, $pop98, $pop292
+	i32.add 	$2=, $2, $pop99
+	i64.const	$push291=, 1
+	i64.add 	$9=, $9, $pop291
+	i64.const	$push290=, 64
+	i64.ne  	$push100=, $9, $pop290
 	br_if   	0, $pop100      # 0: up to label80
-# BB#85:                                # %my_parityll.exit2193
+# %bb.85:                               # %my_parityll.exit2244
                                         #   in Loop: Header=BB18_61 Depth=1
 	end_loop
-	i32.xor 	$push101=, $3, $11
-	i32.const	$push360=, 1
-	i32.and 	$push102=, $pop101, $pop360
+	i32.xor 	$push101=, $2, $11
+	i32.const	$push294=, 1
+	i32.and 	$push102=, $pop101, $pop294
 	br_if   	1, $pop102      # 1: down to label35
-# BB#86:                                # %for.cond90
+# %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
+	i32.const	$push296=, 1
+	i32.add 	$6=, $6, $pop296
+	i32.const	$push295=, 12
+	i32.le_u	$push103=, $6, $pop295
 	br_if   	0, $pop103      # 0: up to label68
-# BB#87:                                # %if.end148
+# %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 label35
-# BB#88:                                # %my_clrsb.exit2772
+# %bb.88:                               # %my_clrsb.exit2823
 	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 label35
-# BB#89:                                # %if.end198
+# %bb.89:                               # %if.end198
 	i32.const	$push112=, -2147483648
 	i32.call	$push113=, __builtin_clrsb@FUNCTION, $pop112
 	br_if   	0, $pop113      # 0: down to label35
-# BB#90:                                # %my_clrsb.exit2596
+# %bb.90:                               # %my_clrsb.exit2647
 	i32.const	$push114=, 1073741824
 	i32.call	$push115=, __builtin_clrsb@FUNCTION, $pop114
 	br_if   	0, $pop115      # 0: down to label35
-# BB#91:                                # %my_clrsb.exit2512
+# %bb.91:                               # %my_clrsb.exit2563
 	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 label35
-# BB#92:                                # %my_clrsb.exit2429
+# %bb.92:                               # %my_clrsb.exit2480
 	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 label35
-# BB#93:                                # %my_clrsb.exit2344
+# %bb.93:                               # %my_clrsb.exit2395
 	i32.const	$push124=, -1515870811
 	i32.call	$push125=, __builtin_clrsb@FUNCTION, $pop124
 	br_if   	0, $pop125      # 0: down to label35
-# BB#94:                                # %my_clrsb.exit2268
+# %bb.94:                               # %my_clrsb.exit2319
 	i32.const	$push126=, 1515870810
 	i32.call	$push127=, __builtin_clrsb@FUNCTION, $pop126
 	br_if   	0, $pop127      # 0: down to label35
-# BB#95:                                # %if.end348
+# %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 label35
-# BB#96:                                # %if.end373
+# %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 label35
-# BB#97:                                # %if.end398
+# %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 label35
-# BB#98:                                # %if.end423
-	i32.const	$push365=, -1
-	i32.call	$7=, __builtin_clrsb@FUNCTION, $pop365
+# %bb.98:                               # %if.end423
+	i32.const	$push297=, -1
+	i32.call	$7=, __builtin_clrsb@FUNCTION, $pop297
 	i32.const	$11=, 30
-	i32.const	$3=, 1
-.LBB18_99:                              # %for.body.i1926
+	i32.const	$2=, 1
+.LBB18_99:                              # %for.body.i1975
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	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
+	i32.const	$push299=, -1
+	i32.shr_u	$push140=, $pop299, $11
+	i32.const	$push298=, 1
+	i32.and 	$push141=, $pop140, $pop298
+	i32.eqz 	$push314=, $pop141
+	br_if   	1, $pop314      # 1: down to label82
+# %bb.100:                              # %for.inc.i1978
                                         #   in Loop: Header=BB18_99 Depth=1
-	i32.const	$push372=, -1
-	i32.add 	$11=, $11, $pop372
+	i32.const	$push302=, -1
+	i32.add 	$11=, $11, $pop302
+	i32.const	$push301=, 1
+	i32.add 	$2=, $2, $pop301
 	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
+	i32.const	$push300=, 32
+	i32.lt_u	$push142=, $2, $pop300
 	br_if   	0, $pop142      # 0: up to label83
 	br      	2               # 2: down to label81
 .LBB18_101:
 	end_loop
 	end_block                       # label82:
-	copy_local	$6=, $3
-.LBB18_102:                             # %my_clrsb.exit1933
+	copy_local	$6=, $2
+.LBB18_102:                             # %my_clrsb.exit1982
 	end_block                       # label81:
 	i32.const	$push143=, -1
 	i32.add 	$push144=, $6, $pop143
 	i32.ne  	$push145=, $7, $pop144
 	br_if   	0, $pop145      # 0: down to label35
-# BB#103:                               # %if.end440
+# %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
+# %bb.104:                              # %for.body.i1882
 	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
+# %bb.105:                              # %for.body.i1765
 	i64.const	$push154=, -9223372036854775808
 	i32.call	$push155=, __builtin_clrsbll@FUNCTION, $pop154
 	br_if   	0, $pop155      # 0: down to label35
-# BB#106:                               # %for.body.i1632
+# %bb.106:                              # %for.body.i1668
 	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
+# %bb.107:                              # %for.body.i1572
 	i64.const	$push160=, 4611686018427387904
 	i32.call	$push161=, __builtin_clrsbll@FUNCTION, $pop160
 	br_if   	0, $pop161      # 0: down to label35
-# BB#108:                               # %for.body.i1446
+# %bb.108:                              # %for.body.i1474
 	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
+# %bb.109:                              # %for.body.i1379
 	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
+# %bb.110:                              # %my_clrsbll.exit1263
 	i64.const	$push170=, -6510615555426900571
 	i32.call	$push171=, __builtin_clrsbll@FUNCTION, $pop170
 	br_if   	0, $pop171      # 0: down to label35
-# BB#111:                               # %my_clrsbll.exit1151
+# %bb.111:                              # %my_clrsbll.exit1167
 	i64.const	$push172=, 6510615555426900570
 	i32.call	$push173=, __builtin_clrsbll@FUNCTION, $pop172
 	br_if   	0, $pop173      # 0: down to label35
-# BB#112:                               # %if.end665
+# %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
+# %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
+# %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
+# %bb.115:                              # %if.end740
+	i64.const	$push303=, -1
+	i32.call	$2=, __builtin_clrsbll@FUNCTION, $pop303
 	i64.const	$9=, 62
 	i64.const	$10=, 1
 	i32.const	$11=, 1
@@ -1621,32 +1568,31 @@ main:                                   # @main
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label85:
-	i64.const	$push375=, -1
-	i64.shr_u	$push186=, $pop375, $9
-	i64.const	$push374=, 1
-	i64.and 	$push187=, $pop186, $pop374
+	i64.const	$push305=, -1
+	i64.shr_u	$push186=, $pop305, $9
+	i64.const	$push304=, 1
+	i64.and 	$push187=, $pop186, $pop304
 	i64.eqz 	$push188=, $pop187
 	br_if   	1, $pop188      # 1: down to label84
-# BB#117:                               # %for.inc.i816
+# %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=, $10, $pop379
-	tee_local	$push377=, $10=, $pop378
-	i64.const	$push376=, 64
-	i64.lt_u	$push189=, $pop377, $pop376
+	i64.const	$push309=, -1
+	i64.add 	$9=, $9, $pop309
+	i32.const	$push308=, 1
+	i32.add 	$11=, $11, $pop308
+	i64.const	$push307=, 1
+	i64.add 	$10=, $10, $pop307
+	i64.const	$push306=, 64
+	i64.lt_u	$push189=, $10, $pop306
 	br_if   	0, $pop189      # 0: up to label85
 .LBB18_118:                             # %my_clrsbll.exit
 	end_loop
 	end_block                       # label84:
 	i32.const	$push190=, -1
 	i32.add 	$push191=, $11, $pop190
-	i32.ne  	$push192=, $3, $pop191
+	i32.ne  	$push192=, $2, $pop191
 	br_if   	0, $pop192      # 0: down to label35
-# BB#119:                               # %if.end753
+# %bb.119:                              # %if.end753
 	i32.const	$push193=, 0
 	call    	exit@FUNCTION, $pop193
 	unreachable
@@ -1722,7 +1668,7 @@ longlongs:
 	.size	longlongs, 104
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 24be5e3a8..6213d8059 100644
--- a/test/torture-s/builtin-constant.c.s
+++ b/test/torture-s/builtin-constant.c.s
@@ -6,13 +6,13 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($0)
 	i32.const	$push1=, 48
 	i32.eq  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push2=, .L.str
@@ -47,6 +47,6 @@ main:                                   # @main
 	.size	.L.str, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b636c46e6..6df2a54c8 100644
--- a/test/torture-s/builtin-prefetch-1.c.s
+++ b/test/torture-s/builtin-prefetch-1.c.s
@@ -6,7 +6,7 @@
 	.type	good_const,@function
 good_const:                             # @good_const
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ good_const:                             # @good_const
 	.type	good_enum,@function
 good_enum:                              # @good_enum
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -30,7 +30,7 @@ good_enum:                              # @good_enum
 	.type	good_expr,@function
 good_expr:                              # @good_expr
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -42,7 +42,7 @@ good_expr:                              # @good_expr
 	.type	good_vararg,@function
 good_vararg:                            # @good_vararg
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -54,7 +54,7 @@ good_vararg:                            # @good_vararg
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, arr
 	call    	good_const@FUNCTION, $pop0
 	i32.const	$push2=, arr
@@ -76,5 +76,5 @@ arr:
 	.size	arr, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0099a7ec8..23c8ae1c6 100644
--- a/test/torture-s/builtin-prefetch-2.c.s
+++ b/test/torture-s/builtin-prefetch-2.c.s
@@ -5,7 +5,7 @@
 	.globl	simple_global
 	.type	simple_global,@function
 simple_global:                          # @simple_global
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -16,7 +16,7 @@ simple_global:                          # @simple_global
 	.globl	simple_file
 	.type	simple_file,@function
 simple_file:                            # @simple_file
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -27,7 +27,7 @@ simple_file:                            # @simple_file
 	.globl	simple_static_local
 	.type	simple_static_local,@function
 simple_static_local:                    # @simple_static_local
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -39,14 +39,13 @@ simple_static_local:                    # @simple_static_local
 	.type	simple_local,@function
 simple_local:                           # @simple_local
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push3=, 0
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 416
-	i32.sub 	$push8=, $pop0, $pop2
-	tee_local	$push7=, $0=, $pop8
-	i32.store	__stack_pointer($pop3), $pop7
+	i32.sub 	$0=, $pop0, $pop2
+	i32.const	$push3=, 0
+	i32.store	__stack_pointer($pop3), $0
 	i32.const	$push6=, 0
 	i32.const	$push4=, 416
 	i32.add 	$push5=, $0, $pop4
@@ -62,7 +61,7 @@ simple_local:                           # @simple_local
 	.type	simple_arg,@function
 simple_arg:                             # @simple_arg
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
@@ -78,7 +77,7 @@ simple_arg:                             # @simple_arg
 	.globl	expr_global
 	.type	expr_global,@function
 expr_global:                            # @expr_global
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -89,7 +88,7 @@ expr_global:                            # @expr_global
 	.globl	expr_local
 	.type	expr_local,@function
 expr_local:                             # @expr_local
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 80
@@ -106,14 +105,13 @@ expr_local:                             # @expr_local
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push0=, 0
 	i32.load	$push1=, glob_int($pop0)
 	i32.store	8($0), $pop1
@@ -203,5 +201,5 @@ simple_static_local.ix:
 	.size	simple_static_local.ix, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c76f2428e..4298baf84 100644
--- a/test/torture-s/builtin-prefetch-3.c.s
+++ b/test/torture-s/builtin-prefetch-3.c.s
@@ -5,7 +5,7 @@
 	.globl	simple_vol_global
 	.type	simple_vol_global,@function
 simple_vol_global:                      # @simple_vol_global
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$drop=, glob_vol_ptr_int($pop0)
 	i32.const	$push1=, 0
@@ -20,7 +20,7 @@ simple_vol_global:                      # @simple_vol_global
 	.globl	simple_vol_file
 	.type	simple_vol_file,@function
 simple_vol_file:                        # @simple_vol_file
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$drop=, stat_vol_ptr_int($pop0)
 	i32.const	$push1=, 0
@@ -36,13 +36,9 @@ simple_vol_file:                        # @simple_vol_file
 	.type	expr_vol_global,@function
 expr_vol_global:                        # @expr_vol_global
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$drop=, vol_ptr_str($pop0)
-	i32.const	$push28=, 0
-	i32.load	$drop=, vol_ptr_vol_str($pop28)
-	i32.const	$push27=, 0
-	i32.load	$drop=, vol_ptr_str($pop27)
 	i32.const	$push26=, 0
 	i32.load	$drop=, vol_ptr_vol_str($pop26)
 	i32.const	$push25=, 0
@@ -50,13 +46,16 @@ expr_vol_global:                        # @expr_vol_global
 	i32.const	$push24=, 0
 	i32.load	$drop=, vol_ptr_vol_str($pop24)
 	i32.const	$push23=, 0
-	i32.load	$drop=, vol_str+16($pop23)
+	i32.load	$drop=, vol_ptr_str($pop23)
 	i32.const	$push22=, 0
-	i32.load	$drop=, vol_ptr_str($pop22)
+	i32.load	$drop=, vol_ptr_vol_str($pop22)
 	i32.const	$push21=, 0
-	i32.load	$push20=, ptr_vol_str($pop21)
-	tee_local	$push19=, $0=, $pop20
-	i32.load	$drop=, 16($pop19)
+	i32.load	$drop=, vol_str+16($pop21)
+	i32.const	$push20=, 0
+	i32.load	$drop=, vol_ptr_str($pop20)
+	i32.const	$push19=, 0
+	i32.load	$0=, ptr_vol_str($pop19)
+	i32.load	$drop=, 16($0)
 	i32.const	$push18=, 0
 	i32.load	$push1=, vol_ptr_vol_str($pop18)
 	i32.load	$drop=, 16($pop1)
@@ -103,7 +102,7 @@ expr_vol_global:                        # @expr_vol_global
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	simple_vol_global@FUNCTION
 	call    	simple_vol_file@FUNCTION
 	i32.const	$push1=, 0
@@ -264,5 +263,5 @@ stat_int_arr:
 	.size	stat_int_arr, 400
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 aa96f7be7..eb71d8218 100644
--- a/test/torture-s/builtin-prefetch-4.c.s
+++ b/test/torture-s/builtin-prefetch-4.c.s
@@ -7,7 +7,7 @@
 assign_arg_ptr:                         # @assign_arg_ptr
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ assign_arg_ptr:                         # @assign_arg_ptr
 	.type	assign_glob_ptr,@function
 assign_glob_ptr:                        # @assign_glob_ptr
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ assign_glob_ptr:                        # @assign_glob_ptr
 assign_arg_idx:                         # @assign_arg_idx
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -47,7 +47,7 @@ assign_arg_idx:                         # @assign_arg_idx
 	.type	assign_glob_idx,@function
 assign_glob_idx:                        # @assign_glob_idx
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -61,7 +61,7 @@ assign_glob_idx:                        # @assign_glob_idx
 preinc_arg_ptr:                         # @preinc_arg_ptr
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -74,7 +74,7 @@ preinc_arg_ptr:                         # @preinc_arg_ptr
 	.type	preinc_glob_ptr,@function
 preinc_glob_ptr:                        # @preinc_glob_ptr
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, ptr($pop5)
@@ -94,7 +94,7 @@ preinc_glob_ptr:                        # @preinc_glob_ptr
 postinc_arg_ptr:                        # @postinc_arg_ptr
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -107,7 +107,7 @@ postinc_arg_ptr:                        # @postinc_arg_ptr
 	.type	postinc_glob_ptr,@function
 postinc_glob_ptr:                       # @postinc_glob_ptr
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, ptr($pop5)
@@ -127,7 +127,7 @@ postinc_glob_ptr:                       # @postinc_glob_ptr
 predec_arg_ptr:                         # @predec_arg_ptr
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -140,7 +140,7 @@ predec_arg_ptr:                         # @predec_arg_ptr
 	.type	predec_glob_ptr,@function
 predec_glob_ptr:                        # @predec_glob_ptr
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, ptr($pop5)
@@ -160,7 +160,7 @@ predec_glob_ptr:                        # @predec_glob_ptr
 postdec_arg_ptr:                        # @postdec_arg_ptr
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -173,7 +173,7 @@ postdec_arg_ptr:                        # @postdec_arg_ptr
 	.type	postdec_glob_ptr,@function
 postdec_glob_ptr:                       # @postdec_glob_ptr
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, ptr($pop5)
@@ -193,7 +193,7 @@ postdec_glob_ptr:                       # @postdec_glob_ptr
 preinc_arg_idx:                         # @preinc_arg_idx
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -206,7 +206,7 @@ preinc_arg_idx:                         # @preinc_arg_idx
 	.type	preinc_glob_idx,@function
 preinc_glob_idx:                        # @preinc_glob_idx
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, arrindex($pop5)
@@ -226,7 +226,7 @@ preinc_glob_idx:                        # @preinc_glob_idx
 postinc_arg_idx:                        # @postinc_arg_idx
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -239,7 +239,7 @@ postinc_arg_idx:                        # @postinc_arg_idx
 	.type	postinc_glob_idx,@function
 postinc_glob_idx:                       # @postinc_glob_idx
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, arrindex($pop5)
@@ -259,7 +259,7 @@ postinc_glob_idx:                       # @postinc_glob_idx
 predec_arg_idx:                         # @predec_arg_idx
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -272,7 +272,7 @@ predec_arg_idx:                         # @predec_arg_idx
 	.type	predec_glob_idx,@function
 predec_glob_idx:                        # @predec_glob_idx
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, arrindex($pop5)
@@ -292,7 +292,7 @@ predec_glob_idx:                        # @predec_glob_idx
 postdec_arg_idx:                        # @postdec_arg_idx
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -305,7 +305,7 @@ postdec_arg_idx:                        # @postdec_arg_idx
 	.type	postdec_glob_idx,@function
 postdec_glob_idx:                       # @postdec_glob_idx
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, arrindex($pop5)
@@ -325,7 +325,7 @@ postdec_glob_idx:                       # @postdec_glob_idx
 getptr:                                 # @getptr
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, getptrcnt($pop6)
@@ -347,14 +347,13 @@ funccall_arg_ptr:                       # @funccall_arg_ptr
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, getptrcnt($pop6)
-	tee_local	$push4=, $1=, $pop5
+	i32.load	$1=, getptrcnt($pop0)
+	i32.const	$push4=, 0
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop4, $pop1
-	i32.store	getptrcnt($pop0), $pop2
+	i32.add 	$push2=, $1, $pop1
+	i32.store	getptrcnt($pop4), $pop2
 	i32.eqz 	$push3=, $1
                                         # fallthrough-return: $pop3
 	.endfunc
@@ -368,7 +367,7 @@ funccall_arg_ptr:                       # @funccall_arg_ptr
 getint:                                 # @getint
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i32.load	$push1=, getintcnt($pop6)
@@ -390,14 +389,13 @@ funccall_arg_idx:                       # @funccall_arg_idx
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, getintcnt($pop6)
-	tee_local	$push4=, $2=, $pop5
+	i32.load	$2=, getintcnt($pop0)
+	i32.const	$push4=, 0
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop4, $pop1
-	i32.store	getintcnt($pop0), $pop2
+	i32.add 	$push2=, $2, $pop1
+	i32.store	getintcnt($pop4), $pop2
 	i32.eqz 	$push3=, $2
                                         # fallthrough-return: $pop3
 	.endfunc
@@ -411,26 +409,24 @@ funccall_arg_idx:                       # @funccall_arg_idx
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end76
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, getptrcnt($pop6)
-	tee_local	$push4=, $0=, $pop5
+# %bb.0:                                # %if.end76
+	i32.const	$push5=, 0
+	i32.load	$0=, getptrcnt($pop5)
+	i32.const	$push4=, 0
 	i32.const	$push3=, 1
-	i32.add 	$push0=, $pop4, $pop3
-	i32.store	getptrcnt($pop7), $pop0
+	i32.add 	$push0=, $0, $pop3
+	i32.store	getptrcnt($pop4), $pop0
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# 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
+# %bb.1:                                # %if.end80
+	i32.const	$push8=, 0
+	i32.load	$0=, getintcnt($pop8)
+	i32.const	$push7=, 0
+	i32.const	$push6=, 1
+	i32.add 	$push1=, $0, $pop6
+	i32.store	getintcnt($pop7), $pop1
 	br_if   	0, $0           # 0: down to label0
-# BB#2:                                 # %if.end84
+# %bb.2:                                # %if.end84
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -488,6 +484,6 @@ getintcnt:
 	.size	getintcnt, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 27cb5e511..d70343adb 100644
--- a/test/torture-s/builtin-prefetch-5.c.s
+++ b/test/torture-s/builtin-prefetch-5.c.s
@@ -6,7 +6,7 @@
 	.type	arg_ptr,@function
 arg_ptr:                                # @arg_ptr
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ arg_ptr:                                # @arg_ptr
 	.type	arg_idx,@function
 arg_idx:                                # @arg_idx
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -29,7 +29,7 @@ arg_idx:                                # @arg_idx
 	.globl	glob_ptr
 	.type	glob_ptr,@function
 glob_ptr:                               # @glob_ptr
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -40,7 +40,7 @@ glob_ptr:                               # @glob_ptr
 	.globl	glob_idx
 	.type	glob_idx,@function
 glob_idx:                               # @glob_idx
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -52,7 +52,7 @@ glob_idx:                               # @glob_idx
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	idx($pop1), $pop0
@@ -109,5 +109,5 @@ s:
 	.size	s, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 befe5a644..7b1d09272 100644
--- a/test/torture-s/builtin-prefetch-6.c.s
+++ b/test/torture-s/builtin-prefetch-6.c.s
@@ -5,7 +5,7 @@
 	.globl	init_addrs
 	.type	init_addrs,@function
 init_addrs:                             # @init_addrs
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 8589934593
 	i64.store	bad_addr($pop1), $pop0
@@ -68,16 +68,15 @@ init_addrs:                             # @init_addrs
 	.type	prefetch_for_read,@function
 prefetch_for_read:                      # @prefetch_for_read
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -260
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push2=, 4
-	i32.add 	$push1=, $0, $pop2
-	tee_local	$push0=, $0=, $pop1
-	br_if   	0, $pop0        # 0: up to label0
-# BB#2:                                 # %for.end
+	i32.const	$push0=, 4
+	i32.add 	$0=, $0, $pop0
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -90,16 +89,15 @@ prefetch_for_read:                      # @prefetch_for_read
 	.type	prefetch_for_write,@function
 prefetch_for_write:                     # @prefetch_for_write
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -260
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push2=, 4
-	i32.add 	$push1=, $0, $pop2
-	tee_local	$push0=, $0=, $pop1
-	br_if   	0, $pop0        # 0: up to label1
-# BB#2:                                 # %for.end
+	i32.const	$push0=, 4
+	i32.add 	$0=, $0, $pop0
+	br_if   	0, $0           # 0: up to label1
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -112,7 +110,7 @@ prefetch_for_write:                     # @prefetch_for_write
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	init_addrs@FUNCTION
 	call    	prefetch_for_read@FUNCTION
 	call    	prefetch_for_write@FUNCTION
@@ -142,5 +140,5 @@ arr_used:
 	.size	arr_used, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 97d9992d6..a9fff8f71 100644
--- a/test/torture-s/builtin-types-compatible-p.c.s
+++ b/test/torture-s/builtin-types-compatible-p.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -42,5 +42,5 @@ rootbeer:
 	.size	rootbeer, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9488aa1ce..1a8782479 100644
--- a/test/torture-s/call-trap-1.c.s
+++ b/test/torture-s/call-trap-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -31,7 +31,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, foo@FUNCTION
 	unreachable
 	.endfunc
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/cbrt.c.s b/test/torture-s/cbrt.c.s
index 80c2cf23a..874b6415f 100644
--- a/test/torture-s/cbrt.c.s
+++ b/test/torture-s/cbrt.c.s
@@ -7,135 +7,123 @@
 cbrtl:                                  # @cbrtl
 	.param  	f64
 	.result 	f64
-	.local  	i64, i32, i32, f64, f64, i32
-# BB#0:                                 # %entry
-	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
+	.local  	i64, i32, i32, f64, f64, f64, i32
+# %bb.0:                                # %entry
+	i32.const	$push61=, 0
+	i32.load	$push60=, __stack_pointer($pop61)
+	i32.const	$push62=, 16
+	i32.sub 	$7=, $pop60, $pop62
+	f64.store	0($7), $0
 	i64.const	$push0=, 0
-	i64.store	8($6), $pop0
-	block   	
-	i64.reinterpret/f64	$push66=, $0
-	tee_local	$push65=, $1=, $pop66
+	i64.store	8($7), $pop0
+	i64.reinterpret/f64	$1=, $0
 	i64.const	$push1=, 32
-	i64.shr_u	$push2=, $pop65, $pop1
-	i32.wrap/i64	$push64=, $pop2
-	tee_local	$push63=, $3=, $pop64
+	i64.shr_u	$push2=, $1, $pop1
+	i32.wrap/i64	$3=, $pop2
 	i32.const	$push4=, 2147483647
-	i32.and 	$push62=, $pop63, $pop4
-	tee_local	$push61=, $2=, $pop62
+	i32.and 	$2=, $3, $pop4
+	block   	
 	i32.const	$push5=, 2146435072
-	i32.lt_u	$push6=, $pop61, $pop5
+	i32.lt_u	$push6=, $2, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.then
-	f64.add 	$push69=, $0, $0
-	return  	$pop69
+# %bb.1:                                # %if.then
+	f64.add 	$push63=, $0, $0
+	return  	$pop63
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	block   	
 	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.eqz 	$push65=, $pop8
+	br_if   	0, $pop65       # 0: down to label1
+# %bb.3:                                # %if.end13
 	i32.const	$push3=, -2147483648
 	i32.and 	$3=, $3, $pop3
-	i32.store	4($6), $2
+	i32.store	4($7), $2
 	block   	
 	block   	
 	i32.const	$push9=, 1048575
 	i32.gt_u	$push10=, $2, $pop9
 	br_if   	0, $pop10       # 0: down to label3
-# BB#4:                                 # %if.then18
-	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
+# %bb.4:                                # %if.then18
+	i32.const	$push15=, 1129316352
+	i32.store	12($7), $pop15
+	f64.load	$push16=, 8($7)
+	f64.mul 	$6=, $pop16, $0
+	f64.store	8($7), $6
+	i64.reinterpret/f64	$push17=, $6
+	i64.const	$push18=, 32
+	i64.shr_u	$push19=, $pop17, $pop18
+	i32.wrap/i64	$push20=, $pop19
+	i32.const	$push21=, 3
+	i32.div_u	$push22=, $pop20, $pop21
+	i32.const	$push23=, 696219795
+	i32.add 	$push24=, $pop22, $pop23
+	i32.store	12($7), $pop24
 	br      	1               # 1: down to label2
 .LBB0_5:                                # %if.else
 	end_block                       # label3:
 	i32.const	$push11=, 3
 	i32.div_u	$push12=, $2, $pop11
 	i32.const	$push13=, 715094163
-	i32.add 	$2=, $pop12, $pop13
+	i32.add 	$push14=, $pop12, $pop13
+	i32.store	12($7), $pop14
 .LBB0_6:                                # %if.end31
 	end_block                       # label2:
-	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
+	f64.load	$6=, 8($7)
+	f64.load	$4=, 0($7)
+	f64.mul 	$push25=, $6, $6
+	f64.div 	$push26=, $pop25, $4
+	f64.mul 	$push27=, $6, $pop26
+	f64.const	$push28=, 0x1.15f15f15f15f1p-1
+	f64.add 	$5=, $pop27, $pop28
+	f64.const	$push34=, 0x1.9b6db6db6db6ep0
+	f64.const	$push31=, 0x1.6a0ea0ea0ea0fp0
+	f64.add 	$push32=, $5, $pop31
+	f64.const	$push29=, -0x1.691de2532c834p-1
+	f64.div 	$push30=, $pop29, $5
+	f64.add 	$push33=, $pop32, $pop30
+	f64.div 	$push35=, $pop34, $pop33
+	f64.const	$push36=, 0x1.6db6db6db6db7p-2
+	f64.add 	$push37=, $pop35, $pop36
+	f64.mul 	$6=, $6, $pop37
+	f64.store	8($7), $6
+	i32.const	$push38=, 0
+	i32.store	8($7), $pop38
+	i64.reinterpret/f64	$push39=, $6
+	i64.const	$push40=, 32
+	i64.shr_u	$push41=, $pop39, $pop40
+	i32.wrap/i64	$push42=, $pop41
+	i32.const	$push43=, 1
+	i32.add 	$push44=, $pop42, $pop43
+	i32.store	12($7), $pop44
+	f64.load	$6=, 8($7)
+	f64.mul 	$push45=, $6, $6
+	f64.div 	$4=, $4, $pop45
+	f64.sub 	$push48=, $4, $6
+	f64.add 	$push46=, $6, $6
+	f64.add 	$push47=, $pop46, $4
+	f64.div 	$push49=, $pop48, $pop47
+	f64.mul 	$push50=, $6, $pop49
+	f64.add 	$6=, $6, $pop50
+	f64.store	8($7), $6
+	i64.reinterpret/f64	$push51=, $6
+	i64.const	$push64=, 32
+	i64.shr_u	$push52=, $pop51, $pop64
+	i32.wrap/i64	$push53=, $pop52
+	i32.or  	$push54=, $3, $pop53
+	i32.store	12($7), $pop54
+	f64.load	$6=, 8($7)
+	f64.mul 	$push55=, $6, $6
+	f64.div 	$push56=, $0, $pop55
+	f64.sub 	$push57=, $6, $pop56
+	f64.const	$push58=, -0x1.5555555555555p-2
+	f64.mul 	$push59=, $pop57, $pop58
+	f64.add 	$0=, $6, $pop59
 .LBB0_7:                                # %cleanup
 	end_block                       # label1:
-	copy_local	$push90=, $0
-                                        # fallthrough-return: $pop90
+	copy_local	$push66=, $0
+                                        # fallthrough-return: $pop66
 	.endfunc
 .Lfunc_end0:
 	.size	cbrtl, .Lfunc_end0-cbrtl
@@ -146,7 +134,7 @@ cbrtl:                                  # @cbrtl
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -155,5 +143,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/cmpdi-1.c.s b/test/torture-s/cmpdi-1.c.s
index cd5fb3ecd..574cc873a 100644
--- a/test/torture-s/cmpdi-1.c.s
+++ b/test/torture-s/cmpdi-1.c.s
@@ -7,7 +7,7 @@
 feq:                                    # @feq
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i64.eq  	$push0=, $0, $1
@@ -24,7 +24,7 @@ feq:                                    # @feq
 fne:                                    # @fne
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i64.eq  	$push0=, $0, $1
@@ -41,7 +41,7 @@ fne:                                    # @fne
 flt:                                    # @flt
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i64.lt_s	$push0=, $0, $1
@@ -58,7 +58,7 @@ flt:                                    # @flt
 fge:                                    # @fge
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i64.lt_s	$push0=, $0, $1
@@ -75,7 +75,7 @@ fge:                                    # @fge
 fgt:                                    # @fgt
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i64.gt_s	$push0=, $0, $1
@@ -92,7 +92,7 @@ fgt:                                    # @fgt
 fle:                                    # @fle
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i64.gt_s	$push0=, $0, $1
@@ -109,7 +109,7 @@ fle:                                    # @fle
 fltu:                                   # @fltu
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i64.lt_u	$push0=, $0, $1
@@ -126,7 +126,7 @@ fltu:                                   # @fltu
 fgeu:                                   # @fgeu
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i64.lt_u	$push0=, $0, $1
@@ -143,7 +143,7 @@ fgeu:                                   # @fgeu
 fgtu:                                   # @fgtu
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i64.gt_u	$push0=, $0, $1
@@ -160,7 +160,7 @@ fgtu:                                   # @fgtu
 fleu:                                   # @fleu
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i64.gt_u	$push0=, $0, $1
@@ -177,7 +177,7 @@ fleu:                                   # @fleu
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i64, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$4=, correct_results
 	i32.const	$0=, 0
 .LBB10_1:                               # %for.body
@@ -187,145 +187,137 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.const	$2=, args
 	i32.const	$push45=, 3
-	i32.shl 	$push1=, $0, $pop45
+	i32.shl 	$push0=, $0, $pop45
 	i32.const	$push44=, args
-	i32.add 	$push2=, $pop1, $pop44
-	i64.load	$1=, 0($pop2)
-	i32.const	$3=, -1
+	i32.add 	$push1=, $pop0, $pop44
+	i64.load	$1=, 0($pop1)
+	i32.const	$3=, 0
 .LBB10_2:                               # %for.body3
                                         #   Parent Loop BB10_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label2:
-	i32.const	$push51=, 13
+	i64.load	$5=, 0($2)
+	i64.eq  	$6=, $1, $5
+	i32.const	$push47=, 13
+	i32.const	$push46=, 140
+	i32.select	$push2=, $pop47, $pop46, $6
+	i32.load	$push3=, 0($4)
+	i32.ne  	$push4=, $pop2, $pop3
+	br_if   	2, $pop4        # 2: down to label0
+# %bb.3:                                # %if.end
+                                        #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push50=, 140
-	i64.load	$push49=, 0($2)
-	tee_local	$push48=, $5=, $pop49
-	i64.eq  	$push47=, $1, $pop48
-	tee_local	$push46=, $6=, $pop47
-	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
+	i32.const	$push49=, 13
+	i32.select	$push5=, $pop50, $pop49, $6
+	i32.const	$push48=, 4
+	i32.add 	$push6=, $4, $pop48
+	i32.load	$push7=, 0($pop6)
+	i32.ne  	$push8=, $pop5, $pop7
+	br_if   	2, $pop8        # 2: down to label0
+# %bb.4:                                # %if.end10
                                         #   in Loop: Header=BB10_2 Depth=2
-	i32.const	$push54=, 140
+	i64.lt_s	$6=, $1, $5
 	i32.const	$push53=, 13
-	i32.select	$push6=, $pop54, $pop53, $6
-	i32.const	$push52=, 4
-	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
+	i32.const	$push52=, 140
+	i32.select	$push9=, $pop53, $pop52, $6
+	i32.const	$push51=, 8
+	i32.add 	$push10=, $4, $pop51
+	i32.load	$push11=, 0($pop10)
+	i32.ne  	$push12=, $pop9, $pop11
+	br_if   	2, $pop12       # 2: down to label0
+# %bb.5:                                # %if.end15
+                                        #   in Loop: Header=BB10_2 Depth=2
+	i32.const	$push56=, 140
+	i32.const	$push55=, 13
+	i32.select	$push13=, $pop56, $pop55, $6
+	i32.const	$push54=, 12
+	i32.add 	$push14=, $4, $pop54
+	i32.load	$push15=, 0($pop14)
+	i32.ne  	$push16=, $pop13, $pop15
+	br_if   	2, $pop16       # 2: down to label0
+# %bb.6:                                # %if.end20
                                         #   in Loop: Header=BB10_2 Depth=2
+	i64.gt_s	$6=, $1, $5
 	i32.const	$push59=, 13
 	i32.const	$push58=, 140
-	i64.lt_s	$push57=, $1, $5
-	tee_local	$push56=, $6=, $pop57
-	i32.select	$push10=, $pop59, $pop58, $pop56
-	i32.const	$push55=, 8
-	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
+	i32.select	$push17=, $pop59, $pop58, $6
+	i32.const	$push57=, 16
+	i32.add 	$push18=, $4, $pop57
+	i32.load	$push19=, 0($pop18)
+	i32.ne  	$push20=, $pop17, $pop19
+	br_if   	2, $pop20       # 2: down to label0
+# %bb.7:                                # %if.end25
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push62=, 140
 	i32.const	$push61=, 13
-	i32.select	$push14=, $pop62, $pop61, $6
-	i32.const	$push60=, 12
-	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
+	i32.select	$push21=, $pop62, $pop61, $6
+	i32.const	$push60=, 20
+	i32.add 	$push22=, $4, $pop60
+	i32.load	$push23=, 0($pop22)
+	i32.ne  	$push24=, $pop21, $pop23
+	br_if   	2, $pop24       # 2: down to label0
+# %bb.8:                                # %if.end30
+                                        #   in Loop: Header=BB10_2 Depth=2
+	i64.lt_u	$6=, $1, $5
+	i32.const	$push65=, 13
+	i32.const	$push64=, 140
+	i32.select	$push25=, $pop65, $pop64, $6
+	i32.const	$push63=, 24
+	i32.add 	$push26=, $4, $pop63
+	i32.load	$push27=, 0($pop26)
+	i32.ne  	$push28=, $pop25, $pop27
+	br_if   	2, $pop28       # 2: down to label0
+# %bb.9:                                # %if.end35
                                         #   in Loop: Header=BB10_2 Depth=2
+	i32.const	$push68=, 140
 	i32.const	$push67=, 13
-	i32.const	$push66=, 140
-	i64.gt_s	$push65=, $1, $5
-	tee_local	$push64=, $6=, $pop65
-	i32.select	$push18=, $pop67, $pop66, $pop64
-	i32.const	$push63=, 16
-	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
+	i32.select	$push29=, $pop68, $pop67, $6
+	i32.const	$push66=, 28
+	i32.add 	$push30=, $4, $pop66
+	i32.load	$push31=, 0($pop30)
+	i32.ne  	$push32=, $pop29, $pop31
+	br_if   	2, $pop32       # 2: down to label0
+# %bb.10:                               # %if.end40
                                         #   in Loop: Header=BB10_2 Depth=2
+	i64.gt_u	$6=, $1, $5
+	i32.const	$push71=, 13
 	i32.const	$push70=, 140
-	i32.const	$push69=, 13
-	i32.select	$push22=, $pop70, $pop69, $6
-	i32.const	$push68=, 20
-	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
+	i32.select	$push33=, $pop71, $pop70, $6
+	i32.const	$push69=, 32
+	i32.add 	$push34=, $4, $pop69
+	i32.load	$push35=, 0($pop34)
+	i32.ne  	$push36=, $pop33, $pop35
+	br_if   	2, $pop36       # 2: down to label0
+# %bb.11:                               # %if.end45
                                         #   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	$push26=, $pop75, $pop74, $pop72
-	i32.const	$push71=, 24
-	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	$push30=, $pop78, $pop77, $6
-	i32.const	$push76=, 28
-	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	$push34=, $pop83, $pop82, $pop80
-	i32.const	$push79=, 32
-	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	$push38=, $pop86, $pop85, $6
-	i32.const	$push84=, 36
-	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
+	i32.const	$push73=, 13
+	i32.select	$push37=, $pop74, $pop73, $6
+	i32.const	$push72=, 36
+	i32.add 	$push38=, $4, $pop72
+	i32.load	$push39=, 0($pop38)
+	i32.ne  	$push40=, $pop37, $pop39
+	br_if   	2, $pop40       # 2: down to label0
+# %bb.12:                               # %if.end50
                                         #   in Loop: Header=BB10_2 Depth=2
-	i32.const	$push92=, 40
-	i32.add 	$4=, $4, $pop92
-	i32.const	$push91=, 8
-	i32.add 	$2=, $2, $pop91
-	i32.const	$push90=, 1
-	i32.add 	$push89=, $3, $pop90
-	tee_local	$push88=, $3=, $pop89
-	i32.const	$push87=, 7
-	i32.lt_u	$push42=, $pop88, $pop87
-	br_if   	0, $pop42       # 0: up to label2
-# BB#13:                                # %for.end
+	i32.const	$push78=, 40
+	i32.add 	$4=, $4, $pop78
+	i32.const	$push77=, 8
+	i32.add 	$2=, $2, $pop77
+	i32.const	$push76=, 1
+	i32.add 	$3=, $3, $pop76
+	i32.const	$push75=, 8
+	i32.lt_u	$push41=, $3, $pop75
+	br_if   	0, $pop41       # 0: up to label2
+# %bb.13:                               # %for.end
                                         #   in Loop: Header=BB10_1 Depth=1
 	end_loop
-	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
+	i32.const	$push80=, 1
+	i32.add 	$0=, $0, $pop80
+	i32.const	$push79=, 8
+	i32.lt_u	$push42=, $0, $pop79
+	br_if   	0, $pop42       # 0: up to label1
+# %bb.14:                               # %for.end53
 	end_loop
 	i32.const	$push43=, 0
 	call    	exit@FUNCTION, $pop43
@@ -1003,6 +995,6 @@ correct_results:
 	.size	correct_results, 2560
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8f5112331..a53c8b527 100644
--- a/test/torture-s/cmpsf-1.c.s
+++ b/test/torture-s/cmpsf-1.c.s
@@ -7,7 +7,7 @@
 feq:                                    # @feq
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	f32.eq  	$push0=, $0, $1
@@ -24,7 +24,7 @@ feq:                                    # @feq
 fne:                                    # @fne
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	f32.ne  	$push0=, $0, $1
@@ -41,7 +41,7 @@ fne:                                    # @fne
 flt:                                    # @flt
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	f32.lt  	$push0=, $0, $1
@@ -58,7 +58,7 @@ flt:                                    # @flt
 fge:                                    # @fge
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 140
 	i32.const	$push5=, 13
 	f32.lt  	$push0=, $0, $1
@@ -79,7 +79,7 @@ fge:                                    # @fge
 fgt:                                    # @fgt
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	f32.gt  	$push0=, $0, $1
@@ -96,7 +96,7 @@ fgt:                                    # @fgt
 fle:                                    # @fle
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 140
 	i32.const	$push5=, 13
 	f32.gt  	$push0=, $0, $1
@@ -117,7 +117,7 @@ fle:                                    # @fle
 main:                                   # @main
 	.result 	i32
 	.local  	i32, f32, i32, i32, i32, f32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$4=, correct_results
 	i32.const	$0=, 0
 .LBB6_1:                                # %for.body
@@ -127,107 +127,101 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.const	$2=, args
 	i32.const	$push35=, 2
-	i32.shl 	$push1=, $0, $pop35
+	i32.shl 	$push0=, $0, $pop35
 	i32.const	$push34=, args
-	i32.add 	$push2=, $pop1, $pop34
-	f32.load	$1=, 0($pop2)
-	i32.const	$3=, -1
+	i32.add 	$push1=, $pop0, $pop34
+	f32.load	$1=, 0($pop1)
+	i32.const	$3=, 0
 .LBB6_2:                                # %for.body3
                                         #   Parent Loop BB6_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label2:
-	i32.const	$push39=, 13
-	i32.const	$push38=, 140
-	f32.load	$push37=, 0($2)
-	tee_local	$push36=, $5=, $pop37
-	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
+	f32.load	$5=, 0($2)
+	i32.const	$push37=, 13
+	i32.const	$push36=, 140
+	f32.eq  	$push2=, $1, $5
+	i32.select	$push3=, $pop37, $pop36, $pop2
+	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=BB6_2 Depth=2
-	i32.const	$push42=, 13
-	i32.const	$push41=, 140
-	f32.ne  	$push7=, $1, $5
-	i32.select	$push8=, $pop42, $pop41, $pop7
-	i32.const	$push40=, 4
-	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
+	i32.const	$push40=, 13
+	i32.const	$push39=, 140
+	f32.ne  	$push6=, $1, $5
+	i32.select	$push7=, $pop40, $pop39, $pop6
+	i32.const	$push38=, 4
+	i32.add 	$push8=, $4, $pop38
+	i32.load	$push9=, 0($pop8)
+	i32.ne  	$push10=, $pop7, $pop9
+	br_if   	2, $pop10       # 2: down to label0
+# %bb.4:                                # %if.end10
                                         #   in Loop: Header=BB6_2 Depth=2
-	i32.const	$push47=, 13
+	f32.lt  	$6=, $1, $5
+	i32.const	$push43=, 13
+	i32.const	$push42=, 140
+	i32.select	$push11=, $pop43, $pop42, $6
+	i32.const	$push41=, 8
+	i32.add 	$push12=, $4, $pop41
+	i32.load	$push13=, 0($pop12)
+	i32.ne  	$push14=, $pop11, $pop13
+	br_if   	2, $pop14       # 2: down to label0
+# %bb.5:                                # %if.end15
+                                        #   in Loop: Header=BB6_2 Depth=2
+	f32.ne  	$push16=, $1, $1
+	f32.ne  	$push15=, $5, $5
+	i32.or  	$7=, $pop16, $pop15
 	i32.const	$push46=, 140
-	f32.lt  	$push45=, $1, $5
-	tee_local	$push44=, $6=, $pop45
-	i32.select	$push12=, $pop47, $pop46, $pop44
-	i32.const	$push43=, 8
-	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
+	i32.const	$push45=, 13
+	i32.or  	$push17=, $6, $7
+	i32.select	$push18=, $pop46, $pop45, $pop17
+	i32.const	$push44=, 12
+	i32.add 	$push19=, $4, $pop44
+	i32.load	$push20=, 0($pop19)
+	i32.ne  	$push21=, $pop18, $pop20
+	br_if   	2, $pop21       # 2: down to label0
+# %bb.6:                                # %if.end20
+                                        #   in Loop: Header=BB6_2 Depth=2
+	f32.gt  	$6=, $1, $5
+	i32.const	$push49=, 13
+	i32.const	$push48=, 140
+	i32.select	$push22=, $pop49, $pop48, $6
+	i32.const	$push47=, 16
+	i32.add 	$push23=, $4, $pop47
+	i32.load	$push24=, 0($pop23)
+	i32.ne  	$push25=, $pop22, $pop24
+	br_if   	2, $pop25       # 2: down to label0
+# %bb.7:                                # %if.end25
                                         #   in Loop: Header=BB6_2 Depth=2
 	i32.const	$push52=, 140
 	i32.const	$push51=, 13
-	f32.ne  	$push17=, $1, $1
-	f32.ne  	$push16=, $5, $5
-	i32.or  	$push50=, $pop17, $pop16
-	tee_local	$push49=, $7=, $pop50
-	i32.or  	$push18=, $6, $pop49
-	i32.select	$push19=, $pop52, $pop51, $pop18
-	i32.const	$push48=, 12
-	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	$push23=, $pop57, $pop56, $pop54
-	i32.const	$push53=, 16
-	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  	$push27=, $6, $7
-	i32.select	$push28=, $pop60, $pop59, $pop27
-	i32.const	$push58=, 20
-	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
+	i32.or  	$push26=, $6, $7
+	i32.select	$push27=, $pop52, $pop51, $pop26
+	i32.const	$push50=, 20
+	i32.add 	$push28=, $4, $pop50
+	i32.load	$push29=, 0($pop28)
+	i32.ne  	$push30=, $pop27, $pop29
+	br_if   	2, $pop30       # 2: down to label0
+# %bb.8:                                # %if.end30
                                         #   in Loop: Header=BB6_2 Depth=2
-	i32.const	$push66=, 24
-	i32.add 	$4=, $4, $pop66
-	i32.const	$push65=, 4
-	i32.add 	$2=, $2, $pop65
-	i32.const	$push64=, 1
-	i32.add 	$push63=, $3, $pop64
-	tee_local	$push62=, $3=, $pop63
-	i32.const	$push61=, 7
-	i32.lt_u	$push32=, $pop62, $pop61
-	br_if   	0, $pop32       # 0: up to label2
-# BB#9:                                 # %for.end
+	i32.const	$push56=, 24
+	i32.add 	$4=, $4, $pop56
+	i32.const	$push55=, 4
+	i32.add 	$2=, $2, $pop55
+	i32.const	$push54=, 1
+	i32.add 	$3=, $3, $pop54
+	i32.const	$push53=, 8
+	i32.lt_u	$push31=, $3, $pop53
+	br_if   	0, $pop31       # 0: up to label2
+# %bb.9:                                # %for.end
                                         #   in Loop: Header=BB6_1 Depth=1
 	end_loop
-	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
+	i32.const	$push58=, 1
+	i32.add 	$0=, $0, $pop58
+	i32.const	$push57=, 8
+	i32.lt_u	$push32=, $0, $pop57
+	br_if   	0, $pop32       # 0: up to label1
+# %bb.10:                               # %for.end33
 	end_loop
 	i32.const	$push33=, 0
 	call    	exit@FUNCTION, $pop33
@@ -649,6 +643,6 @@ correct_results:
 	.size	correct_results, 1536
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 05795d2b2..900585c9e 100644
--- a/test/torture-s/cmpsi-1.c.s
+++ b/test/torture-s/cmpsi-1.c.s
@@ -7,14 +7,13 @@
 f1:                                     # @f1
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.sub 	$0=, $0, $1
 	block   	
-	i32.sub 	$push3=, $0, $1
-	tee_local	$push2=, $0=, $pop3
 	i32.const	$push0=, 0
-	i32.ge_s	$push1=, $pop2, $pop0
+	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end3
+# %bb.1:                                # %if.end3
 	return  	$0
 .LBB0_2:                                # %if.then2
 	end_block                       # label0:
@@ -31,14 +30,13 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.sub 	$0=, $0, $1
 	block   	
-	i32.sub 	$push3=, $0, $1
-	tee_local	$push2=, $0=, $pop3
 	i32.const	$push0=, 0
-	i32.ge_s	$push1=, $pop2, $pop0
+	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end3
+# %bb.1:                                # %if.end3
 	return  	$0
 .LBB1_2:                                # %if.then2
 	end_block                       # label1:
@@ -55,7 +53,7 @@ f2:                                     # @f2
 dummy:                                  # @dummy
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -68,7 +66,7 @@ dummy:                                  # @dummy
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -77,6 +75,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9bdf4825b..10551a6c6 100644
--- a/test/torture-s/cmpsi-2.c.s
+++ b/test/torture-s/cmpsi-2.c.s
@@ -7,7 +7,7 @@
 feq:                                    # @feq
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i32.eq  	$push0=, $0, $1
@@ -24,7 +24,7 @@ feq:                                    # @feq
 fne:                                    # @fne
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i32.eq  	$push0=, $0, $1
@@ -41,7 +41,7 @@ fne:                                    # @fne
 flt:                                    # @flt
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i32.lt_s	$push0=, $0, $1
@@ -58,7 +58,7 @@ flt:                                    # @flt
 fge:                                    # @fge
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i32.lt_s	$push0=, $0, $1
@@ -75,7 +75,7 @@ fge:                                    # @fge
 fgt:                                    # @fgt
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i32.gt_s	$push0=, $0, $1
@@ -92,7 +92,7 @@ fgt:                                    # @fgt
 fle:                                    # @fle
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i32.gt_s	$push0=, $0, $1
@@ -109,7 +109,7 @@ fle:                                    # @fle
 fltu:                                   # @fltu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i32.lt_u	$push0=, $0, $1
@@ -126,7 +126,7 @@ fltu:                                   # @fltu
 fgeu:                                   # @fgeu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i32.lt_u	$push0=, $0, $1
@@ -143,7 +143,7 @@ fgeu:                                   # @fgeu
 fgtu:                                   # @fgtu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i32.gt_u	$push0=, $0, $1
@@ -160,7 +160,7 @@ fgtu:                                   # @fgtu
 fleu:                                   # @fleu
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i32.gt_u	$push0=, $0, $1
@@ -177,7 +177,7 @@ fleu:                                   # @fleu
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$4=, correct_results
 	i32.const	$0=, 0
 .LBB10_1:                               # %for.body
@@ -187,145 +187,137 @@ main:                                   # @main
 	loop    	                # label1:
 	i32.const	$2=, args
 	i32.const	$push45=, 2
-	i32.shl 	$push1=, $0, $pop45
+	i32.shl 	$push0=, $0, $pop45
 	i32.const	$push44=, args
-	i32.add 	$push2=, $pop1, $pop44
-	i32.load	$1=, 0($pop2)
-	i32.const	$3=, -1
+	i32.add 	$push1=, $pop0, $pop44
+	i32.load	$1=, 0($pop1)
+	i32.const	$3=, 0
 .LBB10_2:                               # %for.body3
                                         #   Parent Loop BB10_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label2:
-	i32.const	$push51=, 13
+	i32.load	$5=, 0($2)
+	i32.eq  	$6=, $1, $5
+	i32.const	$push47=, 13
+	i32.const	$push46=, 140
+	i32.select	$push2=, $pop47, $pop46, $6
+	i32.load	$push3=, 0($4)
+	i32.ne  	$push4=, $pop2, $pop3
+	br_if   	2, $pop4        # 2: down to label0
+# %bb.3:                                # %if.end
+                                        #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push50=, 140
-	i32.load	$push49=, 0($2)
-	tee_local	$push48=, $5=, $pop49
-	i32.eq  	$push47=, $1, $pop48
-	tee_local	$push46=, $6=, $pop47
-	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
+	i32.const	$push49=, 13
+	i32.select	$push5=, $pop50, $pop49, $6
+	i32.const	$push48=, 4
+	i32.add 	$push6=, $4, $pop48
+	i32.load	$push7=, 0($pop6)
+	i32.ne  	$push8=, $pop5, $pop7
+	br_if   	2, $pop8        # 2: down to label0
+# %bb.4:                                # %if.end10
                                         #   in Loop: Header=BB10_2 Depth=2
-	i32.const	$push54=, 140
+	i32.lt_s	$6=, $1, $5
 	i32.const	$push53=, 13
-	i32.select	$push6=, $pop54, $pop53, $6
-	i32.const	$push52=, 4
-	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
+	i32.const	$push52=, 140
+	i32.select	$push9=, $pop53, $pop52, $6
+	i32.const	$push51=, 8
+	i32.add 	$push10=, $4, $pop51
+	i32.load	$push11=, 0($pop10)
+	i32.ne  	$push12=, $pop9, $pop11
+	br_if   	2, $pop12       # 2: down to label0
+# %bb.5:                                # %if.end15
+                                        #   in Loop: Header=BB10_2 Depth=2
+	i32.const	$push56=, 140
+	i32.const	$push55=, 13
+	i32.select	$push13=, $pop56, $pop55, $6
+	i32.const	$push54=, 12
+	i32.add 	$push14=, $4, $pop54
+	i32.load	$push15=, 0($pop14)
+	i32.ne  	$push16=, $pop13, $pop15
+	br_if   	2, $pop16       # 2: down to label0
+# %bb.6:                                # %if.end20
                                         #   in Loop: Header=BB10_2 Depth=2
+	i32.gt_s	$6=, $1, $5
 	i32.const	$push59=, 13
 	i32.const	$push58=, 140
-	i32.lt_s	$push57=, $1, $5
-	tee_local	$push56=, $6=, $pop57
-	i32.select	$push10=, $pop59, $pop58, $pop56
-	i32.const	$push55=, 8
-	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
+	i32.select	$push17=, $pop59, $pop58, $6
+	i32.const	$push57=, 16
+	i32.add 	$push18=, $4, $pop57
+	i32.load	$push19=, 0($pop18)
+	i32.ne  	$push20=, $pop17, $pop19
+	br_if   	2, $pop20       # 2: down to label0
+# %bb.7:                                # %if.end25
                                         #   in Loop: Header=BB10_2 Depth=2
 	i32.const	$push62=, 140
 	i32.const	$push61=, 13
-	i32.select	$push14=, $pop62, $pop61, $6
-	i32.const	$push60=, 12
-	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
+	i32.select	$push21=, $pop62, $pop61, $6
+	i32.const	$push60=, 20
+	i32.add 	$push22=, $4, $pop60
+	i32.load	$push23=, 0($pop22)
+	i32.ne  	$push24=, $pop21, $pop23
+	br_if   	2, $pop24       # 2: down to label0
+# %bb.8:                                # %if.end30
+                                        #   in Loop: Header=BB10_2 Depth=2
+	i32.lt_u	$6=, $1, $5
+	i32.const	$push65=, 13
+	i32.const	$push64=, 140
+	i32.select	$push25=, $pop65, $pop64, $6
+	i32.const	$push63=, 24
+	i32.add 	$push26=, $4, $pop63
+	i32.load	$push27=, 0($pop26)
+	i32.ne  	$push28=, $pop25, $pop27
+	br_if   	2, $pop28       # 2: down to label0
+# %bb.9:                                # %if.end35
                                         #   in Loop: Header=BB10_2 Depth=2
+	i32.const	$push68=, 140
 	i32.const	$push67=, 13
-	i32.const	$push66=, 140
-	i32.gt_s	$push65=, $1, $5
-	tee_local	$push64=, $6=, $pop65
-	i32.select	$push18=, $pop67, $pop66, $pop64
-	i32.const	$push63=, 16
-	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
+	i32.select	$push29=, $pop68, $pop67, $6
+	i32.const	$push66=, 28
+	i32.add 	$push30=, $4, $pop66
+	i32.load	$push31=, 0($pop30)
+	i32.ne  	$push32=, $pop29, $pop31
+	br_if   	2, $pop32       # 2: down to label0
+# %bb.10:                               # %if.end40
                                         #   in Loop: Header=BB10_2 Depth=2
+	i32.gt_u	$5=, $1, $5
+	i32.const	$push71=, 13
 	i32.const	$push70=, 140
-	i32.const	$push69=, 13
-	i32.select	$push22=, $pop70, $pop69, $6
-	i32.const	$push68=, 20
-	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
+	i32.select	$push33=, $pop71, $pop70, $5
+	i32.const	$push69=, 32
+	i32.add 	$push34=, $4, $pop69
+	i32.load	$push35=, 0($pop34)
+	i32.ne  	$push36=, $pop33, $pop35
+	br_if   	2, $pop36       # 2: down to label0
+# %bb.11:                               # %if.end45
                                         #   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	$push26=, $pop75, $pop74, $pop72
-	i32.const	$push71=, 24
-	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	$push30=, $pop78, $pop77, $6
-	i32.const	$push76=, 28
-	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	$push34=, $pop83, $pop82, $pop80
-	i32.const	$push79=, 32
-	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	$push38=, $pop86, $pop85, $5
-	i32.const	$push84=, 36
-	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
+	i32.const	$push73=, 13
+	i32.select	$push37=, $pop74, $pop73, $5
+	i32.const	$push72=, 36
+	i32.add 	$push38=, $4, $pop72
+	i32.load	$push39=, 0($pop38)
+	i32.ne  	$push40=, $pop37, $pop39
+	br_if   	2, $pop40       # 2: down to label0
+# %bb.12:                               # %if.end50
                                         #   in Loop: Header=BB10_2 Depth=2
-	i32.const	$push92=, 40
-	i32.add 	$4=, $4, $pop92
-	i32.const	$push91=, 4
-	i32.add 	$2=, $2, $pop91
-	i32.const	$push90=, 1
-	i32.add 	$push89=, $3, $pop90
-	tee_local	$push88=, $3=, $pop89
-	i32.const	$push87=, 7
-	i32.lt_u	$push42=, $pop88, $pop87
-	br_if   	0, $pop42       # 0: up to label2
-# BB#13:                                # %for.end
+	i32.const	$push78=, 40
+	i32.add 	$4=, $4, $pop78
+	i32.const	$push77=, 4
+	i32.add 	$2=, $2, $pop77
+	i32.const	$push76=, 1
+	i32.add 	$3=, $3, $pop76
+	i32.const	$push75=, 8
+	i32.lt_u	$push41=, $3, $pop75
+	br_if   	0, $pop41       # 0: up to label2
+# %bb.13:                               # %for.end
                                         #   in Loop: Header=BB10_1 Depth=1
 	end_loop
-	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
+	i32.const	$push80=, 1
+	i32.add 	$0=, $0, $pop80
+	i32.const	$push79=, 8
+	i32.lt_u	$push42=, $0, $pop79
+	br_if   	0, $pop42       # 0: up to label1
+# %bb.14:                               # %for.end53
 	end_loop
 	i32.const	$push43=, 0
 	call    	exit@FUNCTION, $pop43
@@ -1003,6 +995,6 @@ correct_results:
 	.size	correct_results, 2560
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8ba7427c2..b42762428 100644
--- a/test/torture-s/compare-1.c.s
+++ b/test/torture-s/compare-1.c.s
@@ -7,30 +7,29 @@
 ieq:                                    # @ieq
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.ne  	$0=, $0, $1
 	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 label3
-# BB#1:                                 # %if.else
+	i32.eqz 	$push0=, $0
+	br_if   	0, $pop0        # 0: down to label3
+# %bb.1:                                # %if.else
 	br_if   	2, $2           # 2: down to label1
 	br      	1               # 1: down to label2
 .LBB0_2:                                # %if.then
 	end_block                       # label3:
-	i32.eqz 	$push3=, $2
-	br_if   	1, $pop3        # 1: down to label1
+	i32.eqz 	$push1=, $2
+	br_if   	1, $pop1        # 1: down to label1
 .LBB0_3:                                # %if.end6
 	end_block                       # label2:
 	block   	
 	block   	
 	br_if   	0, $0           # 0: down to label5
-# BB#4:                                 # %if.then10
-	i32.eqz 	$push4=, $2
-	br_if   	2, $pop4        # 2: down to label1
+# %bb.4:                                # %if.then10
+	i32.eqz 	$push2=, $2
+	br_if   	2, $pop2        # 2: down to label1
 	br      	1               # 1: down to label4
 .LBB0_5:                                # %if.else14
 	end_block                       # label5:
@@ -39,35 +38,35 @@ ieq:                                    # @ieq
 	end_block                       # label4:
 	block   	
 	block   	
-	i32.eqz 	$push5=, $0
-	br_if   	0, $pop5        # 0: down to label7
-# BB#7:                                 # %if.else26
+	i32.eqz 	$push3=, $0
+	br_if   	0, $pop3        # 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
+	i32.eqz 	$push4=, $2
+	br_if   	1, $pop4        # 1: down to label1
 .LBB0_9:                                # %if.end30
 	end_block                       # label6:
 	block   	
 	br_if   	0, $0           # 0: down to label8
-# BB#10:                                # %if.then34
-	i32.eqz 	$push7=, $2
-	br_if   	1, $pop7        # 1: down to label1
+# %bb.10:                               # %if.then34
+	i32.eqz 	$push5=, $2
+	br_if   	1, $pop5        # 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
+	i32.eqz 	$push6=, $2
+	br_if   	1, $pop6        # 1: down to label0
 .LBB0_12:                               # %if.then2
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_13:                               # %if.end42
 	end_block                       # label0:
-	copy_local	$push9=, $2
-                                        # fallthrough-return: $pop9
+	copy_local	$push7=, $2
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end0:
 	.size	ieq, .Lfunc_end0-ieq
@@ -79,13 +78,13 @@ ieq:                                    # @ieq
 ine:                                    # @ine
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.ne  	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label11
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.eqz 	$push1=, $2
 	br_if   	1, $pop1        # 1: down to label10
 	br      	2               # 2: down to label9
@@ -111,13 +110,13 @@ ine:                                    # @ine
 ilt:                                    # @ilt
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.ge_s	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label14
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $2           # 1: down to label13
 	br      	2               # 2: down to label12
 .LBB2_2:                                # %if.else
@@ -141,13 +140,13 @@ ilt:                                    # @ilt
 ile:                                    # @ile
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.le_s	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label17
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.eqz 	$push1=, $2
 	br_if   	1, $pop1        # 1: down to label16
 	br      	2               # 2: down to label15
@@ -173,13 +172,13 @@ ile:                                    # @ile
 igt:                                    # @igt
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.le_s	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label20
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	br_if   	1, $2           # 1: down to label19
 	br      	2               # 2: down to label18
 .LBB4_2:                                # %if.else
@@ -203,13 +202,13 @@ igt:                                    # @igt
 ige:                                    # @ige
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.ge_s	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label23
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.eqz 	$push1=, $2
 	br_if   	1, $pop1        # 1: down to label22
 	br      	2               # 2: down to label21
@@ -234,7 +233,7 @@ ige:                                    # @ige
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -242,5 +241,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end6-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/compare-2.c.s b/test/torture-s/compare-2.c.s
index 6362c88a4..69b7ee68c 100644
--- a/test/torture-s/compare-2.c.s
+++ b/test/torture-s/compare-2.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.ge_u	$push1=, $0, $1
 	i32.le_s	$push0=, $0, $1
 	i32.and 	$push2=, $pop1, $pop0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -30,4 +30,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/compare-3.c.s b/test/torture-s/compare-3.c.s
index 76278182d..22d0e6d06 100644
--- a/test/torture-s/compare-3.c.s
+++ b/test/torture-s/compare-3.c.s
@@ -6,7 +6,7 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -30,7 +30,7 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -42,7 +42,7 @@ test3:                                  # @test3
 	.type	test4,@function
 test4:                                  # @test4
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -54,7 +54,7 @@ test4:                                  # @test4
 	.type	test5,@function
 test5:                                  # @test5
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
@@ -66,7 +66,7 @@ test5:                                  # @test5
 	.type	test6,@function
 test6:                                  # @test6
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -78,7 +78,7 @@ test6:                                  # @test6
 	.type	all_tests,@function
 all_tests:                              # @all_tests
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -90,7 +90,7 @@ all_tests:                              # @all_tests
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -98,4 +98,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end7-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/complex-1.c.s b/test/torture-s/complex-1.c.s
index 814659fc2..7e85d8d77 100644
--- a/test/torture-s/complex-1.c.s
+++ b/test/torture-s/complex-1.c.s
@@ -7,7 +7,7 @@
 g0:                                     # @g0
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x1p0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ g0:                                     # @g0
 g1:                                     # @g1
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, -0x1p0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ g1:                                     # @g1
 g2:                                     # @g2
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x0p0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -48,7 +48,7 @@ g2:                                     # @g2
 	.type	xcexp,@function
 xcexp:                                  # @xcexp
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	8($0), $pop0
 	i64.const	$push1=, -4616189618054758400
@@ -64,7 +64,7 @@ xcexp:                                  # @xcexp
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end5
+# %bb.0:                                # %if.end5
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -73,5 +73,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-2.c.s b/test/torture-s/complex-2.c.s
index 120891cc5..ba105fe5f 100644
--- a/test/torture-s/complex-2.c.s
+++ b/test/torture-s/complex-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.load	$push1=, 0($2)
 	f64.load	$push0=, 0($1)
 	f64.add 	$push2=, $pop1, $pop0
@@ -26,20 +26,20 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push6=, 0
 	f64.load	$push1=, ag($pop6)
 	f64.const	$push5=, 0x1p0
 	f64.ne  	$push2=, $pop1, $pop5
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push8=, 0
 	f64.load	$push0=, ag+8($pop8)
 	f64.const	$push7=, 0x1p0
 	f64.ne  	$push3=, $pop0, $pop7
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end25
+# %bb.2:                                # %if.end25
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -72,6 +72,6 @@ bg:
 	.size	bg, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 68239cb1c..cb04f264a 100644
--- a/test/torture-s/complex-3.c.s
+++ b/test/torture-s/complex-3.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, f32, f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.store	4($0), $2
 	f32.store	0($0), $1
                                         # fallthrough-return
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-4.c.s b/test/torture-s/complex-4.c.s
index d29b7ec91..c2030b69c 100644
--- a/test/torture-s/complex-4.c.s
+++ b/test/torture-s/complex-4.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/complex-5.c.s b/test/torture-s/complex-5.c.s
index de353198f..59cce1285 100644
--- a/test/torture-s/complex-5.c.s
+++ b/test/torture-s/complex-5.c.s
@@ -6,7 +6,7 @@
 	.type	p,@function
 p:                                      # @p
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.load	$push1=, 0($1)
 	f32.load	$push0=, 0($2)
 	f32.add 	$push2=, $pop1, $pop0
@@ -27,32 +27,27 @@ p:                                      # @p
 main:                                   # @main
 	.result 	i32
 	.local  	f32, f32, f32, f32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push40=, $pop15, $pop17
-	tee_local	$push39=, $4=, $pop40
-	i32.store	__stack_pointer($pop18), $pop39
-	i32.const	$push38=, 0
-	i32.const	$push37=, 0
-	f32.load	$push36=, x($pop37)
-	tee_local	$push35=, $0=, $pop36
-	i32.const	$push34=, 0
-	f32.load	$push2=, y($pop34)
-	f32.add 	$push33=, $pop35, $pop2
-	tee_local	$push32=, $1=, $pop33
-	f32.store	z($pop38), $pop32
-	i32.const	$push31=, 0
+	i32.sub 	$4=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $4
 	i32.const	$push30=, 0
-	f32.load	$push29=, x+4($pop30)
-	tee_local	$push28=, $2=, $pop29
+	f32.load	$0=, x($pop30)
+	i32.const	$push29=, 0
+	f32.load	$push2=, y($pop29)
+	f32.add 	$1=, $0, $pop2
+	i32.const	$push28=, 0
+	f32.store	z($pop28), $1
 	i32.const	$push27=, 0
-	f32.load	$push3=, y+4($pop27)
-	f32.add 	$push26=, $pop28, $pop3
-	tee_local	$push25=, $3=, $pop26
-	f32.store	z+4($pop31), $pop25
+	f32.load	$2=, x+4($pop27)
+	i32.const	$push26=, 0
+	f32.load	$push3=, y+4($pop26)
+	f32.add 	$3=, $2, $pop3
+	i32.const	$push25=, 0
+	f32.store	z+4($pop25), $3
 	i32.const	$push19=, 8
 	i32.add 	$push20=, $4, $pop19
 	f32.const	$push5=, 0x1p0
@@ -73,14 +68,14 @@ main:                                   # @main
 	f32.load	$push10=, w($pop21)
 	f32.ne  	$push12=, $pop11, $pop10
 	br_if   	0, $pop12       # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push42=, 0
-	f32.load	$push0=, z+4($pop42)
-	i32.const	$push41=, 0
-	f32.load	$push1=, w+4($pop41)
+# %bb.1:                                # %entry
+	i32.const	$push32=, 0
+	f32.load	$push0=, z+4($pop32)
+	i32.const	$push31=, 0
+	f32.load	$push1=, w+4($pop31)
 	f32.ne  	$push13=, $pop0, $pop1
 	br_if   	0, $pop13       # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push14=, 0
 	call    	exit@FUNCTION, $pop14
 	unreachable
@@ -132,7 +127,7 @@ z:
 	.size	z, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0589cb770..05984825a 100644
--- a/test/torture-s/complex-6.c.s
+++ b/test/torture-s/complex-6.c.s
@@ -6,7 +6,7 @@
 	.type	ctest_float,@function
 ctest_float:                            # @ctest_float
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
 	f32.load	$push1=, 4($1)
@@ -22,7 +22,7 @@ ctest_float:                            # @ctest_float
 	.globl	test_float
 	.type	test_float,@function
 test_float:                             # @test_float
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -34,7 +34,7 @@ test_float:                             # @test_float
 	.type	ctest_double,@function
 ctest_double:                           # @ctest_double
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	f64.load	$push1=, 8($1)
@@ -50,7 +50,7 @@ ctest_double:                           # @ctest_double
 	.globl	test_double
 	.type	test_double,@function
 test_double:                            # @test_double
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -63,14 +63,13 @@ test_double:                            # @test_double
 ctest_long_double:                      # @ctest_long_double
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
-	i32.const	$push16=, 0
-	i32.load	$push15=, __stack_pointer($pop16)
-	i32.const	$push17=, 16
-	i32.sub 	$push26=, $pop15, $pop17
-	tee_local	$push25=, $2=, $pop26
-	i32.store	__stack_pointer($pop18), $pop25
+# %bb.0:                                # %entry
+	i32.const	$push15=, 0
+	i32.load	$push14=, __stack_pointer($pop15)
+	i32.const	$push16=, 16
+	i32.sub 	$2=, $pop14, $pop16
+	i32.const	$push17=, 0
+	i32.store	__stack_pointer($pop17), $2
 	i64.const	$push5=, 0
 	i64.const	$push4=, -9223372036854775808
 	i64.load	$push3=, 16($1)
@@ -81,23 +80,21 @@ ctest_long_double:                      # @ctest_long_double
 	i64.load	$push6=, 0($1)
 	i64.store	0($0), $pop6
 	i32.const	$push7=, 8
-	i32.add 	$push8=, $0, $pop7
-	i32.const	$push24=, 8
-	i32.add 	$push9=, $1, $pop24
-	i64.load	$push10=, 0($pop9)
-	i64.store	0($pop8), $pop10
-	i32.const	$push23=, 24
-	i32.add 	$push11=, $0, $pop23
-	i32.const	$push22=, 8
-	i32.add 	$push12=, $2, $pop22
-	i64.load	$push13=, 0($pop12)
-	i64.store	0($pop11), $pop13
-	i64.load	$push14=, 0($2)
-	i64.store	16($0), $pop14
-	i32.const	$push21=, 0
-	i32.const	$push19=, 16
-	i32.add 	$push20=, $2, $pop19
-	i32.store	__stack_pointer($pop21), $pop20
+	i32.add 	$push8=, $1, $pop7
+	i64.load	$push9=, 0($pop8)
+	i64.store	8($0), $pop9
+	i32.const	$push22=, 24
+	i32.add 	$push10=, $0, $pop22
+	i32.const	$push21=, 8
+	i32.add 	$push11=, $2, $pop21
+	i64.load	$push12=, 0($pop11)
+	i64.store	0($pop10), $pop12
+	i64.load	$push13=, 0($2)
+	i64.store	16($0), $pop13
+	i32.const	$push20=, 0
+	i32.const	$push18=, 16
+	i32.add 	$push19=, $2, $pop18
+	i32.store	__stack_pointer($pop20), $pop19
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
@@ -108,7 +105,7 @@ ctest_long_double:                      # @ctest_long_double
 	.globl	test_long_double
 	.type	test_long_double,@function
 test_long_double:                       # @test_long_double
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -120,7 +117,7 @@ test_long_double:                       # @test_long_double
 	.type	ctest_int,@function
 ctest_int:                              # @ctest_int
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
 	i32.const	$push2=, 0
@@ -137,7 +134,7 @@ ctest_int:                              # @ctest_int
 	.globl	test_int
 	.type	test_int,@function
 test_int:                               # @test_int
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end7:
@@ -149,7 +146,7 @@ test_int:                               # @test_int
 	.type	ctest_long_int,@function
 ctest_long_int:                         # @ctest_long_int
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
 	i32.const	$push2=, 0
@@ -166,7 +163,7 @@ ctest_long_int:                         # @ctest_long_int
 	.globl	test_long_int
 	.type	test_long_int,@function
 test_long_int:                          # @test_long_int
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
@@ -178,7 +175,7 @@ test_long_int:                          # @test_long_int
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	err($pop0), $pop2
@@ -198,4 +195,4 @@ err:
 	.size	err, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/complex-7.c.s b/test/torture-s/complex-7.c.s
index 8164539f2..d65973b6a 100644
--- a/test/torture-s/complex-7.c.s
+++ b/test/torture-s/complex-7.c.s
@@ -7,7 +7,7 @@
 check_float:                            # @check_float
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	f32, f32, f32, f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	f32.load	$8=, f1($pop0)
 	f32.load	$9=, 0($1)
@@ -17,10 +17,10 @@ check_float:                            # @check_float
 	block   	
 	f32.ne  	$push1=, $9, $8
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f32.ne  	$push2=, $6, $7
 	br_if   	0, $pop2        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.const	$push3=, 0
 	f32.load	$8=, f2($pop3)
 	f32.load	$9=, 0($2)
@@ -29,10 +29,10 @@ check_float:                            # @check_float
 	f32.load	$7=, f2+4($pop16)
 	f32.ne  	$push4=, $9, $8
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false
+# %bb.3:                                # %lor.lhs.false
 	f32.ne  	$push5=, $6, $7
 	br_if   	0, $pop5        # 0: down to label0
-# BB#4:                                 # %lor.lhs.false4
+# %bb.4:                                # %lor.lhs.false4
 	i32.const	$push6=, 0
 	f32.load	$8=, f3($pop6)
 	f32.load	$9=, 0($3)
@@ -41,10 +41,10 @@ check_float:                            # @check_float
 	f32.load	$7=, f3+4($pop17)
 	f32.ne  	$push7=, $9, $8
 	br_if   	0, $pop7        # 0: down to label0
-# BB#5:                                 # %lor.lhs.false4
+# %bb.5:                                # %lor.lhs.false4
 	f32.ne  	$push8=, $6, $7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#6:                                 # %lor.lhs.false8
+# %bb.6:                                # %lor.lhs.false8
 	i32.const	$push9=, 0
 	f32.load	$8=, f4($pop9)
 	f32.load	$9=, 0($4)
@@ -53,10 +53,10 @@ check_float:                            # @check_float
 	f32.load	$7=, f4+4($pop18)
 	f32.ne  	$push10=, $9, $8
 	br_if   	0, $pop10       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false8
+# %bb.7:                                # %lor.lhs.false8
 	f32.ne  	$push11=, $6, $7
 	br_if   	0, $pop11       # 0: down to label0
-# BB#8:                                 # %lor.lhs.false12
+# %bb.8:                                # %lor.lhs.false12
 	i32.const	$push12=, 0
 	f32.load	$8=, f5($pop12)
 	f32.load	$9=, 0($5)
@@ -65,10 +65,10 @@ check_float:                            # @check_float
 	f32.load	$7=, f5+4($pop19)
 	f32.ne  	$push13=, $9, $8
 	br_if   	0, $pop13       # 0: down to label0
-# BB#9:                                 # %lor.lhs.false12
+# %bb.9:                                # %lor.lhs.false12
 	f32.ne  	$push14=, $6, $7
 	br_if   	0, $pop14       # 0: down to label0
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	return
 .LBB0_11:                               # %if.then
 	end_block                       # label0:
@@ -85,7 +85,7 @@ check_float:                            # @check_float
 check_double:                           # @check_double
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	f64, f64, f64, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	f64.load	$8=, d1($pop0)
 	f64.load	$9=, 0($1)
@@ -95,10 +95,10 @@ check_double:                           # @check_double
 	block   	
 	f64.ne  	$push1=, $9, $8
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.ne  	$push2=, $6, $7
 	br_if   	0, $pop2        # 0: down to label1
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.const	$push3=, 0
 	f64.load	$8=, d2($pop3)
 	f64.load	$9=, 0($2)
@@ -107,10 +107,10 @@ check_double:                           # @check_double
 	f64.load	$7=, d2+8($pop16)
 	f64.ne  	$push4=, $9, $8
 	br_if   	0, $pop4        # 0: down to label1
-# BB#3:                                 # %lor.lhs.false
+# %bb.3:                                # %lor.lhs.false
 	f64.ne  	$push5=, $6, $7
 	br_if   	0, $pop5        # 0: down to label1
-# BB#4:                                 # %lor.lhs.false4
+# %bb.4:                                # %lor.lhs.false4
 	i32.const	$push6=, 0
 	f64.load	$8=, d3($pop6)
 	f64.load	$9=, 0($3)
@@ -119,10 +119,10 @@ check_double:                           # @check_double
 	f64.load	$7=, d3+8($pop17)
 	f64.ne  	$push7=, $9, $8
 	br_if   	0, $pop7        # 0: down to label1
-# BB#5:                                 # %lor.lhs.false4
+# %bb.5:                                # %lor.lhs.false4
 	f64.ne  	$push8=, $6, $7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#6:                                 # %lor.lhs.false8
+# %bb.6:                                # %lor.lhs.false8
 	i32.const	$push9=, 0
 	f64.load	$8=, d4($pop9)
 	f64.load	$9=, 0($4)
@@ -131,10 +131,10 @@ check_double:                           # @check_double
 	f64.load	$7=, d4+8($pop18)
 	f64.ne  	$push10=, $9, $8
 	br_if   	0, $pop10       # 0: down to label1
-# BB#7:                                 # %lor.lhs.false8
+# %bb.7:                                # %lor.lhs.false8
 	f64.ne  	$push11=, $6, $7
 	br_if   	0, $pop11       # 0: down to label1
-# BB#8:                                 # %lor.lhs.false12
+# %bb.8:                                # %lor.lhs.false12
 	i32.const	$push12=, 0
 	f64.load	$8=, d5($pop12)
 	f64.load	$9=, 0($5)
@@ -143,10 +143,10 @@ check_double:                           # @check_double
 	f64.load	$7=, d5+8($pop19)
 	f64.ne  	$push13=, $9, $8
 	br_if   	0, $pop13       # 0: down to label1
-# BB#9:                                 # %lor.lhs.false12
+# %bb.9:                                # %lor.lhs.false12
 	f64.ne  	$push14=, $6, $7
 	br_if   	0, $pop14       # 0: down to label1
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	return
 .LBB1_11:                               # %if.then
 	end_block                       # label1:
@@ -163,7 +163,7 @@ check_double:                           # @check_double
 check_long_double:                      # @check_long_double
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i64, i64, i64, i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $1, $pop0
 	i64.load	$7=, 0($pop1)
@@ -183,10 +183,10 @@ check_long_double:                      # @check_long_double
 	i64.load	$6=, ld1+16($pop35)
 	block   	
 	br_if   	0, $10          # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.call	$push6=, __netf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop6        # 0: down to label2
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.const	$push7=, 8
 	i32.add 	$push8=, $2, $pop7
 	i64.load	$7=, 0($pop8)
@@ -205,10 +205,10 @@ check_long_double:                      # @check_long_double
 	i32.const	$push38=, 0
 	i64.load	$6=, ld2+16($pop38)
 	br_if   	0, $1           # 0: down to label2
-# BB#3:                                 # %lor.lhs.false
+# %bb.3:                                # %lor.lhs.false
 	i32.call	$push13=, __netf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop13       # 0: down to label2
-# BB#4:                                 # %lor.lhs.false4
+# %bb.4:                                # %lor.lhs.false4
 	i32.const	$push14=, 8
 	i32.add 	$push15=, $3, $pop14
 	i64.load	$7=, 0($pop15)
@@ -227,10 +227,10 @@ check_long_double:                      # @check_long_double
 	i32.const	$push41=, 0
 	i64.load	$6=, ld3+16($pop41)
 	br_if   	0, $2           # 0: down to label2
-# BB#5:                                 # %lor.lhs.false4
+# %bb.5:                                # %lor.lhs.false4
 	i32.call	$push20=, __netf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop20       # 0: down to label2
-# BB#6:                                 # %lor.lhs.false8
+# %bb.6:                                # %lor.lhs.false8
 	i32.const	$push21=, 8
 	i32.add 	$push22=, $4, $pop21
 	i64.load	$7=, 0($pop22)
@@ -249,10 +249,10 @@ check_long_double:                      # @check_long_double
 	i32.const	$push44=, 0
 	i64.load	$6=, ld4+16($pop44)
 	br_if   	0, $2           # 0: down to label2
-# BB#7:                                 # %lor.lhs.false8
+# %bb.7:                                # %lor.lhs.false8
 	i32.call	$push27=, __netf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop27       # 0: down to label2
-# BB#8:                                 # %lor.lhs.false12
+# %bb.8:                                # %lor.lhs.false12
 	i32.const	$push28=, 8
 	i32.add 	$push29=, $5, $pop28
 	i64.load	$7=, 0($pop29)
@@ -271,10 +271,10 @@ check_long_double:                      # @check_long_double
 	i32.const	$push47=, 0
 	i64.load	$6=, ld5+16($pop47)
 	br_if   	0, $2           # 0: down to label2
-# BB#9:                                 # %lor.lhs.false12
+# %bb.9:                                # %lor.lhs.false12
 	i32.call	$push34=, __eqtf2@FUNCTION, $8, $7, $6, $9
 	br_if   	0, $pop34       # 0: down to label2
-# BB#10:                                # %if.end
+# %bb.10:                               # %if.end
 	return
 .LBB2_11:                               # %if.then
 	end_block                       # label2:
@@ -291,43 +291,42 @@ check_long_double:                      # @check_long_double
 main:                                   # @main
 	.result 	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	$push75=, 0
+# %bb.0:                                # %entry
 	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.sub 	$26=, $pop72, $pop74
+	i32.const	$push75=, 0
+	i32.store	__stack_pointer($pop75), $26
 	i32.const	$push0=, 0
 	f32.load	$push1=, f1($pop0)
 	f32.store	568($26), $pop1
-	i32.const	$push206=, 0
-	f32.load	$push2=, f1+4($pop206)
+	i32.const	$push196=, 0
+	f32.load	$push2=, f1+4($pop196)
 	f32.store	572($26), $pop2
-	i32.const	$push205=, 0
-	f32.load	$push3=, f2($pop205)
+	i32.const	$push195=, 0
+	f32.load	$push3=, f2($pop195)
 	f32.store	560($26), $pop3
-	i32.const	$push204=, 0
-	f32.load	$push4=, f2+4($pop204)
+	i32.const	$push194=, 0
+	f32.load	$push4=, f2+4($pop194)
 	f32.store	564($26), $pop4
-	i32.const	$push203=, 0
-	f32.load	$push5=, f3($pop203)
+	i32.const	$push193=, 0
+	f32.load	$push5=, f3($pop193)
 	f32.store	552($26), $pop5
-	i32.const	$push202=, 0
-	f32.load	$push6=, f3+4($pop202)
+	i32.const	$push192=, 0
+	f32.load	$push6=, f3+4($pop192)
 	f32.store	556($26), $pop6
-	i32.const	$push201=, 0
-	f32.load	$push7=, f4($pop201)
+	i32.const	$push191=, 0
+	f32.load	$push7=, f4($pop191)
 	f32.store	544($26), $pop7
-	i32.const	$push200=, 0
-	f32.load	$push8=, f4+4($pop200)
+	i32.const	$push190=, 0
+	f32.load	$push8=, f4+4($pop190)
 	f32.store	548($26), $pop8
-	i32.const	$push199=, 0
-	f32.load	$push9=, f5($pop199)
+	i32.const	$push189=, 0
+	f32.load	$push9=, f5($pop189)
 	f32.store	536($26), $pop9
-	i32.const	$push198=, 0
-	f32.load	$0=, f5+4($pop198)
+	i32.const	$push188=, 0
+	f32.load	$0=, f5+4($pop188)
 	i64.load	$push10=, 568($26)
 	i64.store	280($26), $pop10
 	f32.store	540($26), $0
@@ -350,27 +349,27 @@ main:                                   # @main
 	i32.const	$push84=, 248
 	i32.add 	$push85=, $26, $pop84
 	call    	check_float@FUNCTION, $26, $pop77, $pop79, $pop81, $pop83, $pop85
-	i32.const	$push197=, 0
-	f64.load	$1=, d1($pop197)
-	i32.const	$push196=, 0
-	f64.load	$push15=, d1+8($pop196)
+	i32.const	$push187=, 0
+	f64.load	$1=, d1($pop187)
+	i32.const	$push186=, 0
+	f64.load	$push15=, d1+8($pop186)
 	f64.store	528($26), $pop15
-	i32.const	$push195=, 0
-	f64.load	$2=, d2($pop195)
-	i32.const	$push194=, 0
-	f64.load	$3=, d2+8($pop194)
-	i32.const	$push193=, 0
-	f64.load	$4=, d3($pop193)
-	i32.const	$push192=, 0
-	f64.load	$5=, d3+8($pop192)
-	i32.const	$push191=, 0
-	f64.load	$6=, d4($pop191)
-	i32.const	$push190=, 0
-	f64.load	$7=, d4+8($pop190)
-	i32.const	$push189=, 0
-	f64.load	$8=, d5($pop189)
-	i32.const	$push188=, 0
-	f64.load	$9=, d5+8($pop188)
+	i32.const	$push185=, 0
+	f64.load	$2=, d2($pop185)
+	i32.const	$push184=, 0
+	f64.load	$3=, d2+8($pop184)
+	i32.const	$push183=, 0
+	f64.load	$4=, d3($pop183)
+	i32.const	$push182=, 0
+	f64.load	$5=, d3+8($pop182)
+	i32.const	$push181=, 0
+	f64.load	$6=, d4($pop181)
+	i32.const	$push180=, 0
+	f64.load	$7=, d4+8($pop180)
+	i32.const	$push179=, 0
+	f64.load	$8=, d5($pop179)
+	i32.const	$push178=, 0
+	f64.load	$9=, d5+8($pop178)
 	i32.const	$push86=, 232
 	i32.add 	$push87=, $26, $pop86
 	i32.const	$push16=, 8
@@ -380,8 +379,8 @@ main:                                   # @main
 	f64.store	512($26), $3
 	i32.const	$push88=, 216
 	i32.add 	$push89=, $26, $pop88
-	i32.const	$push187=, 8
-	i32.add 	$push19=, $pop89, $pop187
+	i32.const	$push177=, 8
+	i32.add 	$push19=, $pop89, $pop177
 	i64.load	$push20=, 512($26)
 	i64.store	0($pop19), $pop20
 	f64.store	520($26), $1
@@ -398,24 +397,24 @@ main:                                   # @main
 	i64.store	216($26), $pop22
 	i32.const	$push90=, 200
 	i32.add 	$push91=, $26, $pop90
-	i32.const	$push186=, 8
-	i32.add 	$push23=, $pop91, $pop186
+	i32.const	$push176=, 8
+	i32.add 	$push23=, $pop91, $pop176
 	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
+	i32.const	$push175=, 8
+	i32.add 	$push26=, $pop93, $pop175
 	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
+	i32.const	$push174=, 8
+	i32.add 	$push29=, $pop95, $pop174
 	i64.load	$push30=, 464($26)
 	i64.store	0($pop29), $pop30
 	i64.load	$push31=, 456($26)
@@ -431,60 +430,56 @@ main:                                   # @main
 	i32.const	$push104=, 168
 	i32.add 	$push105=, $26, $pop104
 	call    	check_double@FUNCTION, $26, $pop97, $pop99, $pop101, $pop103, $pop105
-	i32.const	$push183=, 0
-	i64.load	$10=, ld1($pop183)
-	i32.const	$push182=, 0
-	i64.load	$11=, ld1+8($pop182)
+	i32.const	$push173=, 0
+	i64.load	$10=, ld1($pop173)
+	i32.const	$push172=, 0
+	i64.load	$11=, ld1+8($pop172)
 	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
-	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	$push34=, ld2+24($pop172)
-	i64.store	0($pop173), $pop34
+	i32.add 	$12=, $pop107, $pop32
 	i32.const	$push171=, 0
-	i64.load	$17=, ld2+16($pop171)
+	i64.load	$push33=, ld1+24($pop171)
+	i64.store	0($12), $pop33
 	i32.const	$push170=, 0
-	i64.load	$18=, ld3($pop170)
+	i64.load	$13=, ld1+16($pop170)
 	i32.const	$push169=, 0
-	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
+	i64.load	$14=, ld2($pop169)
+	i32.const	$push168=, 0
+	i64.load	$15=, ld2+8($pop168)
+	i32.const	$push108=, 384
+	i32.add 	$push109=, $26, $pop108
+	i32.const	$push167=, 24
+	i32.add 	$16=, $pop109, $pop167
+	i32.const	$push166=, 0
+	i64.load	$push34=, ld2+24($pop166)
+	i64.store	0($16), $pop34
 	i32.const	$push165=, 0
-	i64.load	$push35=, ld3+24($pop165)
-	i64.store	0($pop166), $pop35
+	i64.load	$17=, ld2+16($pop165)
 	i32.const	$push164=, 0
-	i64.load	$21=, ld3+16($pop164)
+	i64.load	$18=, ld3($pop164)
 	i32.const	$push163=, 0
-	i64.load	$22=, ld4($pop163)
-	i32.const	$push162=, 0
-	i64.load	$23=, ld4+8($pop162)
+	i64.load	$19=, ld3+8($pop163)
+	i32.const	$push110=, 352
+	i32.add 	$push111=, $26, $pop110
+	i32.const	$push162=, 24
+	i32.add 	$20=, $pop111, $pop162
+	i32.const	$push161=, 0
+	i64.load	$push35=, ld3+24($pop161)
+	i64.store	0($20), $pop35
+	i32.const	$push160=, 0
+	i64.load	$21=, ld3+16($pop160)
+	i32.const	$push159=, 0
+	i64.load	$22=, ld4($pop159)
+	i32.const	$push158=, 0
+	i64.load	$23=, ld4+8($pop158)
 	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	$push36=, ld4+24($pop158)
-	i64.store	0($pop159), $pop36
+	i32.const	$push157=, 24
+	i32.add 	$24=, $pop113, $pop157
+	i32.const	$push156=, 0
+	i64.load	$push36=, ld4+24($pop156)
+	i64.store	0($24), $pop36
 	i64.store	424($26), $11
 	i64.store	416($26), $10
 	i64.store	432($26), $13
@@ -496,25 +491,24 @@ main:                                   # @main
 	i64.store	368($26), $21
 	i64.store	328($26), $23
 	i64.store	320($26), $22
-	i32.const	$push157=, 0
-	i64.load	$push37=, ld4+16($pop157)
+	i32.const	$push155=, 0
+	i64.load	$push37=, ld4+16($pop155)
 	i64.store	336($26), $pop37
-	i32.const	$push156=, 0
-	i64.load	$push38=, ld5+8($pop156)
+	i32.const	$push154=, 0
+	i64.load	$push38=, ld5+8($pop154)
 	i64.store	296($26), $pop38
-	i32.const	$push155=, 0
-	i64.load	$push39=, ld5($pop155)
+	i32.const	$push153=, 0
+	i64.load	$push39=, ld5($pop153)
 	i64.store	288($26), $pop39
-	i32.const	$push154=, 0
-	i64.load	$10=, ld5+16($pop154)
+	i32.const	$push152=, 0
+	i64.load	$10=, ld5+16($pop152)
 	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	$push151=, 24
+	i32.add 	$25=, $pop115, $pop151
 	i32.const	$push150=, 0
 	i64.load	$push40=, ld5+24($pop150)
-	i64.store	0($pop151), $pop40
+	i64.store	0($25), $pop40
 	i32.const	$push116=, 128
 	i32.add 	$push117=, $26, $pop116
 	i32.const	$push149=, 24
@@ -528,10 +522,10 @@ main:                                   # @main
 	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
+	i64.load	$push46=, 424($26)
+	i64.store	136($26), $pop46
+	i64.load	$push47=, 416($26)
+	i64.store	128($26), $pop47
 	i32.const	$push120=, 96
 	i32.add 	$push121=, $26, $pop120
 	i32.const	$push148=, 24
@@ -769,6 +763,6 @@ ld5:
 	.size	ld5, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d881913db..354cd666a 100644
--- a/test/torture-s/compndlit-1.c.s
+++ b/test/torture-s/compndlit-1.c.s
@@ -7,25 +7,24 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push5=, 160
-	i32.const	$push4=, 320
-	i32.const	$push9=, 0
-	i32.load	$push0=, x($pop9)
+# %bb.0:                                # %entry
+	i32.const	$push8=, 0
+	i32.load	$push0=, x($pop8)
 	i32.const	$push1=, 7
 	i32.and 	$push2=, $pop0, $pop1
 	i32.const	$push3=, 1
-	i32.eq  	$push8=, $pop2, $pop3
-	tee_local	$push7=, $0=, $pop8
-	i32.select	$push6=, $pop5, $pop4, $pop7
-	i32.store	x($pop10), $pop6
+	i32.eq  	$0=, $pop2, $pop3
+	i32.const	$push7=, 0
+	i32.const	$push5=, 160
+	i32.const	$push4=, 320
+	i32.select	$push6=, $pop5, $pop4, $0
+	i32.store	x($pop7), $pop6
 	block   	
-	i32.eqz 	$push12=, $0
-	br_if   	0, $pop12       # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push11=, 0
-	call    	exit@FUNCTION, $pop11
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push9=, 0
+	call    	exit@FUNCTION, $pop9
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -48,6 +47,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 86ac2f328..6c386b013 100644
--- a/test/torture-s/const-addr-expr-1.c.s
+++ b/test/torture-s/const-addr-expr-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push9=, 0
 	i32.load	$push0=, Upgd_minor_ID($pop9)
@@ -15,14 +15,14 @@ main:                                   # @main
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push10=, 0
 	i32.load	$push4=, Upgd_minor_ID1($pop10)
 	i32.load	$push5=, 0($pop4)
 	i32.const	$push6=, 1
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB0_3:                                # %if.then
@@ -76,5 +76,5 @@ Upgd_minor_ID1:
 	.size	Upgd_minor_ID1, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/conversion.c.s b/test/torture-s/conversion.c.s
index a88d401b7..3b7c99c92 100644
--- a/test/torture-s/conversion.c.s
+++ b/test/torture-s/conversion.c.s
@@ -7,7 +7,7 @@
 u2f:                                    # @u2f
 	.param  	i32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.convert_u/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ u2f:                                    # @u2f
 u2d:                                    # @u2d
 	.param  	i32
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.convert_u/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,27 +35,24 @@ u2d:                                    # @u2d
 u2ld:                                   # @u2ld
 	.param  	i32, 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 	$push14=, $pop5, $pop7
-	tee_local	$push13=, $2=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
+	i32.const	$push6=, 16
+	i32.sub 	$2=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $2
 	call    	__floatunsitf@FUNCTION, $2, $1
 	i32.const	$push0=, 8
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push12=, 8
-	i32.add 	$push2=, $2, $pop12
-	i64.load	$push3=, 0($pop2)
-	i64.store	0($pop1), $pop3
-	i64.load	$push4=, 0($2)
-	i64.store	0($0), $pop4
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $2, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
+	i32.add 	$push1=, $2, $pop0
+	i64.load	$push2=, 0($pop1)
+	i64.store	8($0), $pop2
+	i64.load	$push3=, 0($2)
+	i64.store	0($0), $pop3
+	i32.const	$push10=, 0
+	i32.const	$push8=, 16
+	i32.add 	$push9=, $2, $pop8
+	i32.store	__stack_pointer($pop10), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -68,7 +65,7 @@ u2ld:                                   # @u2ld
 s2f:                                    # @s2f
 	.param  	i32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.convert_s/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -82,7 +79,7 @@ s2f:                                    # @s2f
 s2d:                                    # @s2d
 	.param  	i32
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.convert_s/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -96,27 +93,24 @@ s2d:                                    # @s2d
 s2ld:                                   # @s2ld
 	.param  	i32, 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 	$push14=, $pop5, $pop7
-	tee_local	$push13=, $2=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
+	i32.const	$push6=, 16
+	i32.sub 	$2=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $2
 	call    	__floatsitf@FUNCTION, $2, $1
 	i32.const	$push0=, 8
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push12=, 8
-	i32.add 	$push2=, $2, $pop12
-	i64.load	$push3=, 0($pop2)
-	i64.store	0($pop1), $pop3
-	i64.load	$push4=, 0($2)
-	i64.store	0($0), $pop4
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $2, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
+	i32.add 	$push1=, $2, $pop0
+	i64.load	$push2=, 0($pop1)
+	i64.store	8($0), $pop2
+	i64.load	$push3=, 0($2)
+	i64.store	0($0), $pop3
+	i32.const	$push10=, 0
+	i32.const	$push8=, 16
+	i32.add 	$push9=, $2, $pop8
+	i32.store	__stack_pointer($pop10), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -129,16 +123,15 @@ s2ld:                                   # @s2ld
 fnear:                                  # @fnear
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	f32.sub 	$1=, $0, $1
 	block   	
-	f32.sub 	$push6=, $0, $1
-	tee_local	$push5=, $1=, $pop6
 	f32.const	$push0=, 0x0p0
-	f32.ne  	$push1=, $pop5, $pop0
+	f32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.end
-	i32.const	$push7=, 1
-	return  	$pop7
+# %bb.1:                                # %lor.end
+	i32.const	$push5=, 1
+	return  	$pop5
 .LBB6_2:                                # %lor.rhs
 	end_block                       # label0:
 	f32.div 	$push2=, $0, $1
@@ -156,16 +149,15 @@ fnear:                                  # @fnear
 dnear:                                  # @dnear
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	f64.sub 	$1=, $0, $1
 	block   	
-	f64.sub 	$push6=, $0, $1
-	tee_local	$push5=, $1=, $pop6
 	f64.const	$push0=, 0x0p0
-	f64.ne  	$push1=, $pop5, $pop0
+	f64.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %lor.end
-	i32.const	$push7=, 1
-	return  	$pop7
+# %bb.1:                                # %lor.end
+	i32.const	$push5=, 1
+	return  	$pop5
 .LBB7_2:                                # %lor.rhs
 	end_block                       # label1:
 	f64.div 	$push2=, $0, $1
@@ -184,37 +176,34 @@ ldnear:                                 # @ldnear
 	.param  	i64, i64, i64, i64
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 32
-	i32.sub 	$push28=, $pop10, $pop12
-	tee_local	$push27=, $5=, $pop28
-	i32.store	__stack_pointer($pop13), $pop27
+	i32.sub 	$5=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $5
 	i32.const	$push17=, 16
 	i32.add 	$push18=, $5, $pop17
 	call    	__subtf3@FUNCTION, $pop18, $0, $1, $2, $3
-	i32.const	$4=, 1
-	block   	
-	i64.load	$push26=, 16($5)
-	tee_local	$push25=, $2=, $pop26
 	i32.const	$push19=, 16
 	i32.add 	$push20=, $5, $pop19
-	i32.const	$push24=, 8
-	i32.add 	$push0=, $pop20, $pop24
-	i64.load	$push23=, 0($pop0)
-	tee_local	$push22=, $3=, $pop23
+	i32.const	$push22=, 8
+	i32.add 	$push0=, $pop20, $pop22
+	i64.load	$2=, 0($pop0)
+	i64.load	$3=, 16($5)
+	i32.const	$4=, 1
+	block   	
 	i64.const	$push1=, 0
 	i64.const	$push21=, 0
-	i32.call	$push2=, __eqtf2@FUNCTION, $pop25, $pop22, $pop1, $pop21
-	i32.eqz 	$push30=, $pop2
-	br_if   	0, $pop30       # 0: down to label2
-# BB#1:                                 # %lor.rhs
-	call    	__divtf3@FUNCTION, $5, $0, $1, $2, $3
+	i32.call	$push2=, __eqtf2@FUNCTION, $3, $2, $pop1, $pop21
+	i32.eqz 	$push24=, $pop2
+	br_if   	0, $pop24       # 0: down to label2
+# %bb.1:                                # %lor.rhs
+	call    	__divtf3@FUNCTION, $5, $0, $1, $3, $2
 	i64.load	$push7=, 0($5)
-	i32.const	$push29=, 8
-	i32.add 	$push3=, $5, $pop29
+	i32.const	$push23=, 8
+	i32.add 	$push3=, $5, $pop23
 	i64.load	$push4=, 0($pop3)
 	i64.const	$push6=, 8070450532247928832
 	i64.const	$push5=, 4641306360700491489
@@ -227,8 +216,8 @@ ldnear:                                 # @ldnear
 	i32.const	$push14=, 32
 	i32.add 	$push15=, $5, $pop14
 	i32.store	__stack_pointer($pop16), $pop15
-	copy_local	$push31=, $4
-                                        # fallthrough-return: $pop31
+	copy_local	$push25=, $4
+                                        # fallthrough-return: $pop25
 	.endfunc
 .Lfunc_end8:
 	.size	ldnear, .Lfunc_end8-ldnear
@@ -240,7 +229,7 @@ ldnear:                                 # @ldnear
 test_integer_to_float:                  # @test_integer_to_float
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end103
+# %bb.0:                                # %if.end103
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -254,7 +243,7 @@ test_integer_to_float:                  # @test_integer_to_float
 ull2f:                                  # @ull2f
 	.param  	i64
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.convert_u/i64	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -268,7 +257,7 @@ ull2f:                                  # @ull2f
 ull2d:                                  # @ull2d
 	.param  	i64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.convert_u/i64	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -282,27 +271,24 @@ ull2d:                                  # @ull2d
 ull2ld:                                 # @ull2ld
 	.param  	i32, i64
 	.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 	$push14=, $pop5, $pop7
-	tee_local	$push13=, $2=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
+	i32.const	$push6=, 16
+	i32.sub 	$2=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $2
 	call    	__floatunditf@FUNCTION, $2, $1
 	i32.const	$push0=, 8
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push12=, 8
-	i32.add 	$push2=, $2, $pop12
-	i64.load	$push3=, 0($pop2)
-	i64.store	0($pop1), $pop3
-	i64.load	$push4=, 0($2)
-	i64.store	0($0), $pop4
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $2, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
+	i32.add 	$push1=, $2, $pop0
+	i64.load	$push2=, 0($pop1)
+	i64.store	8($0), $pop2
+	i64.load	$push3=, 0($2)
+	i64.store	0($0), $pop3
+	i32.const	$push10=, 0
+	i32.const	$push8=, 16
+	i32.add 	$push9=, $2, $pop8
+	i32.store	__stack_pointer($pop10), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
@@ -315,7 +301,7 @@ ull2ld:                                 # @ull2ld
 sll2f:                                  # @sll2f
 	.param  	i64
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.convert_s/i64	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -329,7 +315,7 @@ sll2f:                                  # @sll2f
 sll2d:                                  # @sll2d
 	.param  	i64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.convert_s/i64	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -343,27 +329,24 @@ sll2d:                                  # @sll2d
 sll2ld:                                 # @sll2ld
 	.param  	i32, i64
 	.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 	$push14=, $pop5, $pop7
-	tee_local	$push13=, $2=, $pop14
-	i32.store	__stack_pointer($pop8), $pop13
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$push4=, __stack_pointer($pop5)
+	i32.const	$push6=, 16
+	i32.sub 	$2=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $2
 	call    	__floatditf@FUNCTION, $2, $1
 	i32.const	$push0=, 8
-	i32.add 	$push1=, $0, $pop0
-	i32.const	$push12=, 8
-	i32.add 	$push2=, $2, $pop12
-	i64.load	$push3=, 0($pop2)
-	i64.store	0($pop1), $pop3
-	i64.load	$push4=, 0($2)
-	i64.store	0($0), $pop4
-	i32.const	$push11=, 0
-	i32.const	$push9=, 16
-	i32.add 	$push10=, $2, $pop9
-	i32.store	__stack_pointer($pop11), $pop10
+	i32.add 	$push1=, $2, $pop0
+	i64.load	$push2=, 0($pop1)
+	i64.store	8($0), $pop2
+	i64.load	$push3=, 0($2)
+	i64.store	0($0), $pop3
+	i32.const	$push10=, 0
+	i32.const	$push8=, 16
+	i32.add 	$push9=, $2, $pop8
+	i32.store	__stack_pointer($pop10), $pop9
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end15:
@@ -376,7 +359,7 @@ sll2ld:                                 # @sll2ld
 test_longlong_integer_to_float:         # @test_longlong_integer_to_float
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end96
+# %bb.0:                                # %if.end96
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -390,9 +373,21 @@ test_longlong_integer_to_float:         # @test_longlong_integer_to_float
 f2u:                                    # @f2u
 	.param  	f32
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_u/f32	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f32.const	$push0=, 0x1p32
+	f32.lt  	$push1=, $0, $pop0
+	f32.const	$push2=, 0x0p0
+	f32.ge  	$push3=, $0, $pop2
+	i32.and 	$push4=, $pop1, $pop3
+	br_if   	0, $pop4        # 0: down to label3
+# %bb.1:                                # %entry
+	i32.const	$push5=, 0
+	return  	$pop5
+.LBB17_2:                               # %entry
+	end_block                       # label3:
+	i32.trunc_u/f32	$push6=, $0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end17:
 	.size	f2u, .Lfunc_end17-f2u
@@ -404,9 +399,21 @@ f2u:                                    # @f2u
 d2u:                                    # @d2u
 	.param  	f64
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_u/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.const	$push0=, 0x1p32
+	f64.lt  	$push1=, $0, $pop0
+	f64.const	$push2=, 0x0p0
+	f64.ge  	$push3=, $0, $pop2
+	i32.and 	$push4=, $pop1, $pop3
+	br_if   	0, $pop4        # 0: down to label4
+# %bb.1:                                # %entry
+	i32.const	$push5=, 0
+	return  	$pop5
+.LBB18_2:                               # %entry
+	end_block                       # label4:
+	i32.trunc_u/f64	$push6=, $0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end18:
 	.size	d2u, .Lfunc_end18-d2u
@@ -418,7 +425,7 @@ d2u:                                    # @d2u
 ld2u:                                   # @ld2u
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$push0=, __fixunstfsi@FUNCTION, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -432,9 +439,19 @@ ld2u:                                   # @ld2u
 f2s:                                    # @f2s
 	.param  	f32
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_s/f32	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f32.abs 	$push0=, $0
+	f32.const	$push1=, 0x1p31
+	f32.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label5
+# %bb.1:                                # %entry
+	i32.const	$push3=, -2147483648
+	return  	$pop3
+.LBB20_2:                               # %entry
+	end_block                       # label5:
+	i32.trunc_s/f32	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end20:
 	.size	f2s, .Lfunc_end20-f2s
@@ -446,9 +463,19 @@ f2s:                                    # @f2s
 d2s:                                    # @d2s
 	.param  	f64
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_s/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.abs 	$push0=, $0
+	f64.const	$push1=, 0x1p31
+	f64.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label6
+# %bb.1:                                # %entry
+	i32.const	$push3=, -2147483648
+	return  	$pop3
+.LBB21_2:                               # %entry
+	end_block                       # label6:
+	i32.trunc_s/f64	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end21:
 	.size	d2s, .Lfunc_end21-d2s
@@ -460,7 +487,7 @@ d2s:                                    # @d2s
 ld2s:                                   # @ld2s
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$push0=, __fixtfsi@FUNCTION, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -474,7 +501,7 @@ ld2s:                                   # @ld2s
 test_float_to_integer:                  # @test_float_to_integer
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end182
+# %bb.0:                                # %if.end182
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -488,9 +515,21 @@ test_float_to_integer:                  # @test_float_to_integer
 f2ull:                                  # @f2ull
 	.param  	f32
 	.result 	i64
-# BB#0:                                 # %entry
-	i64.trunc_u/f32	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f32.const	$push0=, 0x1p64
+	f32.lt  	$push1=, $0, $pop0
+	f32.const	$push2=, 0x0p0
+	f32.ge  	$push3=, $0, $pop2
+	i32.and 	$push4=, $pop1, $pop3
+	br_if   	0, $pop4        # 0: down to label7
+# %bb.1:                                # %entry
+	i64.const	$push5=, 0
+	return  	$pop5
+.LBB24_2:                               # %entry
+	end_block                       # label7:
+	i64.trunc_u/f32	$push6=, $0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end24:
 	.size	f2ull, .Lfunc_end24-f2ull
@@ -502,9 +541,21 @@ f2ull:                                  # @f2ull
 d2ull:                                  # @d2ull
 	.param  	f64
 	.result 	i64
-# BB#0:                                 # %entry
-	i64.trunc_u/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.const	$push0=, 0x1p64
+	f64.lt  	$push1=, $0, $pop0
+	f64.const	$push2=, 0x0p0
+	f64.ge  	$push3=, $0, $pop2
+	i32.and 	$push4=, $pop1, $pop3
+	br_if   	0, $pop4        # 0: down to label8
+# %bb.1:                                # %entry
+	i64.const	$push5=, 0
+	return  	$pop5
+.LBB25_2:                               # %entry
+	end_block                       # label8:
+	i64.trunc_u/f64	$push6=, $0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end25:
 	.size	d2ull, .Lfunc_end25-d2ull
@@ -516,7 +567,7 @@ d2ull:                                  # @d2ull
 ld2ull:                                 # @ld2ull
 	.param  	i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.call	$push0=, __fixunstfdi@FUNCTION, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -530,9 +581,19 @@ ld2ull:                                 # @ld2ull
 f2sll:                                  # @f2sll
 	.param  	f32
 	.result 	i64
-# BB#0:                                 # %entry
-	i64.trunc_s/f32	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f32.abs 	$push0=, $0
+	f32.const	$push1=, 0x1p63
+	f32.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label9
+# %bb.1:                                # %entry
+	i64.const	$push3=, -9223372036854775808
+	return  	$pop3
+.LBB27_2:                               # %entry
+	end_block                       # label9:
+	i64.trunc_s/f32	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end27:
 	.size	f2sll, .Lfunc_end27-f2sll
@@ -544,9 +605,19 @@ f2sll:                                  # @f2sll
 d2sll:                                  # @d2sll
 	.param  	f64
 	.result 	i64
-# BB#0:                                 # %entry
-	i64.trunc_s/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.abs 	$push0=, $0
+	f64.const	$push1=, 0x1p63
+	f64.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label10
+# %bb.1:                                # %entry
+	i64.const	$push3=, -9223372036854775808
+	return  	$pop3
+.LBB28_2:                               # %entry
+	end_block                       # label10:
+	i64.trunc_s/f64	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end28:
 	.size	d2sll, .Lfunc_end28-d2sll
@@ -558,7 +629,7 @@ d2sll:                                  # @d2sll
 ld2sll:                                 # @ld2sll
 	.param  	i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.call	$push0=, __fixtfdi@FUNCTION, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -572,7 +643,7 @@ ld2sll:                                 # @ld2sll
 test_float_to_longlong_integer:         # @test_float_to_longlong_integer
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.end172
+# %bb.0:                                # %if.end172
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -585,7 +656,7 @@ test_float_to_longlong_integer:         # @test_float_to_longlong_integer
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -594,5 +665,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end31-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/cvt-1.c.s b/test/torture-s/cvt-1.c.s
index cc55cd4e7..4246fe3c7 100644
--- a/test/torture-s/cvt-1.c.s
+++ b/test/torture-s/cvt-1.c.s
@@ -7,9 +7,19 @@
 g2:                                     # @g2
 	.param  	f64
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_s/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.abs 	$push0=, $0
+	f64.const	$push1=, 0x1p31
+	f64.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label0
+# %bb.1:                                # %entry
+	i32.const	$push3=, -2147483648
+	return  	$pop3
+.LBB0_2:                                # %entry
+	end_block                       # label0:
+	i32.trunc_s/f64	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	g2, .Lfunc_end0-g2
@@ -21,7 +31,7 @@ g2:                                     # @g2
 f:                                      # @f
 	.param  	i32
 	.result 	f64
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	f64.convert_s/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +44,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# %bb.0:                                # %if.end6
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -43,5 +53,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/dbra-1.c.s b/test/torture-s/dbra-1.c.s
index c2acb0fe2..22971a86e 100644
--- a/test/torture-s/dbra-1.c.s
+++ b/test/torture-s/dbra-1.c.s
@@ -7,7 +7,7 @@
 f1:                                     # @f1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, -1
 	i32.const	$push0=, 10
 	i32.lt_u	$push1=, $0, $pop0
@@ -24,7 +24,7 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.eqz 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -38,14 +38,13 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
-	i32.add 	$push6=, $0, $pop0
-	tee_local	$push5=, $0=, $pop6
+	i32.add 	$0=, $0, $pop0
 	i32.const	$push4=, -1
 	i32.const	$push1=, 10
 	i32.lt_u	$push2=, $0, $pop1
-	i32.select	$push3=, $pop5, $pop4, $pop2
+	i32.select	$push3=, $0, $pop4, $pop2
                                         # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end2:
@@ -58,7 +57,7 @@ f3:                                     # @f3
 f4:                                     # @f4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.eq  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -73,12 +72,12 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -10
 	i32.lt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %switch.lookup
+# %bb.1:                                # %switch.lookup
 	i32.const	$push3=, -1
 	i32.xor 	$push4=, $0, $pop3
 	return  	$pop4
@@ -97,7 +96,7 @@ f5:                                     # @f5
 f6:                                     # @f6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.eq  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -111,7 +110,7 @@ f6:                                     # @f6
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end32
+# %bb.0:                                # %if.end32
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -120,5 +119,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end6-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/divcmp-1.c.s b/test/torture-s/divcmp-1.c.s
index c33dfafd5..f3f0f7db1 100644
--- a/test/torture-s/divcmp-1.c.s
+++ b/test/torture-s/divcmp-1.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -24,7 +24,7 @@ test1:                                  # @test1
 test1u:                                 # @test1u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -41,7 +41,7 @@ test1u:                                 # @test1u
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 19
@@ -58,7 +58,7 @@ test2:                                  # @test2
 test2u:                                 # @test2u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -73,7 +73,7 @@ test2u:                                 # @test2u
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 9
@@ -90,7 +90,7 @@ test3:                                  # @test3
 test3u:                                 # @test3u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 9
@@ -107,7 +107,7 @@ test3u:                                 # @test3u
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 18
@@ -124,7 +124,7 @@ test4:                                  # @test4
 test4u:                                 # @test4u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.gt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -139,7 +139,7 @@ test4u:                                 # @test4u
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 20
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -154,7 +154,7 @@ test5:                                  # @test5
 test5u:                                 # @test5u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 20
 	i32.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -169,7 +169,7 @@ test5u:                                 # @test5u
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -9
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -184,7 +184,7 @@ test6:                                  # @test6
 test7:                                  # @test7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 30
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -199,7 +199,7 @@ test7:                                  # @test7
 test7u:                                 # @test7u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 30
 	i32.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -214,7 +214,7 @@ test7u:                                 # @test7u
 test8:                                  # @test8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -229,7 +229,7 @@ test8:                                  # @test8
 test8u:                                 # @test8u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.lt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -244,7 +244,7 @@ test8u:                                 # @test8u
 test9:                                  # @test9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -259,7 +259,7 @@ test9:                                  # @test9
 test9u:                                 # @test9u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.gt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -274,7 +274,7 @@ test9u:                                 # @test9u
 test10:                                 # @test10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -289,7 +289,7 @@ test10:                                 # @test10
 test10u:                                # @test10u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.gt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -304,7 +304,7 @@ test10u:                                # @test10u
 test11:                                 # @test11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 19
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -319,7 +319,7 @@ test11:                                 # @test11
 test11u:                                # @test11u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 19
 	i32.gt_u	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -334,7 +334,7 @@ test11u:                                # @test11u
 test12:                                 # @test12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -10
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -348,7 +348,7 @@ test12:                                 # @test12
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end428
+# %bb.0:                                # %if.end428
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -356,4 +356,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end22-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/divcmp-2.c.s b/test/torture-s/divcmp-2.c.s
index 47025a298..0a59d269b 100644
--- a/test/torture-s/divcmp-2.c.s
+++ b/test/torture-s/divcmp-2.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -24,7 +24,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 19
@@ -41,7 +41,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -58,7 +58,7 @@ test3:                                  # @test3
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -75,7 +75,7 @@ test4:                                  # @test4
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 19
@@ -92,7 +92,7 @@ test5:                                  # @test5
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -108,7 +108,7 @@ test6:                                  # @test6
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end92
+# %bb.0:                                # %if.end92
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -116,4 +116,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end6-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/divcmp-3.c.s b/test/torture-s/divcmp-3.c.s
index 4d3265ef2..5f57e2caf 100644
--- a/test/torture-s/divcmp-3.c.s
+++ b/test/torture-s/divcmp-3.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ test1:                                  # @test1
 test1u:                                 # @test1u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ test1u:                                 # @test1u
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,7 +49,7 @@ test2:                                  # @test2
 test2u:                                 # @test2u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -63,7 +63,7 @@ test2u:                                 # @test2u
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -77,7 +77,7 @@ test3:                                  # @test3
 test3u:                                 # @test3u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -91,7 +91,7 @@ test3u:                                 # @test3u
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -105,7 +105,7 @@ test4:                                  # @test4
 test4u:                                 # @test4u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -119,7 +119,7 @@ test4u:                                 # @test4u
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -133,7 +133,7 @@ test5:                                  # @test5
 test5u:                                 # @test5u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -147,7 +147,7 @@ test5u:                                 # @test5u
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -161,7 +161,7 @@ test6:                                  # @test6
 test6u:                                 # @test6u
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -174,7 +174,7 @@ test6u:                                 # @test6u
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -182,4 +182,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end12-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/divcmp-4.c.s b/test/torture-s/divcmp-4.c.s
index bb0c7cb4d..4577971c4 100644
--- a/test/torture-s/divcmp-4.c.s
+++ b/test/torture-s/divcmp-4.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 10
@@ -24,7 +24,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 19
@@ -41,7 +41,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 29
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 9
@@ -58,7 +58,7 @@ test3:                                  # @test3
 test4:                                  # @test4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 18
@@ -75,7 +75,7 @@ test4:                                  # @test4
 test5:                                  # @test5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -20
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -90,7 +90,7 @@ test5:                                  # @test5
 test6:                                  # @test6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 9
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -105,7 +105,7 @@ test6:                                  # @test6
 test7:                                  # @test7
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -30
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -120,7 +120,7 @@ test7:                                  # @test7
 test8:                                  # @test8
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -10
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -135,7 +135,7 @@ test8:                                  # @test8
 test9:                                  # @test9
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -29
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -150,7 +150,7 @@ test9:                                  # @test9
 test10:                                 # @test10
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -9
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -165,7 +165,7 @@ test10:                                 # @test10
 test11:                                 # @test11
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -19
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -180,7 +180,7 @@ test11:                                 # @test11
 test12:                                 # @test12
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	i32.lt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -194,7 +194,7 @@ test12:                                 # @test12
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end236
+# %bb.0:                                # %if.end236
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -202,4 +202,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end12-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/divcmp-5.c.s b/test/torture-s/divcmp-5.c.s
index 79a7acc23..235dc7c45 100644
--- a/test/torture-s/divcmp-5.c.s
+++ b/test/torture-s/divcmp-5.c.s
@@ -7,7 +7,7 @@
 always_one_1:                           # @always_one_1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ always_one_1:                           # @always_one_1
 always_one_2:                           # @always_one_2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ always_one_2:                           # @always_one_2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -42,4 +42,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/divconst-1.c.s b/test/torture-s/divconst-1.c.s
index cb3fecf04..03b75ad98 100644
--- a/test/torture-s/divconst-1.c.s
+++ b/test/torture-s/divconst-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 14315126007568
 	i64.store	0($0):p2align=2, $pop0
 	i64.const	$push1=, 14315126007568
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -33,5 +33,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/divconst-2.c.s b/test/torture-s/divconst-2.c.s
index c15919c4e..18911c55b 100644
--- a/test/torture-s/divconst-2.c.s
+++ b/test/torture-s/divconst-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.eq  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ f:                                      # @f
 r:                                      # @r
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	i32.rem_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ r:                                      # @r
 std_eqn:                                # @std_eqn
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shl 	$push1=, $2, $pop0
 	i32.add 	$push2=, $pop1, $3
@@ -54,13 +54,12 @@ std_eqn:                                # @std_eqn
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push20=, 0
+	i32.load	$0=, nums($pop20)
 	block   	
-	i32.const	$push22=, 0
-	i32.load	$push21=, nums($pop22)
-	tee_local	$push20=, $0=, $pop21
 	i32.const	$push19=, -2147483648
-	i32.eq  	$push1=, $pop20, $pop19
+	i32.eq  	$push1=, $0, $pop19
 	i32.const	$push18=, 31
 	i32.shl 	$push2=, $pop1, $pop18
 	i32.const	$push17=, -2147483648
@@ -68,35 +67,33 @@ main:                                   # @main
 	i32.add 	$push3=, $pop2, $pop0
 	i32.ne  	$push4=, $pop3, $0
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %for.cond
-	i32.const	$push28=, 0
-	i32.load	$push27=, nums+4($pop28)
-	tee_local	$push26=, $0=, $pop27
-	i32.const	$push25=, -2147483648
-	i32.eq  	$push6=, $pop26, $pop25
-	i32.const	$push24=, 31
-	i32.shl 	$push7=, $pop6, $pop24
+# %bb.1:                                # %for.cond
+	i32.const	$push24=, 0
+	i32.load	$0=, nums+4($pop24)
 	i32.const	$push23=, -2147483648
-	i32.rem_s	$push5=, $0, $pop23
+	i32.eq  	$push6=, $0, $pop23
+	i32.const	$push22=, 31
+	i32.shl 	$push7=, $pop6, $pop22
+	i32.const	$push21=, -2147483648
+	i32.rem_s	$push5=, $0, $pop21
 	i32.add 	$push8=, $pop7, $pop5
 	i32.ne  	$push9=, $pop8, $0
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %for.cond.1
-	i32.const	$push32=, 0
-	i32.load	$push31=, nums+8($pop32)
-	tee_local	$push30=, $0=, $pop31
+# %bb.2:                                # %for.cond.1
+	i32.const	$push26=, 0
+	i32.load	$0=, nums+8($pop26)
 	i32.const	$push10=, -2147483648
-	i32.eq  	$push12=, $pop30, $pop10
+	i32.eq  	$push12=, $0, $pop10
 	i32.const	$push13=, 31
 	i32.shl 	$push14=, $pop12, $pop13
-	i32.const	$push29=, -2147483648
-	i32.rem_s	$push11=, $0, $pop29
+	i32.const	$push25=, -2147483648
+	i32.rem_s	$push11=, $0, $pop25
 	i32.add 	$push15=, $pop14, $pop11
 	i32.ne  	$push16=, $pop15, $0
 	br_if   	0, $pop16       # 0: down to label0
-# BB#3:                                 # %for.cond.2
-	i32.const	$push33=, 0
-	call    	exit@FUNCTION, $pop33
+# %bb.3:                                # %for.cond.2
+	i32.const	$push27=, 0
+	call    	exit@FUNCTION, $pop27
 	unreachable
 .LBB3_4:                                # %if.then
 	end_block                       # label0:
@@ -118,6 +115,6 @@ nums:
 	.size	nums, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 73ef6f687..ca53b4fd3 100644
--- a/test/torture-s/divconst-3.c.s
+++ b/test/torture-s/divconst-3.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 10000000000
 	i64.div_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/divmod-1.c.s b/test/torture-s/divmod-1.c.s
index 49add2306..8fab1a46f 100644
--- a/test/torture-s/divmod-1.c.s
+++ b/test/torture-s/divmod-1.c.s
@@ -7,7 +7,7 @@
 div1:                                   # @div1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.sub 	$push1=, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ div1:                                   # @div1
 div2:                                   # @div2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.sub 	$push1=, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ div2:                                   # @div2
 div3:                                   # @div3
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.div_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -51,7 +51,7 @@ div3:                                   # @div3
 div4:                                   # @div4
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.div_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -65,7 +65,7 @@ div4:                                   # @div4
 mod1:                                   # @mod1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -79,7 +79,7 @@ mod1:                                   # @mod1
 mod2:                                   # @mod2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -93,7 +93,7 @@ mod2:                                   # @mod2
 mod3:                                   # @mod3
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.rem_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -107,7 +107,7 @@ mod3:                                   # @mod3
 mod4:                                   # @mod4
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.rem_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -121,7 +121,7 @@ mod4:                                   # @mod4
 mod5:                                   # @mod5
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.rem_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -135,7 +135,7 @@ mod5:                                   # @mod5
 mod6:                                   # @mod6
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.rem_u	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -148,7 +148,7 @@ mod6:                                   # @mod6
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end36
+# %bb.0:                                # %if.end36
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -157,5 +157,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end10-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/doloop-1.c.s b/test/torture-s/doloop-1.c.s
index a0ffe7cf9..431022d16 100644
--- a/test/torture-s/doloop-1.c.s
+++ b/test/torture-s/doloop-1.c.s
@@ -7,34 +7,33 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.load	$push0=, i($pop11)
-	i32.const	$push10=, 1
-	i32.add 	$push1=, $pop0, $pop10
-	i32.store	i($pop12), $pop1
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $0=, $pop8
+	i32.const	$push10=, 0
+	i32.const	$push9=, 0
+	i32.load	$push0=, i($pop9)
+	i32.const	$push8=, 1
+	i32.add 	$push1=, $pop0, $pop8
+	i32.store	i($pop10), $pop1
+	i32.const	$push7=, -1
+	i32.add 	$0=, $0, $pop7
 	i32.const	$push6=, 255
-	i32.and 	$push2=, $pop7, $pop6
+	i32.and 	$push2=, $0, $pop6
 	br_if   	0, $pop2        # 0: up to label0
-# BB#2:                                 # %do.end
+# %bb.2:                                # %do.end
 	end_loop
 	block   	
-	i32.const	$push13=, 0
-	i32.load	$push3=, i($pop13)
+	i32.const	$push11=, 0
+	i32.load	$push3=, i($pop11)
 	i32.const	$push4=, 256
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push14=, 0
-	call    	exit@FUNCTION, $pop14
+# %bb.3:                                # %if.end
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
 .LBB0_4:                                # %if.then
 	end_block                       # label1:
@@ -54,6 +53,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 19b419b78..c6733049c 100644
--- a/test/torture-s/doloop-2.c.s
+++ b/test/torture-s/doloop-2.c.s
@@ -7,34 +7,33 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.load	$push0=, i($pop11)
-	i32.const	$push10=, 1
-	i32.add 	$push1=, $pop0, $pop10
-	i32.store	i($pop12), $pop1
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $0=, $pop8
+	i32.const	$push10=, 0
+	i32.const	$push9=, 0
+	i32.load	$push0=, i($pop9)
+	i32.const	$push8=, 1
+	i32.add 	$push1=, $pop0, $pop8
+	i32.store	i($pop10), $pop1
+	i32.const	$push7=, -1
+	i32.add 	$0=, $0, $pop7
 	i32.const	$push6=, 65535
-	i32.and 	$push2=, $pop7, $pop6
+	i32.and 	$push2=, $0, $pop6
 	br_if   	0, $pop2        # 0: up to label0
-# BB#2:                                 # %do.end
+# %bb.2:                                # %do.end
 	end_loop
 	block   	
-	i32.const	$push13=, 0
-	i32.load	$push3=, i($pop13)
+	i32.const	$push11=, 0
+	i32.load	$push3=, i($pop11)
 	i32.const	$push4=, 65536
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push14=, 0
-	call    	exit@FUNCTION, $pop14
+# %bb.3:                                # %if.end
+	i32.const	$push12=, 0
+	call    	exit@FUNCTION, $pop12
 	unreachable
 .LBB0_4:                                # %if.then
 	end_block                       # label1:
@@ -54,6 +53,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ca51b4eed..2adbf7ee6 100644
--- a/test/torture-s/eeprof-1.c.s
+++ b/test/torture-s/eeprof-1.c.s
@@ -5,14 +5,14 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push1=, last_fn_entered($pop0)
 	i32.const	$push2=, foo@FUNCTION
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,57 +27,57 @@ foo:                                    # @foo
 	.globl	nfoo
 	.type	nfoo,@function
 nfoo:                                   # @nfoo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push19=, 0
 	i32.load	$push1=, entry_calls($pop19)
 	i32.const	$push18=, 2
 	i32.ne  	$push2=, $pop1, $pop18
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push21=, 0
 	i32.load	$push0=, exit_calls($pop21)
 	i32.const	$push20=, 2
 	i32.ne  	$push3=, $pop0, $pop20
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push22=, 0
 	i32.load	$push4=, last_fn_entered($pop22)
 	i32.const	$push5=, foo@FUNCTION
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#3:                                 # %if.end4
+# %bb.3:                                # %if.end4
 	i32.const	$push23=, 0
 	i32.load	$push7=, last_fn_exited($pop23)
 	i32.const	$push8=, foo2@FUNCTION
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label1
-# BB#4:                                 # %if.end7
+# %bb.4:                                # %if.end7
 	call    	foo@FUNCTION
 	i32.const	$push25=, 0
 	i32.load	$push11=, entry_calls($pop25)
 	i32.const	$push24=, 3
 	i32.ne  	$push12=, $pop11, $pop24
 	br_if   	0, $pop12       # 0: down to label1
-# BB#5:                                 # %if.end7
+# %bb.5:                                # %if.end7
 	i32.const	$push27=, 0
 	i32.load	$push10=, exit_calls($pop27)
 	i32.const	$push26=, 3
 	i32.ne  	$push13=, $pop10, $pop26
 	br_if   	0, $pop13       # 0: down to label1
-# BB#6:                                 # %if.end12
+# %bb.6:                                # %if.end12
 	i32.const	$push29=, 0
 	i32.load	$push14=, last_fn_entered($pop29)
 	i32.const	$push28=, foo@FUNCTION
 	i32.ne  	$push15=, $pop14, $pop28
 	br_if   	0, $pop15       # 0: down to label1
-# BB#7:                                 # %if.end15
+# %bb.7:                                # %if.end15
 	i32.const	$push31=, 0
 	i32.load	$push16=, last_fn_exited($pop31)
 	i32.const	$push30=, foo@FUNCTION
 	i32.ne  	$push17=, $pop16, $pop30
 	br_if   	0, $pop17       # 0: down to label1
-# BB#8:                                 # %if.end18
+# %bb.8:                                # %if.end18
 	return
 .LBB1_9:                                # %if.then
 	end_block                       # label1:
@@ -93,7 +93,7 @@ nfoo:                                   # @nfoo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push21=, 0
 	i32.load	$push1=, exit_calls($pop21)
@@ -101,51 +101,51 @@ main:                                   # @main
 	i32.load	$push0=, entry_calls($pop20)
 	i32.or  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	call    	foo2@FUNCTION
 	i32.const	$push23=, 0
 	i32.load	$push4=, entry_calls($pop23)
 	i32.const	$push22=, 2
 	i32.ne  	$push5=, $pop4, $pop22
 	br_if   	0, $pop5        # 0: down to label2
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push25=, 0
 	i32.load	$push3=, exit_calls($pop25)
 	i32.const	$push24=, 2
 	i32.ne  	$push6=, $pop3, $pop24
 	br_if   	0, $pop6        # 0: down to label2
-# BB#3:                                 # %if.end6
+# %bb.3:                                # %if.end6
 	i32.const	$push26=, 0
 	i32.load	$push7=, last_fn_entered($pop26)
 	i32.const	$push8=, foo@FUNCTION
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label2
-# BB#4:                                 # %if.end9
+# %bb.4:                                # %if.end9
 	i32.const	$push27=, 0
 	i32.load	$push10=, last_fn_exited($pop27)
 	i32.const	$push11=, foo2@FUNCTION
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label2
-# BB#5:                                 # %if.end12
+# %bb.5:                                # %if.end12
 	call    	nfoo@FUNCTION
 	i32.const	$push29=, 0
 	i32.load	$push14=, entry_calls($pop29)
 	i32.const	$push28=, 3
 	i32.ne  	$push15=, $pop14, $pop28
 	br_if   	0, $pop15       # 0: down to label2
-# BB#6:                                 # %if.end12
+# %bb.6:                                # %if.end12
 	i32.const	$push31=, 0
 	i32.load	$push13=, exit_calls($pop31)
 	i32.const	$push30=, 3
 	i32.ne  	$push16=, $pop13, $pop30
 	br_if   	0, $pop16       # 0: down to label2
-# BB#7:                                 # %if.end17
+# %bb.7:                                # %if.end17
 	i32.const	$push32=, 0
 	i32.load	$push17=, last_fn_entered($pop32)
 	i32.const	$push18=, foo@FUNCTION
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label2
-# BB#8:                                 # %if.end20
+# %bb.8:                                # %if.end20
 	i32.const	$push33=, 0
 	return  	$pop33
 .LBB2_9:                                # %if.then
@@ -162,7 +162,7 @@ main:                                   # @main
 	.type	__cyg_profile_func_enter,@function
 __cyg_profile_func_enter:               # @__cyg_profile_func_enter
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	last_fn_entered($pop0), $0
 	i32.const	$push5=, 0
@@ -182,7 +182,7 @@ __cyg_profile_func_enter:               # @__cyg_profile_func_enter
 	.type	__cyg_profile_func_exit,@function
 __cyg_profile_func_exit:                # @__cyg_profile_func_exit
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	last_fn_exited($pop0), $0
 	i32.const	$push5=, 0
@@ -199,49 +199,49 @@ __cyg_profile_func_exit:                # @__cyg_profile_func_exit
 	.section	.text.foo2,"ax",@progbits
 	.type	foo2,@function          # -- Begin function foo2
 foo2:                                   # @foo2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push17=, 0
 	i32.load	$push1=, entry_calls($pop17)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push18=, 0
 	i32.load	$push0=, exit_calls($pop18)
 	br_if   	0, $pop0        # 0: down to label3
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push19=, 0
 	i32.load	$push4=, last_fn_entered($pop19)
 	i32.const	$push5=, foo2@FUNCTION
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label3
-# BB#3:                                 # %if.end4
+# %bb.3:                                # %if.end4
 	call    	foo@FUNCTION
 	i32.const	$push20=, 0
 	i32.load	$push8=, entry_calls($pop20)
 	i32.const	$push9=, 2
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label3
-# BB#4:                                 # %if.end4
+# %bb.4:                                # %if.end4
 	i32.const	$push21=, 0
 	i32.load	$push7=, exit_calls($pop21)
 	i32.const	$push11=, 1
 	i32.ne  	$push12=, $pop7, $pop11
 	br_if   	0, $pop12       # 0: down to label3
-# BB#5:                                 # %if.end9
+# %bb.5:                                # %if.end9
 	i32.const	$push23=, 0
 	i32.load	$push13=, last_fn_entered($pop23)
 	i32.const	$push22=, foo@FUNCTION
 	i32.ne  	$push14=, $pop13, $pop22
 	br_if   	0, $pop14       # 0: down to label3
-# BB#6:                                 # %if.end12
+# %bb.6:                                # %if.end12
 	i32.const	$push25=, 0
 	i32.load	$push15=, last_fn_exited($pop25)
 	i32.const	$push24=, foo@FUNCTION
 	i32.ne  	$push16=, $pop15, $pop24
 	br_if   	0, $pop16       # 0: down to label3
-# BB#7:                                 # %if.end15
+# %bb.7:                                # %if.end15
 	return
 .LBB5_8:                                # %if.then
 	end_block                       # label3:
@@ -288,5 +288,5 @@ last_fn_exited:
 	.size	last_fn_exited, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/enum-1.c.s b/test/torture-s/enum-1.c.s
index 0e351e0fa..b515bc2ae 100644
--- a/test/torture-s/enum-1.c.s
+++ b/test/torture-s/enum-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/enum-2.c.s b/test/torture-s/enum-2.c.s
index 55a94da91..a25826cf0 100644
--- a/test/torture-s/enum-2.c.s
+++ b/test/torture-s/enum-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/enum-3.c.s b/test/torture-s/enum-3.c.s
index 9a586926b..2b50ec402 100644
--- a/test/torture-s/enum-3.c.s
+++ b/test/torture-s/enum-3.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push10=, $pop2, $pop4
-	tee_local	$push9=, $0=, $pop10
-	i32.store	__stack_pointer($pop5), $pop9
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 0
 	i32.const	$push6=, 12
 	i32.add 	$push7=, $0, $pop6
@@ -47,5 +46,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/extzvsi.c.s b/test/torture-s/extzvsi.c.s
index 8cb7ab717..707781751 100644
--- a/test/torture-s/extzvsi.c.s
+++ b/test/torture-s/extzvsi.c.s
@@ -7,19 +7,18 @@
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push6=, 2
-	i32.const	$push13=, 0
-	i32.load	$push1=, x($pop13)
+	i32.load	$push1=, x($pop0)
 	i32.const	$push2=, 1
 	i32.shr_u	$push3=, $pop1, $pop2
 	i32.const	$push4=, 2047
-	i32.and 	$push12=, $pop3, $pop4
-	tee_local	$push11=, $0=, $pop12
+	i32.and 	$0=, $pop3, $pop4
+	i32.const	$push11=, 0
+	i32.const	$push6=, 2
 	i32.const	$push10=, 1
-	i32.eq  	$push5=, $pop11, $pop10
-	i32.select	$push7=, $pop0, $pop6, $pop5
+	i32.eq  	$push5=, $0, $pop10
+	i32.select	$push7=, $pop11, $pop6, $pop5
 	i32.const	$push9=, 1
 	i32.select	$push8=, $pop7, $pop9, $0
                                         # fallthrough-return: $pop8
@@ -33,7 +32,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i64.load	$push1=, x($pop7)
@@ -58,4 +57,4 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/ffs-1.c.s b/test/torture-s/ffs-1.c.s
index 160a04f2f..53241688c 100644
--- a/test/torture-s/ffs-1.c.s
+++ b/test/torture-s/ffs-1.c.s
@@ -6,12 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, a($pop1)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
@@ -33,6 +33,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3918a4be8..824d85510 100644
--- a/test/torture-s/ffs-2.c.s
+++ b/test/torture-s/ffs-2.c.s
@@ -7,12 +7,11 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push44=, 0
+	i32.load	$0=, ffstesttab($pop44)
 	block   	
-	i32.const	$push46=, 0
-	i32.load	$push45=, ffstesttab($pop46)
-	tee_local	$push44=, $0=, $pop45
-	i32.ctz 	$push0=, $pop44
+	i32.ctz 	$push0=, $0
 	i32.const	$push43=, 1
 	i32.add 	$push1=, $pop0, $pop43
 	i32.const	$push42=, 0
@@ -21,98 +20,91 @@ main:                                   # @main
 	i32.load	$push3=, ffstesttab+4($pop41)
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %for.cond
-	i32.const	$push52=, 0
-	i32.load	$push51=, ffstesttab+8($pop52)
-	tee_local	$push50=, $0=, $pop51
-	i32.ctz 	$push5=, $pop50
-	i32.const	$push49=, 1
-	i32.add 	$push6=, $pop5, $pop49
+# %bb.1:                                # %for.cond
 	i32.const	$push48=, 0
-	i32.select	$push7=, $pop6, $pop48, $0
-	i32.const	$push47=, 0
-	i32.load	$push8=, ffstesttab+12($pop47)
+	i32.load	$0=, ffstesttab+8($pop48)
+	i32.ctz 	$push5=, $0
+	i32.const	$push47=, 1
+	i32.add 	$push6=, $pop5, $pop47
+	i32.const	$push46=, 0
+	i32.select	$push7=, $pop6, $pop46, $0
+	i32.const	$push45=, 0
+	i32.load	$push8=, ffstesttab+12($pop45)
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %for.cond.1
-	i32.const	$push58=, 0
-	i32.load	$push57=, ffstesttab+16($pop58)
-	tee_local	$push56=, $0=, $pop57
-	i32.ctz 	$push10=, $pop56
+# %bb.2:                                # %for.cond.1
+	i32.const	$push52=, 0
+	i32.load	$0=, ffstesttab+16($pop52)
+	i32.ctz 	$push10=, $0
+	i32.const	$push51=, 1
+	i32.add 	$push11=, $pop10, $pop51
+	i32.const	$push50=, 0
+	i32.select	$push12=, $pop11, $pop50, $0
+	i32.const	$push49=, 0
+	i32.load	$push13=, ffstesttab+20($pop49)
+	i32.ne  	$push14=, $pop12, $pop13
+	br_if   	0, $pop14       # 0: down to label0
+# %bb.3:                                # %for.cond.2
+	i32.const	$push56=, 0
+	i32.load	$0=, ffstesttab+24($pop56)
+	i32.ctz 	$push15=, $0
 	i32.const	$push55=, 1
-	i32.add 	$push11=, $pop10, $pop55
+	i32.add 	$push16=, $pop15, $pop55
 	i32.const	$push54=, 0
-	i32.select	$push12=, $pop11, $pop54, $0
+	i32.select	$push17=, $pop16, $pop54, $0
 	i32.const	$push53=, 0
-	i32.load	$push13=, ffstesttab+20($pop53)
-	i32.ne  	$push14=, $pop12, $pop13
-	br_if   	0, $pop14       # 0: down to label0
-# BB#3:                                 # %for.cond.2
-	i32.const	$push64=, 0
-	i32.load	$push63=, ffstesttab+24($pop64)
-	tee_local	$push62=, $0=, $pop63
-	i32.ctz 	$push15=, $pop62
-	i32.const	$push61=, 1
-	i32.add 	$push16=, $pop15, $pop61
-	i32.const	$push60=, 0
-	i32.select	$push17=, $pop16, $pop60, $0
-	i32.const	$push59=, 0
-	i32.load	$push18=, ffstesttab+28($pop59)
+	i32.load	$push18=, ffstesttab+28($pop53)
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#4:                                 # %for.cond.3
-	i32.const	$push70=, 0
-	i32.load	$push69=, ffstesttab+32($pop70)
-	tee_local	$push68=, $0=, $pop69
-	i32.ctz 	$push20=, $pop68
-	i32.const	$push67=, 1
-	i32.add 	$push21=, $pop20, $pop67
-	i32.const	$push66=, 0
-	i32.select	$push22=, $pop21, $pop66, $0
-	i32.const	$push65=, 0
-	i32.load	$push23=, ffstesttab+36($pop65)
+# %bb.4:                                # %for.cond.3
+	i32.const	$push60=, 0
+	i32.load	$0=, ffstesttab+32($pop60)
+	i32.ctz 	$push20=, $0
+	i32.const	$push59=, 1
+	i32.add 	$push21=, $pop20, $pop59
+	i32.const	$push58=, 0
+	i32.select	$push22=, $pop21, $pop58, $0
+	i32.const	$push57=, 0
+	i32.load	$push23=, ffstesttab+36($pop57)
 	i32.ne  	$push24=, $pop22, $pop23
 	br_if   	0, $pop24       # 0: down to label0
-# BB#5:                                 # %for.cond.4
-	i32.const	$push76=, 0
-	i32.load	$push75=, ffstesttab+40($pop76)
-	tee_local	$push74=, $0=, $pop75
-	i32.ctz 	$push25=, $pop74
-	i32.const	$push73=, 1
-	i32.add 	$push26=, $pop25, $pop73
-	i32.const	$push72=, 0
-	i32.select	$push27=, $pop26, $pop72, $0
-	i32.const	$push71=, 0
-	i32.load	$push28=, ffstesttab+44($pop71)
+# %bb.5:                                # %for.cond.4
+	i32.const	$push64=, 0
+	i32.load	$0=, ffstesttab+40($pop64)
+	i32.ctz 	$push25=, $0
+	i32.const	$push63=, 1
+	i32.add 	$push26=, $pop25, $pop63
+	i32.const	$push62=, 0
+	i32.select	$push27=, $pop26, $pop62, $0
+	i32.const	$push61=, 0
+	i32.load	$push28=, ffstesttab+44($pop61)
 	i32.ne  	$push29=, $pop27, $pop28
 	br_if   	0, $pop29       # 0: down to label0
-# BB#6:                                 # %for.cond.5
-	i32.const	$push82=, 0
-	i32.load	$push81=, ffstesttab+48($pop82)
-	tee_local	$push80=, $0=, $pop81
-	i32.ctz 	$push30=, $pop80
-	i32.const	$push79=, 1
-	i32.add 	$push31=, $pop30, $pop79
-	i32.const	$push78=, 0
-	i32.select	$push32=, $pop31, $pop78, $0
-	i32.const	$push77=, 0
-	i32.load	$push33=, ffstesttab+52($pop77)
+# %bb.6:                                # %for.cond.5
+	i32.const	$push68=, 0
+	i32.load	$0=, ffstesttab+48($pop68)
+	i32.ctz 	$push30=, $0
+	i32.const	$push67=, 1
+	i32.add 	$push31=, $pop30, $pop67
+	i32.const	$push66=, 0
+	i32.select	$push32=, $pop31, $pop66, $0
+	i32.const	$push65=, 0
+	i32.load	$push33=, ffstesttab+52($pop65)
 	i32.ne  	$push34=, $pop32, $pop33
 	br_if   	0, $pop34       # 0: down to label0
-# BB#7:                                 # %for.cond.6
-	i32.const	$push88=, 0
-	i32.load	$push87=, ffstesttab+56($pop88)
-	tee_local	$push86=, $0=, $pop87
-	i32.ctz 	$push35=, $pop86
-	i32.const	$push85=, 1
-	i32.add 	$push36=, $pop35, $pop85
-	i32.const	$push84=, 0
-	i32.select	$push37=, $pop36, $pop84, $0
-	i32.const	$push83=, 0
-	i32.load	$push38=, ffstesttab+60($pop83)
+# %bb.7:                                # %for.cond.6
+	i32.const	$push72=, 0
+	i32.load	$0=, ffstesttab+56($pop72)
+	i32.ctz 	$push35=, $0
+	i32.const	$push71=, 1
+	i32.add 	$push36=, $pop35, $pop71
+	i32.const	$push70=, 0
+	i32.select	$push37=, $pop36, $pop70, $0
+	i32.const	$push69=, 0
+	i32.load	$push38=, ffstesttab+60($pop69)
 	i32.ne  	$push39=, $pop37, $pop38
 	br_if   	0, $pop39       # 0: down to label0
-# BB#8:                                 # %for.cond.7
+# %bb.8:                                # %for.cond.7
 	i32.const	$push40=, 0
 	call    	exit@FUNCTION, $pop40
 	unreachable
@@ -149,6 +141,6 @@ ffstesttab:
 	.size	ffstesttab, 64
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9eb55e579..9059d27cf 100644
--- a/test/torture-s/float-floor.c.s
+++ b/test/torture-s/float-floor.c.s
@@ -6,28 +6,53 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	f64
-# BB#0:                                 # %entry
-	block   	
+	.local  	f64, f32, i32
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	f64.load	$push1=, d($pop0)
-	f64.floor	$push10=, $pop1
-	tee_local	$push9=, $0=, $pop10
-	i32.trunc_s/f64	$push2=, $pop9
-	i32.const	$push8=, 1023
-	i32.ne  	$push3=, $pop2, $pop8
-	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	f32.demote/f64	$push4=, $0
-	i32.trunc_s/f32	$push5=, $pop4
-	i32.const	$push11=, 1023
-	i32.ne  	$push6=, $pop5, $pop11
-	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end
-	i32.const	$push7=, 0
-	return  	$pop7
-.LBB0_3:                                # %if.then
+	f64.floor	$0=, $pop1
+	block   	
+	block   	
+	f64.abs 	$push7=, $0
+	f64.const	$push8=, 0x1p31
+	f64.lt  	$push9=, $pop7, $pop8
+	br_if   	0, $pop9        # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$2=, -2147483648
+	br      	1               # 1: down to label0
+.LBB0_2:                                # %entry
+	end_block                       # label1:
+	i32.trunc_s/f64	$2=, $0
+.LBB0_3:                                # %entry
 	end_block                       # label0:
+	block   	
+	i32.const	$push2=, 1023
+	i32.ne  	$push3=, $2, $pop2
+	br_if   	0, $pop3        # 0: down to label2
+# %bb.4:                                # %lor.lhs.false
+	f32.demote/f64	$1=, $0
+	block   	
+	block   	
+	f32.abs 	$push10=, $1
+	f32.const	$push11=, 0x1p31
+	f32.lt  	$push12=, $pop10, $pop11
+	br_if   	0, $pop12       # 0: down to label4
+# %bb.5:                                # %lor.lhs.false
+	i32.const	$2=, -2147483648
+	br      	1               # 1: down to label3
+.LBB0_6:                                # %lor.lhs.false
+	end_block                       # label4:
+	i32.trunc_s/f32	$2=, $1
+.LBB0_7:                                # %lor.lhs.false
+	end_block                       # label3:
+	i32.const	$push4=, 1023
+	i32.ne  	$push5=, $2, $pop4
+	br_if   	0, $pop5        # 0: down to label2
+# %bb.8:                                # %if.end
+	i32.const	$push6=, 0
+	return  	$pop6
+.LBB0_9:                                # %if.then
+	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -44,5 +69,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/floatunsisf-1.c.s b/test/torture-s/floatunsisf-1.c.s
index a2ce57726..42c32e575 100644
--- a/test/torture-s/floatunsisf-1.c.s
+++ b/test/torture-s/floatunsisf-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.const	$push9=, 0
 	i32.load	$push0=, u($pop9)
@@ -22,7 +22,7 @@ main:                                   # @main
 	f32.load	$push4=, f2($pop6)
 	f32.eq  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -62,6 +62,6 @@ f2:
 	.size	f2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fff4b53fa..33d1e338e 100644
--- a/test/torture-s/fprintf-1.c.s
+++ b/test/torture-s/fprintf-1.c.s
@@ -7,21 +7,19 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push47=, 0
+# %bb.0:                                # %entry
 	i32.const	$push45=, 0
 	i32.load	$push44=, __stack_pointer($pop45)
 	i32.const	$push46=, 144
-	i32.sub 	$push75=, $pop44, $pop46
-	tee_local	$push74=, $1=, $pop75
-	i32.store	__stack_pointer($pop47), $pop74
+	i32.sub 	$1=, $pop44, $pop46
+	i32.const	$push47=, 0
+	i32.store	__stack_pointer($pop47), $1
+	i32.const	$push71=, 0
+	i32.load	$0=, stdout($pop71)
 	i32.const	$push1=, .L.str
 	i32.const	$push0=, 5
-	i32.const	$push73=, 1
-	i32.const	$push72=, 0
-	i32.load	$push71=, stdout($pop72)
-	tee_local	$push70=, $0=, $pop71
-	i32.call	$drop=, fwrite@FUNCTION, $pop1, $pop0, $pop73, $pop70
+	i32.const	$push70=, 1
+	i32.call	$drop=, fwrite@FUNCTION, $pop1, $pop0, $pop70, $0
 	block   	
 	i32.const	$push69=, .L.str
 	i32.const	$push68=, 0
@@ -29,84 +27,84 @@ main:                                   # @main
 	i32.const	$push67=, 5
 	i32.ne  	$push3=, $pop2, $pop67
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, .L.str.1
 	i32.const	$push4=, 6
-	i32.const	$push79=, 1
-	i32.call	$drop=, fwrite@FUNCTION, $pop5, $pop4, $pop79, $0
-	i32.const	$push78=, .L.str.1
-	i32.const	$push77=, 0
-	i32.call	$push6=, fprintf@FUNCTION, $0, $pop78, $pop77
-	i32.const	$push76=, 6
-	i32.ne  	$push7=, $pop6, $pop76
+	i32.const	$push75=, 1
+	i32.call	$drop=, fwrite@FUNCTION, $pop5, $pop4, $pop75, $0
+	i32.const	$push74=, .L.str.1
+	i32.const	$push73=, 0
+	i32.call	$push6=, fprintf@FUNCTION, $0, $pop74, $pop73
+	i32.const	$push72=, 6
+	i32.ne  	$push7=, $pop6, $pop72
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push8=, 97
 	i32.call	$drop=, fputc@FUNCTION, $pop8, $0
 	i32.const	$push9=, .L.str.2
-	i32.const	$push80=, 0
-	i32.call	$push10=, fprintf@FUNCTION, $0, $pop9, $pop80
+	i32.const	$push76=, 0
+	i32.call	$push10=, fprintf@FUNCTION, $0, $pop9, $pop76
 	i32.const	$push11=, 1
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push13=, .L.str.3
-	i32.const	$push81=, 0
-	i32.call	$push14=, fprintf@FUNCTION, $0, $pop13, $pop81
+	i32.const	$push77=, 0
+	i32.call	$push14=, fprintf@FUNCTION, $0, $pop13, $pop77
 	br_if   	0, $pop14       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push16=, .L.str
 	i32.const	$push15=, 5
-	i32.const	$push85=, 1
-	i32.call	$drop=, fwrite@FUNCTION, $pop16, $pop15, $pop85, $0
-	i32.const	$push84=, .L.str
-	i32.store	128($1), $pop84
-	i32.const	$push83=, .L.str.4
+	i32.const	$push81=, 1
+	i32.call	$drop=, fwrite@FUNCTION, $pop16, $pop15, $pop81, $0
+	i32.const	$push80=, .L.str
+	i32.store	128($1), $pop80
+	i32.const	$push79=, .L.str.4
 	i32.const	$push51=, 128
 	i32.add 	$push52=, $1, $pop51
-	i32.call	$push17=, fprintf@FUNCTION, $0, $pop83, $pop52
-	i32.const	$push82=, 5
-	i32.ne  	$push18=, $pop17, $pop82
+	i32.call	$push17=, fprintf@FUNCTION, $0, $pop79, $pop52
+	i32.const	$push78=, 5
+	i32.ne  	$push18=, $pop17, $pop78
 	br_if   	0, $pop18       # 0: down to label0
-# BB#5:                                 # %if.end21
+# %bb.5:                                # %if.end21
 	i32.const	$push20=, .L.str.1
 	i32.const	$push19=, 6
-	i32.const	$push89=, 1
-	i32.call	$drop=, fwrite@FUNCTION, $pop20, $pop19, $pop89, $0
-	i32.const	$push88=, .L.str.1
-	i32.store	112($1), $pop88
-	i32.const	$push87=, .L.str.4
+	i32.const	$push85=, 1
+	i32.call	$drop=, fwrite@FUNCTION, $pop20, $pop19, $pop85, $0
+	i32.const	$push84=, .L.str.1
+	i32.store	112($1), $pop84
+	i32.const	$push83=, .L.str.4
 	i32.const	$push53=, 112
 	i32.add 	$push54=, $1, $pop53
-	i32.call	$push21=, fprintf@FUNCTION, $0, $pop87, $pop54
-	i32.const	$push86=, 6
-	i32.ne  	$push22=, $pop21, $pop86
+	i32.call	$push21=, fprintf@FUNCTION, $0, $pop83, $pop54
+	i32.const	$push82=, 6
+	i32.ne  	$push22=, $pop21, $pop82
 	br_if   	0, $pop22       # 0: down to label0
-# BB#6:                                 # %if.end26
+# %bb.6:                                # %if.end26
 	i32.const	$push23=, 97
 	i32.call	$drop=, fputc@FUNCTION, $pop23, $0
 	i32.const	$push24=, .L.str.2
 	i32.store	96($1), $pop24
-	i32.const	$push90=, .L.str.4
+	i32.const	$push86=, .L.str.4
 	i32.const	$push55=, 96
 	i32.add 	$push56=, $1, $pop55
-	i32.call	$push25=, fprintf@FUNCTION, $0, $pop90, $pop56
+	i32.call	$push25=, fprintf@FUNCTION, $0, $pop86, $pop56
 	i32.const	$push26=, 1
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#7:                                 # %if.end31
+# %bb.7:                                # %if.end31
 	i32.const	$push28=, .L.str.3
 	i32.store	80($1), $pop28
-	i32.const	$push91=, .L.str.4
+	i32.const	$push87=, .L.str.4
 	i32.const	$push57=, 80
 	i32.add 	$push58=, $1, $pop57
-	i32.call	$push29=, fprintf@FUNCTION, $0, $pop91, $pop58
+	i32.call	$push29=, fprintf@FUNCTION, $0, $pop87, $pop58
 	br_if   	0, $pop29       # 0: down to label0
-# BB#8:                                 # %if.end36
+# %bb.8:                                # %if.end36
 	i32.const	$push30=, 120
 	i32.call	$drop=, fputc@FUNCTION, $pop30, $0
-	i32.const	$push92=, 120
-	i32.store	64($1), $pop92
+	i32.const	$push88=, 120
+	i32.store	64($1), $pop88
 	i32.const	$push31=, .L.str.5
 	i32.const	$push59=, 64
 	i32.add 	$push60=, $1, $pop59
@@ -114,43 +112,43 @@ main:                                   # @main
 	i32.const	$push33=, 1
 	i32.ne  	$push34=, $pop32, $pop33
 	br_if   	0, $pop34       # 0: down to label0
-# BB#9:                                 # %if.end41
+# %bb.9:                                # %if.end41
 	i32.const	$push35=, .L.str.1
 	i32.store	48($1), $pop35
 	i32.const	$push36=, .L.str.6
 	i32.const	$push61=, 48
 	i32.add 	$push62=, $1, $pop61
 	i32.call	$drop=, fprintf@FUNCTION, $0, $pop36, $pop62
-	i32.const	$push94=, .L.str.1
-	i32.store	32($1), $pop94
-	i32.const	$push93=, .L.str.6
+	i32.const	$push90=, .L.str.1
+	i32.store	32($1), $pop90
+	i32.const	$push89=, .L.str.6
 	i32.const	$push63=, 32
 	i32.add 	$push64=, $1, $pop63
-	i32.call	$push37=, fprintf@FUNCTION, $0, $pop93, $pop64
+	i32.call	$push37=, fprintf@FUNCTION, $0, $pop89, $pop64
 	i32.const	$push38=, 7
 	i32.ne  	$push39=, $pop37, $pop38
 	br_if   	0, $pop39       # 0: down to label0
-# BB#10:                                # %if.end46
-	i32.const	$push97=, 0
-	i32.store	16($1), $pop97
+# %bb.10:                               # %if.end46
+	i32.const	$push93=, 0
+	i32.store	16($1), $pop93
 	i32.const	$push40=, .L.str.7
 	i32.const	$push65=, 16
 	i32.add 	$push66=, $1, $pop65
 	i32.call	$drop=, fprintf@FUNCTION, $0, $pop40, $pop66
-	i32.const	$push96=, 0
-	i32.store	0($1), $pop96
-	i32.const	$push95=, .L.str.7
-	i32.call	$push41=, fprintf@FUNCTION, $0, $pop95, $1
+	i32.const	$push92=, 0
+	i32.store	0($1), $pop92
+	i32.const	$push91=, .L.str.7
+	i32.call	$push41=, fprintf@FUNCTION, $0, $pop91, $1
 	i32.const	$push42=, 2
 	i32.ne  	$push43=, $pop41, $pop42
 	br_if   	0, $pop43       # 0: down to label0
-# BB#11:                                # %if.end51
+# %bb.11:                               # %if.end51
 	i32.const	$push50=, 0
 	i32.const	$push48=, 144
 	i32.add 	$push49=, $1, $pop48
 	i32.store	__stack_pointer($pop50), $pop49
-	i32.const	$push98=, 0
-	return  	$pop98
+	i32.const	$push94=, 0
+	return  	$pop94
 .LBB0_12:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -201,7 +199,7 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	fprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	fwrite, i32, i32, i32, i32, i32
diff --git a/test/torture-s/fprintf-chk-1.c.s b/test/torture-s/fprintf-chk-1.c.s
index e1aaa68bc..18c6f280c 100644
--- a/test/torture-s/fprintf-chk-1.c.s
+++ b/test/torture-s/fprintf-chk-1.c.s
@@ -8,22 +8,21 @@ __fprintf_chk:                          # @__fprintf_chk
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop2, $pop4
-	tee_local	$push10=, $4=, $pop11
-	i32.store	__stack_pointer($pop5), $pop10
+	i32.sub 	$4=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $4
 	block   	
 	i32.const	$push9=, 0
 	i32.load	$push0=, should_optimize($pop9)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push12=, 0
+# %bb.1:                                # %if.end
+	i32.const	$push10=, 0
 	i32.const	$push1=, 1
-	i32.store	should_optimize($pop12), $pop1
+	i32.store	should_optimize($pop10), $pop1
 	i32.store	12($4), $3
 	i32.call	$3=, vfprintf@FUNCTION, $0, $2, $3
 	i32.const	$push8=, 0
@@ -46,346 +45,344 @@ __fprintf_chk:                          # @__fprintf_chk
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push57=, 0
+# %bb.0:                                # %entry
 	i32.const	$push55=, 0
 	i32.load	$push54=, __stack_pointer($pop55)
 	i32.const	$push56=, 224
-	i32.sub 	$push95=, $pop54, $pop56
-	tee_local	$push94=, $1=, $pop95
-	i32.store	__stack_pointer($pop57), $pop94
-	i32.const	$push93=, 0
+	i32.sub 	$1=, $pop54, $pop56
+	i32.const	$push57=, 0
+	i32.store	__stack_pointer($pop57), $1
+	i32.const	$push91=, 0
 	i32.const	$push0=, 1
-	i32.store	should_optimize($pop93), $pop0
-	i32.const	$push92=, 0
-	i32.load	$push91=, stdout($pop92)
-	tee_local	$push90=, $0=, $pop91
+	i32.store	should_optimize($pop91), $pop0
+	i32.const	$push90=, 0
+	i32.load	$0=, stdout($pop90)
 	i32.const	$push89=, .L.str
 	i32.const	$push88=, 0
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $pop90, $1, $pop89, $pop88
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop89, $pop88
 	block   	
 	i32.const	$push87=, 0
 	i32.load	$push1=, should_optimize($pop87)
-	i32.eqz 	$push200=, $pop1
-	br_if   	0, $pop200      # 0: down to label1
-# BB#1:                                 # %if.end
-	i32.const	$push99=, 0
-	i32.const	$push98=, 0
-	i32.store	should_optimize($pop99), $pop98
-	i32.const	$push97=, .L.str
-	i32.const	$push96=, 0
-	i32.call	$push2=, __fprintf_chk@FUNCTION, $0, $1, $pop97, $pop96
+	i32.eqz 	$push196=, $pop1
+	br_if   	0, $pop196      # 0: down to label1
+# %bb.1:                                # %if.end
+	i32.const	$push95=, 0
+	i32.const	$push94=, 0
+	i32.store	should_optimize($pop95), $pop94
+	i32.const	$push93=, .L.str
+	i32.const	$push92=, 0
+	i32.call	$push2=, __fprintf_chk@FUNCTION, $0, $1, $pop93, $pop92
 	i32.const	$push3=, 5
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
+	i32.const	$push96=, 0
+	i32.load	$push5=, should_optimize($pop96)
+	i32.eqz 	$push197=, $pop5
+	br_if   	0, $pop197      # 0: down to label1
+# %bb.3:                                # %if.end6
 	i32.const	$push100=, 0
-	i32.load	$push5=, should_optimize($pop100)
-	i32.eqz 	$push201=, $pop5
-	br_if   	0, $pop201      # 0: down to label1
-# BB#3:                                 # %if.end6
-	i32.const	$push104=, 0
 	i32.const	$push6=, 1
-	i32.store	should_optimize($pop104), $pop6
-	i32.const	$push103=, .L.str.1
-	i32.const	$push102=, 0
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop103, $pop102
+	i32.store	should_optimize($pop100), $pop6
+	i32.const	$push99=, .L.str.1
+	i32.const	$push98=, 0
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop99, $pop98
+	i32.const	$push97=, 0
+	i32.load	$push7=, should_optimize($pop97)
+	i32.eqz 	$push198=, $pop7
+	br_if   	0, $pop198      # 0: down to label1
+# %bb.4:                                # %if.end10
+	i32.const	$push104=, 0
+	i32.const	$push103=, 0
+	i32.store	should_optimize($pop104), $pop103
+	i32.const	$push102=, .L.str.1
 	i32.const	$push101=, 0
-	i32.load	$push7=, should_optimize($pop101)
-	i32.eqz 	$push202=, $pop7
-	br_if   	0, $pop202      # 0: down to label1
-# BB#4:                                 # %if.end10
-	i32.const	$push108=, 0
-	i32.const	$push107=, 0
-	i32.store	should_optimize($pop108), $pop107
-	i32.const	$push106=, .L.str.1
-	i32.const	$push105=, 0
-	i32.call	$push8=, __fprintf_chk@FUNCTION, $0, $1, $pop106, $pop105
+	i32.call	$push8=, __fprintf_chk@FUNCTION, $0, $1, $pop102, $pop101
 	i32.const	$push9=, 6
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label1
-# BB#5:                                 # %if.end14
-	i32.const	$push109=, 0
-	i32.load	$push11=, should_optimize($pop109)
-	i32.eqz 	$push203=, $pop11
-	br_if   	0, $pop203      # 0: down to label1
-# BB#6:                                 # %if.end17
-	i32.const	$push114=, 0
-	i32.const	$push113=, 1
-	i32.store	should_optimize($pop114), $pop113
-	i32.const	$push112=, .L.str.2
-	i32.const	$push111=, 0
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop112, $pop111
+# %bb.5:                                # %if.end14
+	i32.const	$push105=, 0
+	i32.load	$push11=, should_optimize($pop105)
+	i32.eqz 	$push199=, $pop11
+	br_if   	0, $pop199      # 0: down to label1
+# %bb.6:                                # %if.end17
 	i32.const	$push110=, 0
-	i32.load	$push12=, should_optimize($pop110)
-	i32.eqz 	$push204=, $pop12
-	br_if   	0, $pop204      # 0: down to label1
-# BB#7:                                 # %if.end21
-	i32.const	$push119=, 0
-	i32.const	$push118=, 0
-	i32.store	should_optimize($pop119), $pop118
-	i32.const	$push117=, .L.str.2
-	i32.const	$push116=, 0
-	i32.call	$push13=, __fprintf_chk@FUNCTION, $0, $1, $pop117, $pop116
-	i32.const	$push115=, 1
-	i32.ne  	$push14=, $pop13, $pop115
+	i32.const	$push109=, 1
+	i32.store	should_optimize($pop110), $pop109
+	i32.const	$push108=, .L.str.2
+	i32.const	$push107=, 0
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop108, $pop107
+	i32.const	$push106=, 0
+	i32.load	$push12=, should_optimize($pop106)
+	i32.eqz 	$push200=, $pop12
+	br_if   	0, $pop200      # 0: down to label1
+# %bb.7:                                # %if.end21
+	i32.const	$push115=, 0
+	i32.const	$push114=, 0
+	i32.store	should_optimize($pop115), $pop114
+	i32.const	$push113=, .L.str.2
+	i32.const	$push112=, 0
+	i32.call	$push13=, __fprintf_chk@FUNCTION, $0, $1, $pop113, $pop112
+	i32.const	$push111=, 1
+	i32.ne  	$push14=, $pop13, $pop111
 	br_if   	0, $pop14       # 0: down to label1
-# BB#8:                                 # %if.end25
+# %bb.8:                                # %if.end25
+	i32.const	$push116=, 0
+	i32.load	$push15=, should_optimize($pop116)
+	i32.eqz 	$push201=, $pop15
+	br_if   	0, $pop201      # 0: down to label1
+# %bb.9:                                # %if.end28
 	i32.const	$push120=, 0
-	i32.load	$push15=, should_optimize($pop120)
-	i32.eqz 	$push205=, $pop15
-	br_if   	0, $pop205      # 0: down to label1
-# BB#9:                                 # %if.end28
-	i32.const	$push124=, 0
 	i32.const	$push16=, 1
-	i32.store	should_optimize($pop124), $pop16
-	i32.const	$push123=, .L.str.3
-	i32.const	$push122=, 0
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop123, $pop122
+	i32.store	should_optimize($pop120), $pop16
+	i32.const	$push119=, .L.str.3
+	i32.const	$push118=, 0
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop119, $pop118
+	i32.const	$push117=, 0
+	i32.load	$push17=, should_optimize($pop117)
+	i32.eqz 	$push202=, $pop17
+	br_if   	0, $pop202      # 0: down to label1
+# %bb.10:                               # %if.end32
+	i32.const	$push124=, 0
+	i32.const	$push123=, 0
+	i32.store	should_optimize($pop124), $pop123
+	i32.const	$push122=, .L.str.3
 	i32.const	$push121=, 0
-	i32.load	$push17=, should_optimize($pop121)
-	i32.eqz 	$push206=, $pop17
-	br_if   	0, $pop206      # 0: down to label1
-# BB#10:                                # %if.end32
-	i32.const	$push128=, 0
-	i32.const	$push127=, 0
-	i32.store	should_optimize($pop128), $pop127
-	i32.const	$push126=, .L.str.3
-	i32.const	$push125=, 0
-	i32.call	$push18=, __fprintf_chk@FUNCTION, $0, $1, $pop126, $pop125
+	i32.call	$push18=, __fprintf_chk@FUNCTION, $0, $1, $pop122, $pop121
 	br_if   	0, $pop18       # 0: down to label1
-# BB#11:                                # %if.end36
+# %bb.11:                               # %if.end36
+	i32.const	$push125=, 0
+	i32.load	$push19=, should_optimize($pop125)
+	i32.eqz 	$push203=, $pop19
+	br_if   	0, $pop203      # 0: down to label1
+# %bb.12:                               # %if.end39
 	i32.const	$push129=, 0
-	i32.load	$push19=, should_optimize($pop129)
-	i32.eqz 	$push207=, $pop19
-	br_if   	0, $pop207      # 0: down to label1
-# BB#12:                                # %if.end39
-	i32.const	$push133=, 0
 	i32.const	$push20=, 1
-	i32.store	should_optimize($pop133), $pop20
-	i32.const	$push132=, .L.str
-	i32.store	208($1), $pop132
-	i32.const	$push131=, .L.str.4
+	i32.store	should_optimize($pop129), $pop20
+	i32.const	$push128=, .L.str
+	i32.store	208($1), $pop128
+	i32.const	$push127=, .L.str.4
 	i32.const	$push61=, 208
 	i32.add 	$push62=, $1, $pop61
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop131, $pop62
-	i32.const	$push130=, 0
-	i32.load	$push21=, should_optimize($pop130)
-	i32.eqz 	$push208=, $pop21
-	br_if   	0, $pop208      # 0: down to label1
-# BB#13:                                # %if.end43
-	i32.const	$push137=, .L.str
-	i32.store	192($1), $pop137
-	i32.const	$push136=, 0
-	i32.const	$push135=, 0
-	i32.store	should_optimize($pop136), $pop135
-	i32.const	$push134=, .L.str.4
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop127, $pop62
+	i32.const	$push126=, 0
+	i32.load	$push21=, should_optimize($pop126)
+	i32.eqz 	$push204=, $pop21
+	br_if   	0, $pop204      # 0: down to label1
+# %bb.13:                               # %if.end43
+	i32.const	$push133=, .L.str
+	i32.store	192($1), $pop133
+	i32.const	$push132=, 0
+	i32.const	$push131=, 0
+	i32.store	should_optimize($pop132), $pop131
+	i32.const	$push130=, .L.str.4
 	i32.const	$push63=, 192
 	i32.add 	$push64=, $1, $pop63
-	i32.call	$push22=, __fprintf_chk@FUNCTION, $0, $1, $pop134, $pop64
+	i32.call	$push22=, __fprintf_chk@FUNCTION, $0, $1, $pop130, $pop64
 	i32.const	$push23=, 5
 	i32.ne  	$push24=, $pop22, $pop23
 	br_if   	0, $pop24       # 0: down to label1
-# BB#14:                                # %if.end47
+# %bb.14:                               # %if.end47
+	i32.const	$push134=, 0
+	i32.load	$push25=, should_optimize($pop134)
+	i32.eqz 	$push205=, $pop25
+	br_if   	0, $pop205      # 0: down to label1
+# %bb.15:                               # %if.end50
 	i32.const	$push138=, 0
-	i32.load	$push25=, should_optimize($pop138)
-	i32.eqz 	$push209=, $pop25
-	br_if   	0, $pop209      # 0: down to label1
-# BB#15:                                # %if.end50
-	i32.const	$push142=, 0
 	i32.const	$push26=, 1
-	i32.store	should_optimize($pop142), $pop26
-	i32.const	$push141=, .L.str.1
-	i32.store	176($1), $pop141
-	i32.const	$push140=, .L.str.4
+	i32.store	should_optimize($pop138), $pop26
+	i32.const	$push137=, .L.str.1
+	i32.store	176($1), $pop137
+	i32.const	$push136=, .L.str.4
 	i32.const	$push65=, 176
 	i32.add 	$push66=, $1, $pop65
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop140, $pop66
-	i32.const	$push139=, 0
-	i32.load	$push27=, should_optimize($pop139)
-	i32.eqz 	$push210=, $pop27
-	br_if   	0, $pop210      # 0: down to label1
-# BB#16:                                # %if.end54
-	i32.const	$push146=, .L.str.1
-	i32.store	160($1), $pop146
-	i32.const	$push145=, 0
-	i32.const	$push144=, 0
-	i32.store	should_optimize($pop145), $pop144
-	i32.const	$push143=, .L.str.4
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop136, $pop66
+	i32.const	$push135=, 0
+	i32.load	$push27=, should_optimize($pop135)
+	i32.eqz 	$push206=, $pop27
+	br_if   	0, $pop206      # 0: down to label1
+# %bb.16:                               # %if.end54
+	i32.const	$push142=, .L.str.1
+	i32.store	160($1), $pop142
+	i32.const	$push141=, 0
+	i32.const	$push140=, 0
+	i32.store	should_optimize($pop141), $pop140
+	i32.const	$push139=, .L.str.4
 	i32.const	$push67=, 160
 	i32.add 	$push68=, $1, $pop67
-	i32.call	$push28=, __fprintf_chk@FUNCTION, $0, $1, $pop143, $pop68
+	i32.call	$push28=, __fprintf_chk@FUNCTION, $0, $1, $pop139, $pop68
 	i32.const	$push29=, 6
 	i32.ne  	$push30=, $pop28, $pop29
 	br_if   	0, $pop30       # 0: down to label1
-# BB#17:                                # %if.end58
-	i32.const	$push147=, 0
-	i32.load	$push31=, should_optimize($pop147)
-	i32.eqz 	$push211=, $pop31
-	br_if   	0, $pop211      # 0: down to label1
-# BB#18:                                # %if.end61
-	i32.const	$push152=, 0
-	i32.const	$push151=, 1
-	i32.store	should_optimize($pop152), $pop151
-	i32.const	$push150=, .L.str.2
-	i32.store	144($1), $pop150
-	i32.const	$push149=, .L.str.4
+# %bb.17:                               # %if.end58
+	i32.const	$push143=, 0
+	i32.load	$push31=, should_optimize($pop143)
+	i32.eqz 	$push207=, $pop31
+	br_if   	0, $pop207      # 0: down to label1
+# %bb.18:                               # %if.end61
+	i32.const	$push148=, 0
+	i32.const	$push147=, 1
+	i32.store	should_optimize($pop148), $pop147
+	i32.const	$push146=, .L.str.2
+	i32.store	144($1), $pop146
+	i32.const	$push145=, .L.str.4
 	i32.const	$push69=, 144
 	i32.add 	$push70=, $1, $pop69
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop149, $pop70
-	i32.const	$push148=, 0
-	i32.load	$push32=, should_optimize($pop148)
-	i32.eqz 	$push212=, $pop32
-	br_if   	0, $pop212      # 0: down to label1
-# BB#19:                                # %if.end65
-	i32.const	$push157=, .L.str.2
-	i32.store	128($1), $pop157
-	i32.const	$push156=, 0
-	i32.const	$push155=, 0
-	i32.store	should_optimize($pop156), $pop155
-	i32.const	$push154=, .L.str.4
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop145, $pop70
+	i32.const	$push144=, 0
+	i32.load	$push32=, should_optimize($pop144)
+	i32.eqz 	$push208=, $pop32
+	br_if   	0, $pop208      # 0: down to label1
+# %bb.19:                               # %if.end65
+	i32.const	$push153=, .L.str.2
+	i32.store	128($1), $pop153
+	i32.const	$push152=, 0
+	i32.const	$push151=, 0
+	i32.store	should_optimize($pop152), $pop151
+	i32.const	$push150=, .L.str.4
 	i32.const	$push71=, 128
 	i32.add 	$push72=, $1, $pop71
-	i32.call	$push33=, __fprintf_chk@FUNCTION, $0, $1, $pop154, $pop72
-	i32.const	$push153=, 1
-	i32.ne  	$push34=, $pop33, $pop153
+	i32.call	$push33=, __fprintf_chk@FUNCTION, $0, $1, $pop150, $pop72
+	i32.const	$push149=, 1
+	i32.ne  	$push34=, $pop33, $pop149
 	br_if   	0, $pop34       # 0: down to label1
-# BB#20:                                # %if.end69
+# %bb.20:                               # %if.end69
+	i32.const	$push154=, 0
+	i32.load	$push35=, should_optimize($pop154)
+	i32.eqz 	$push209=, $pop35
+	br_if   	0, $pop209      # 0: down to label1
+# %bb.21:                               # %if.end72
 	i32.const	$push158=, 0
-	i32.load	$push35=, should_optimize($pop158)
-	i32.eqz 	$push213=, $pop35
-	br_if   	0, $pop213      # 0: down to label1
-# BB#21:                                # %if.end72
-	i32.const	$push162=, 0
 	i32.const	$push36=, 1
-	i32.store	should_optimize($pop162), $pop36
-	i32.const	$push161=, .L.str.3
-	i32.store	112($1), $pop161
-	i32.const	$push160=, .L.str.4
+	i32.store	should_optimize($pop158), $pop36
+	i32.const	$push157=, .L.str.3
+	i32.store	112($1), $pop157
+	i32.const	$push156=, .L.str.4
 	i32.const	$push73=, 112
 	i32.add 	$push74=, $1, $pop73
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop160, $pop74
-	i32.const	$push159=, 0
-	i32.load	$push37=, should_optimize($pop159)
-	i32.eqz 	$push214=, $pop37
-	br_if   	0, $pop214      # 0: down to label1
-# BB#22:                                # %if.end76
-	i32.const	$push166=, .L.str.3
-	i32.store	96($1), $pop166
-	i32.const	$push165=, 0
-	i32.const	$push164=, 0
-	i32.store	should_optimize($pop165), $pop164
-	i32.const	$push163=, .L.str.4
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop156, $pop74
+	i32.const	$push155=, 0
+	i32.load	$push37=, should_optimize($pop155)
+	i32.eqz 	$push210=, $pop37
+	br_if   	0, $pop210      # 0: down to label1
+# %bb.22:                               # %if.end76
+	i32.const	$push162=, .L.str.3
+	i32.store	96($1), $pop162
+	i32.const	$push161=, 0
+	i32.const	$push160=, 0
+	i32.store	should_optimize($pop161), $pop160
+	i32.const	$push159=, .L.str.4
 	i32.const	$push75=, 96
 	i32.add 	$push76=, $1, $pop75
-	i32.call	$push38=, __fprintf_chk@FUNCTION, $0, $1, $pop163, $pop76
+	i32.call	$push38=, __fprintf_chk@FUNCTION, $0, $1, $pop159, $pop76
 	br_if   	0, $pop38       # 0: down to label1
-# BB#23:                                # %if.end80
-	i32.const	$push167=, 0
-	i32.load	$push39=, should_optimize($pop167)
-	i32.eqz 	$push215=, $pop39
-	br_if   	0, $pop215      # 0: down to label1
-# BB#24:                                # %if.end83
-	i32.const	$push172=, 0
-	i32.const	$push171=, 1
-	i32.store	should_optimize($pop172), $pop171
-	i32.const	$push170=, 120
-	i32.store	80($1), $pop170
-	i32.const	$push169=, .L.str.5
+# %bb.23:                               # %if.end80
+	i32.const	$push163=, 0
+	i32.load	$push39=, should_optimize($pop163)
+	i32.eqz 	$push211=, $pop39
+	br_if   	0, $pop211      # 0: down to label1
+# %bb.24:                               # %if.end83
+	i32.const	$push168=, 0
+	i32.const	$push167=, 1
+	i32.store	should_optimize($pop168), $pop167
+	i32.const	$push166=, 120
+	i32.store	80($1), $pop166
+	i32.const	$push165=, .L.str.5
 	i32.const	$push77=, 80
 	i32.add 	$push78=, $1, $pop77
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop169, $pop78
-	i32.const	$push168=, 0
-	i32.load	$push40=, should_optimize($pop168)
-	i32.eqz 	$push216=, $pop40
-	br_if   	0, $pop216      # 0: down to label1
-# BB#25:                                # %if.end87
-	i32.const	$push177=, 120
-	i32.store	64($1), $pop177
-	i32.const	$push176=, 0
-	i32.const	$push175=, 0
-	i32.store	should_optimize($pop176), $pop175
-	i32.const	$push174=, .L.str.5
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop165, $pop78
+	i32.const	$push164=, 0
+	i32.load	$push40=, should_optimize($pop164)
+	i32.eqz 	$push212=, $pop40
+	br_if   	0, $pop212      # 0: down to label1
+# %bb.25:                               # %if.end87
+	i32.const	$push173=, 120
+	i32.store	64($1), $pop173
+	i32.const	$push172=, 0
+	i32.const	$push171=, 0
+	i32.store	should_optimize($pop172), $pop171
+	i32.const	$push170=, .L.str.5
 	i32.const	$push79=, 64
 	i32.add 	$push80=, $1, $pop79
-	i32.call	$push41=, __fprintf_chk@FUNCTION, $0, $1, $pop174, $pop80
-	i32.const	$push173=, 1
-	i32.ne  	$push42=, $pop41, $pop173
+	i32.call	$push41=, __fprintf_chk@FUNCTION, $0, $1, $pop170, $pop80
+	i32.const	$push169=, 1
+	i32.ne  	$push42=, $pop41, $pop169
 	br_if   	0, $pop42       # 0: down to label1
-# BB#26:                                # %if.end91
+# %bb.26:                               # %if.end91
+	i32.const	$push174=, 0
+	i32.load	$push43=, should_optimize($pop174)
+	i32.eqz 	$push213=, $pop43
+	br_if   	0, $pop213      # 0: down to label1
+# %bb.27:                               # %if.end94
+	i32.const	$push179=, .L.str.1
+	i32.store	48($1), $pop179
 	i32.const	$push178=, 0
-	i32.load	$push43=, should_optimize($pop178)
-	i32.eqz 	$push217=, $pop43
-	br_if   	0, $pop217      # 0: down to label1
-# BB#27:                                # %if.end94
+	i32.const	$push177=, 0
+	i32.store	should_optimize($pop178), $pop177
+	i32.const	$push176=, .L.str.6
+	i32.const	$push81=, 48
+	i32.add 	$push82=, $1, $pop81
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop176, $pop82
+	i32.const	$push175=, 0
+	i32.load	$push44=, should_optimize($pop175)
+	i32.eqz 	$push214=, $pop44
+	br_if   	0, $pop214      # 0: down to label1
+# %bb.28:                               # %if.end98
 	i32.const	$push183=, .L.str.1
-	i32.store	48($1), $pop183
+	i32.store	32($1), $pop183
 	i32.const	$push182=, 0
 	i32.const	$push181=, 0
 	i32.store	should_optimize($pop182), $pop181
 	i32.const	$push180=, .L.str.6
-	i32.const	$push81=, 48
-	i32.add 	$push82=, $1, $pop81
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop180, $pop82
-	i32.const	$push179=, 0
-	i32.load	$push44=, should_optimize($pop179)
-	i32.eqz 	$push218=, $pop44
-	br_if   	0, $pop218      # 0: down to label1
-# BB#28:                                # %if.end98
-	i32.const	$push187=, .L.str.1
-	i32.store	32($1), $pop187
-	i32.const	$push186=, 0
-	i32.const	$push185=, 0
-	i32.store	should_optimize($pop186), $pop185
-	i32.const	$push184=, .L.str.6
 	i32.const	$push83=, 32
 	i32.add 	$push84=, $1, $pop83
-	i32.call	$push45=, __fprintf_chk@FUNCTION, $0, $1, $pop184, $pop84
+	i32.call	$push45=, __fprintf_chk@FUNCTION, $0, $1, $pop180, $pop84
 	i32.const	$push46=, 7
 	i32.ne  	$push47=, $pop45, $pop46
 	br_if   	0, $pop47       # 0: down to label1
-# BB#29:                                # %if.end102
+# %bb.29:                               # %if.end102
+	i32.const	$push184=, 0
+	i32.load	$push48=, should_optimize($pop184)
+	i32.eqz 	$push215=, $pop48
+	br_if   	0, $pop215      # 0: down to label1
+# %bb.30:                               # %if.end105
+	i32.const	$push189=, 0
+	i32.store	16($1), $pop189
 	i32.const	$push188=, 0
-	i32.load	$push48=, should_optimize($pop188)
-	i32.eqz 	$push219=, $pop48
-	br_if   	0, $pop219      # 0: down to label1
-# BB#30:                                # %if.end105
+	i32.const	$push187=, 0
+	i32.store	should_optimize($pop188), $pop187
+	i32.const	$push186=, .L.str.7
+	i32.const	$push85=, 16
+	i32.add 	$push86=, $1, $pop85
+	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop186, $pop86
+	i32.const	$push185=, 0
+	i32.load	$push49=, should_optimize($pop185)
+	i32.eqz 	$push216=, $pop49
+	br_if   	0, $pop216      # 0: down to label1
+# %bb.31:                               # %if.end109
 	i32.const	$push193=, 0
-	i32.store	16($1), $pop193
+	i32.store	0($1), $pop193
 	i32.const	$push192=, 0
 	i32.const	$push191=, 0
 	i32.store	should_optimize($pop192), $pop191
 	i32.const	$push190=, .L.str.7
-	i32.const	$push85=, 16
-	i32.add 	$push86=, $1, $pop85
-	i32.call	$drop=, __fprintf_chk@FUNCTION, $0, $1, $pop190, $pop86
-	i32.const	$push189=, 0
-	i32.load	$push49=, should_optimize($pop189)
-	i32.eqz 	$push220=, $pop49
-	br_if   	0, $pop220      # 0: down to label1
-# BB#31:                                # %if.end109
-	i32.const	$push197=, 0
-	i32.store	0($1), $pop197
-	i32.const	$push196=, 0
-	i32.const	$push195=, 0
-	i32.store	should_optimize($pop196), $pop195
-	i32.const	$push194=, .L.str.7
-	i32.call	$push50=, __fprintf_chk@FUNCTION, $0, $1, $pop194, $1
+	i32.call	$push50=, __fprintf_chk@FUNCTION, $0, $1, $pop190, $1
 	i32.const	$push51=, 2
 	i32.ne  	$push52=, $pop50, $pop51
 	br_if   	0, $pop52       # 0: down to label1
-# BB#32:                                # %if.end113
-	i32.const	$push198=, 0
-	i32.load	$push53=, should_optimize($pop198)
-	i32.eqz 	$push221=, $pop53
-	br_if   	0, $pop221      # 0: down to label1
-# BB#33:                                # %if.end116
+# %bb.32:                               # %if.end113
+	i32.const	$push194=, 0
+	i32.load	$push53=, should_optimize($pop194)
+	i32.eqz 	$push217=, $pop53
+	br_if   	0, $pop217      # 0: down to label1
+# %bb.33:                               # %if.end116
 	i32.const	$push60=, 0
 	i32.const	$push58=, 224
 	i32.add 	$push59=, $1, $pop58
 	i32.store	__stack_pointer($pop60), $pop59
-	i32.const	$push199=, 0
-	return  	$pop199
+	i32.const	$push195=, 0
+	return  	$pop195
 .LBB1_34:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -445,7 +442,7 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	vfprintf, i32, i32, i32, i32
 	.import_global	stdout
diff --git a/test/torture-s/frame-address.c.s b/test/torture-s/frame-address.c.s
index 33151d105..12bf39f6c 100644
--- a/test/torture-s/frame-address.c.s
+++ b/test/torture-s/frame-address.c.s
@@ -8,20 +8,19 @@ check_fa_work:                          # @check_fa_work
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop8, $pop10
-	tee_local	$push17=, $2=, $pop18
+	i32.sub 	$2=, $pop8, $pop10
 	i32.const	$push0=, 0
-	i32.store8	15($pop17), $pop0
+	i32.store8	15($2), $pop0
 	block   	
 	i32.const	$push11=, 15
 	i32.add 	$push12=, $2, $pop11
 	i32.le_u	$push1=, $pop12, $0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.le_u	$push4=, $0, $1
 	i32.const	$push13=, 15
 	i32.add 	$push14=, $2, $pop13
@@ -48,12 +47,11 @@ check_fa_mid:                           # @check_fa_mid
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push4=, __stack_pointer($pop2)
-	copy_local	$push6=, $pop4
-	tee_local	$push5=, $1=, $pop6
-	i32.call	$0=, check_fa_work@FUNCTION, $0, $pop5
+	copy_local	$1=, $pop4
+	i32.call	$0=, check_fa_work@FUNCTION, $0, $1
 	i32.const	$push3=, 0
 	i32.store	__stack_pointer($pop3), $1
 	i32.const	$push0=, 0
@@ -71,14 +69,13 @@ check_fa:                               # @check_fa
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop2, $pop4
-	tee_local	$push11=, $2=, $pop12
-	i32.store	__stack_pointer($pop5), $pop11
+	i32.sub 	$2=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $2
 	i32.const	$push9=, 15
 	i32.add 	$push10=, $2, $pop9
 	i32.call	$1=, check_fa_mid@FUNCTION, $pop10
@@ -99,7 +96,7 @@ check_fa:                               # @check_fa
 	.type	how_much,@function
 how_much:                               # @how_much
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -113,12 +110,12 @@ how_much:                               # @how_much
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push0=, check_fa@FUNCTION, $0
 	i32.eqz 	$push2=, $pop0
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push1=, 0
 	return  	$pop1
 .LBB4_2:                                # %if.then
@@ -130,5 +127,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/func-ptr-1.c.s b/test/torture-s/func-ptr-1.c.s
index 4b5f13aa8..a937aa6d5 100644
--- a/test/torture-s/func-ptr-1.c.s
+++ b/test/torture-s/func-ptr-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/gofast.c.s b/test/torture-s/gofast.c.s
index c8b941a29..3de24ce54 100644
--- a/test/torture-s/gofast.c.s
+++ b/test/torture-s/gofast.c.s
@@ -7,7 +7,7 @@
 fp_add:                                 # @fp_add
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.add 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ fp_add:                                 # @fp_add
 fp_sub:                                 # @fp_sub
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.sub 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ fp_sub:                                 # @fp_sub
 fp_mul:                                 # @fp_mul
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.mul 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,7 +49,7 @@ fp_mul:                                 # @fp_mul
 fp_div:                                 # @fp_div
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.div 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -63,7 +63,7 @@ fp_div:                                 # @fp_div
 fp_neg:                                 # @fp_neg
 	.param  	f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.neg 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -77,7 +77,7 @@ fp_neg:                                 # @fp_neg
 dp_add:                                 # @dp_add
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.add 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -91,7 +91,7 @@ dp_add:                                 # @dp_add
 dp_sub:                                 # @dp_sub
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.sub 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -105,7 +105,7 @@ dp_sub:                                 # @dp_sub
 dp_mul:                                 # @dp_mul
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.mul 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -119,7 +119,7 @@ dp_mul:                                 # @dp_mul
 dp_div:                                 # @dp_div
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.div 	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -133,7 +133,7 @@ dp_div:                                 # @dp_div
 dp_neg:                                 # @dp_neg
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.neg 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -147,7 +147,7 @@ dp_neg:                                 # @dp_neg
 fp_to_dp:                               # @fp_to_dp
 	.param  	f32
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.promote/f32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -161,7 +161,7 @@ fp_to_dp:                               # @fp_to_dp
 dp_to_fp:                               # @dp_to_fp
 	.param  	f64
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.demote/f64	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -175,7 +175,7 @@ dp_to_fp:                               # @dp_to_fp
 eqsf2:                                  # @eqsf2
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.eq  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -189,7 +189,7 @@ eqsf2:                                  # @eqsf2
 nesf2:                                  # @nesf2
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.ne  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -203,7 +203,7 @@ nesf2:                                  # @nesf2
 gtsf2:                                  # @gtsf2
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.gt  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -217,7 +217,7 @@ gtsf2:                                  # @gtsf2
 gesf2:                                  # @gesf2
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.ge  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -231,7 +231,7 @@ gesf2:                                  # @gesf2
 ltsf2:                                  # @ltsf2
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.lt  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -245,7 +245,7 @@ ltsf2:                                  # @ltsf2
 lesf2:                                  # @lesf2
 	.param  	f32, f32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.le  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -259,7 +259,7 @@ lesf2:                                  # @lesf2
 eqdf2:                                  # @eqdf2
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.eq  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -273,7 +273,7 @@ eqdf2:                                  # @eqdf2
 nedf2:                                  # @nedf2
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.ne  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -287,7 +287,7 @@ nedf2:                                  # @nedf2
 gtdf2:                                  # @gtdf2
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.gt  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -301,7 +301,7 @@ gtdf2:                                  # @gtdf2
 gedf2:                                  # @gedf2
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.ge  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -315,7 +315,7 @@ gedf2:                                  # @gedf2
 ltdf2:                                  # @ltdf2
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.lt  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -329,7 +329,7 @@ ltdf2:                                  # @ltdf2
 ledf2:                                  # @ledf2
 	.param  	f64, f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.le  	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -343,7 +343,7 @@ ledf2:                                  # @ledf2
 floatsisf:                              # @floatsisf
 	.param  	i32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.convert_s/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -357,7 +357,7 @@ floatsisf:                              # @floatsisf
 floatsidf:                              # @floatsidf
 	.param  	i32
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.convert_s/i32	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -371,9 +371,19 @@ floatsidf:                              # @floatsidf
 fixsfsi:                                # @fixsfsi
 	.param  	f32
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_s/f32	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f32.abs 	$push0=, $0
+	f32.const	$push1=, 0x1p31
+	f32.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label0
+# %bb.1:                                # %entry
+	i32.const	$push3=, -2147483648
+	return  	$pop3
+.LBB26_2:                               # %entry
+	end_block                       # label0:
+	i32.trunc_s/f32	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end26:
 	.size	fixsfsi, .Lfunc_end26-fixsfsi
@@ -385,9 +395,19 @@ fixsfsi:                                # @fixsfsi
 fixdfsi:                                # @fixdfsi
 	.param  	f64
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_s/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.abs 	$push0=, $0
+	f64.const	$push1=, 0x1p31
+	f64.lt  	$push2=, $pop0, $pop1
+	br_if   	0, $pop2        # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$push3=, -2147483648
+	return  	$pop3
+.LBB27_2:                               # %entry
+	end_block                       # label1:
+	i32.trunc_s/f64	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end27:
 	.size	fixdfsi, .Lfunc_end27-fixdfsi
@@ -399,9 +419,21 @@ fixdfsi:                                # @fixdfsi
 fixunssfsi:                             # @fixunssfsi
 	.param  	f32
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_u/f32	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f32.const	$push0=, 0x1p32
+	f32.lt  	$push1=, $0, $pop0
+	f32.const	$push2=, 0x0p0
+	f32.ge  	$push3=, $0, $pop2
+	i32.and 	$push4=, $pop1, $pop3
+	br_if   	0, $pop4        # 0: down to label2
+# %bb.1:                                # %entry
+	i32.const	$push5=, 0
+	return  	$pop5
+.LBB28_2:                               # %entry
+	end_block                       # label2:
+	i32.trunc_u/f32	$push6=, $0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end28:
 	.size	fixunssfsi, .Lfunc_end28-fixunssfsi
@@ -413,9 +445,21 @@ fixunssfsi:                             # @fixunssfsi
 fixunsdfsi:                             # @fixunsdfsi
 	.param  	f64
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.trunc_u/f64	$push0=, $0
-                                        # fallthrough-return: $pop0
+# %bb.0:                                # %entry
+	block   	
+	f64.const	$push0=, 0x1p32
+	f64.lt  	$push1=, $0, $pop0
+	f64.const	$push2=, 0x0p0
+	f64.ge  	$push3=, $0, $pop2
+	i32.and 	$push4=, $pop1, $pop3
+	br_if   	0, $pop4        # 0: down to label3
+# %bb.1:                                # %entry
+	i32.const	$push5=, 0
+	return  	$pop5
+.LBB29_2:                               # %entry
+	end_block                       # label3:
+	i32.trunc_u/f64	$push6=, $0
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end29:
 	.size	fixunsdfsi, .Lfunc_end29-fixunsdfsi
@@ -428,14 +472,13 @@ fail:                                   # @fail
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push16=, $pop6, $pop8
-	tee_local	$push15=, $1=, $pop16
-	i32.store	__stack_pointer($pop9), $pop15
+	i32.sub 	$1=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $1
 	i32.const	$push0=, 0
 	i32.const	$push14=, 0
 	i32.load	$push1=, fail_count($pop14)
@@ -451,8 +494,8 @@ fail:                                   # @fail
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $1, $pop10
 	i32.store	__stack_pointer($pop12), $pop11
-	copy_local	$push17=, $1
-                                        # fallthrough-return: $pop17
+	copy_local	$push15=, $1
+                                        # fallthrough-return: $pop15
 	.endfunc
 .Lfunc_end30:
 	.size	fail, .Lfunc_end30-fail
@@ -463,17 +506,17 @@ fail:                                   # @fail
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end198
+# %bb.0:                                # %if.end198
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, fail_count($pop1)
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end202
+	br_if   	0, $pop0        # 0: down to label4
+# %bb.1:                                # %if.end202
 	i32.const	$push2=, 0
 	call    	exit@FUNCTION, $pop2
 	unreachable
 .LBB31_2:                               # %if.then201
-	end_block                       # label0:
+	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -496,7 +539,7 @@ fail_count:
 	.size	.L.str, 17
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	fprintf, i32, i32, i32
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/ifcvt-onecmpl-abs-1.c.s b/test/torture-s/ifcvt-onecmpl-abs-1.c.s
index e0c3738ec..5bb8f2a2c 100644
--- a/test/torture-s/ifcvt-onecmpl-abs-1.c.s
+++ b/test/torture-s/ifcvt-onecmpl-abs-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
 	i32.shr_s	$push1=, $0, $pop0
 	i32.xor 	$push2=, $pop1, $0
@@ -22,12 +22,12 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -1
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB1_2:                                # %if.then
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/index-1.c.s b/test/torture-s/index-1.c.s
index 6138ec1dd..b0cea4cdd 100644
--- a/test/torture-s/index-1.c.s
+++ b/test/torture-s/index-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-400000
@@ -24,14 +24,14 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, a+120($pop3)
 	i32.const	$push1=, 30
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -92,6 +92,6 @@ a:
 	.size	a, 160
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fdd89f227..1593a0549 100644
--- a/test/torture-s/inst-check.c.s
+++ b/test/torture-s/inst-check.c.s
@@ -7,12 +7,12 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push5=, -1
 	i32.add 	$push6=, $0, $pop5
 	i64.extend_u/i32	$push7=, $pop6
@@ -41,7 +41,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -50,5 +50,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/int-compare.c.s b/test/torture-s/int-compare.c.s
index e0d03560a..d52af919c 100644
--- a/test/torture-s/int-compare.c.s
+++ b/test/torture-s/int-compare.c.s
@@ -7,7 +7,7 @@
 gt:                                     # @gt
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.gt_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ gt:                                     # @gt
 ge:                                     # @ge
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.ge_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ ge:                                     # @ge
 lt:                                     # @lt
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.lt_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,7 +49,7 @@ lt:                                     # @lt
 le:                                     # @le
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.le_s	$push0=, $0, $1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -62,11 +62,11 @@ le:                                     # @le
 	.type	true,@function
 true:                                   # @true
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB4_2:                                # %if.then
 	end_block                       # label0:
@@ -82,10 +82,10 @@ true:                                   # @true
 	.type	false,@function
 false:                                  # @false
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	br_if   	0, $0           # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB5_2:                                # %if.then
 	end_block                       # label1:
@@ -102,7 +102,7 @@ false:                                  # @false
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %true.exit
+# %bb.0:                                # %true.exit
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -115,7 +115,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -124,6 +124,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end7-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 34ca4f0e5..6467b9bff 100644
--- a/test/torture-s/ipa-sra-1.c.s
+++ b/test/torture-s/ipa-sra-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -15,4 +15,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/ipa-sra-2.c.s b/test/torture-s/ipa-sra-2.c.s
index 4efebcd8c..4e0798234 100644
--- a/test/torture-s/ipa-sra-2.c.s
+++ b/test/torture-s/ipa-sra-2.c.s
@@ -8,17 +8,16 @@ main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push2=, 2000
-	i32.gt_s	$push3=, $0, $pop2
+# %bb.0:                                # %entry
 	i32.const	$push1=, 1
 	i32.const	$push0=, 40
-	i32.call	$push5=, calloc@FUNCTION, $pop1, $pop0
-	tee_local	$push4=, $0=, $pop5
-	i32.call	$2=, foo@FUNCTION, $pop3, $pop4
-	call    	free@FUNCTION, $0
-	copy_local	$push6=, $2
-                                        # fallthrough-return: $pop6
+	i32.call	$2=, calloc@FUNCTION, $pop1, $pop0
+	i32.const	$push2=, 2000
+	i32.gt_s	$push3=, $0, $pop2
+	i32.call	$0=, foo@FUNCTION, $pop3, $2
+	call    	free@FUNCTION, $2
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -28,7 +27,7 @@ main:                                   # @main
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3999996
 	i32.add 	$push1=, $1, $pop0
 	i32.select	$push2=, $pop1, $1, $0
@@ -39,6 +38,6 @@ foo:                                    # @foo
 	.size	foo, .Lfunc_end1-foo
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a7f2573a3..a210e221d 100644
--- a/test/torture-s/longlong.c.s
+++ b/test/torture-s/longlong.c.s
@@ -6,24 +6,21 @@
 	.type	alpha_ep_extbl_i_eq_0,@function
 alpha_ep_extbl_i_eq_0:                  # @alpha_ep_extbl_i_eq_0
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push28=, 0
-	i32.load	$push27=, pars($pop28)
-	tee_local	$push26=, $0=, $pop27
+# %bb.0:                                # %entry
+	i32.const	$push24=, 0
+	i32.load	$0=, pars($pop24)
 	i32.const	$push0=, 31
-	i32.and 	$push25=, $pop26, $pop0
-	tee_local	$push24=, $1=, $pop25
+	i32.and 	$1=, $0, $pop0
+	block   	
 	i32.const	$push23=, 31
-	i32.eq  	$push1=, $pop24, $pop23
+	i32.eq  	$push1=, $1, $pop23
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push32=, 0
-	i32.load	$push31=, r($pop32)
-	tee_local	$push30=, $2=, $pop31
+# %bb.1:                                # %if.then
+	i32.const	$push26=, 0
+	i32.load	$2=, r($pop26)
 	i32.const	$push20=, 3
 	i32.shl 	$push21=, $1, $pop20
-	i32.add 	$push22=, $pop30, $pop21
+	i32.add 	$push22=, $2, $pop21
 	i32.const	$push12=, 2
 	i32.shr_u	$push13=, $0, $pop12
 	i32.const	$push4=, 248
@@ -32,8 +29,8 @@ alpha_ep_extbl_i_eq_0:                  # @alpha_ep_extbl_i_eq_0
 	i64.load	$push16=, 0($pop15)
 	i32.const	$push2=, 24
 	i32.shr_u	$push3=, $0, $pop2
-	i32.const	$push29=, 248
-	i32.and 	$push5=, $pop3, $pop29
+	i32.const	$push25=, 248
+	i32.and 	$push5=, $pop3, $pop25
 	i32.add 	$push6=, $2, $pop5
 	i64.load	$push7=, 0($pop6)
 	i64.const	$push8=, 3
@@ -58,16 +55,15 @@ alpha_ep_extbl_i_eq_0:                  # @alpha_ep_extbl_i_eq_0
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %alpha_ep_extbl_i_eq_0.exit
-	i32.const	$push21=, 0
+# %bb.0:                                # %alpha_ep_extbl_i_eq_0.exit
+	i32.const	$push19=, 0
 	i64.const	$push0=, 3160194
-	i64.store	b+136($pop21), $pop0
-	i32.const	$push20=, 0
+	i64.store	b+136($pop19), $pop0
+	i32.const	$push18=, 0
 	i64.const	$push1=, 6003104017374052362
-	i64.store	b+16($pop20), $pop1
-	i32.const	$push19=, 0
-	i32.load	$push18=, r($pop19)
-	tee_local	$push17=, $0=, $pop18
+	i64.store	b+16($pop18), $pop1
+	i32.const	$push17=, 0
+	i32.load	$0=, r($pop17)
 	i64.load	$push7=, 16($0)
 	i64.load	$push2=, 136($0)
 	i64.const	$push3=, 3
@@ -77,7 +73,7 @@ main:                                   # @main
 	i64.shr_u	$push8=, $pop7, $pop6
 	i64.const	$push9=, 255
 	i64.and 	$push10=, $pop8, $pop9
-	i64.store	16($pop17), $pop10
+	i64.store	16($0), $pop10
 	i32.const	$push16=, 0
 	i32.const	$push11=, -2013265854
 	i32.store	pars($pop16), $pop11
@@ -87,9 +83,9 @@ main:                                   # @main
 	i64.const	$push13=, 77
 	i64.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label1
-# BB#1:                                 # %if.end
-	i32.const	$push22=, 0
-	call    	exit@FUNCTION, $pop22
+# %bb.1:                                # %if.end
+	i32.const	$push20=, 0
+	call    	exit@FUNCTION, $pop20
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
@@ -127,6 +123,6 @@ pars:
 	.size	pars, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 255d553d2..bc48d815c 100644
--- a/test/torture-s/loop-1.c.s
+++ b/test/torture-s/loop-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond2.2
+# %bb.0:                                # %for.cond2.2
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-10.c.s b/test/torture-s/loop-10.c.s
index 69674abbc..14cbf5861 100644
--- a/test/torture-s/loop-10.c.s
+++ b/test/torture-s/loop-10.c.s
@@ -7,19 +7,18 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %while.end
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, count($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %while.end
+	i32.const	$push3=, 0
+	i32.load	$0=, count($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 2
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	count($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	count($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end4
-	i32.const	$push6=, 0
-	return  	$pop6
+# %bb.1:                                # %if.end4
+	i32.const	$push4=, 0
+	return  	$pop4
 .LBB0_2:                                # %if.then3
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -36,5 +35,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/loop-11.c.s b/test/torture-s/loop-11.c.s
index 584c75d98..419a3c2c2 100644
--- a/test/torture-s/loop-11.c.s
+++ b/test/torture-s/loop-11.c.s
@@ -7,43 +7,41 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 198
 	i32.const	$0=, a+792
 .LBB0_1:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
 	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	$push7=, -4
+	i32.add 	$0=, $0, $pop7
+	i32.const	$push6=, -1
+	i32.add 	$1=, $1, $pop6
 	i32.const	$push5=, -1
-	i32.ne  	$push0=, $pop6, $pop5
+	i32.ne  	$push0=, $1, $pop5
 	br_if   	0, $pop0        # 0: up to label0
-# BB#2:                                 # %for.body.preheader
+# %bb.2:                                # %for.body.preheader
 	end_loop
-	i32.const	$1=, -1
+	i32.const	$1=, 0
 	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=, $pop10, $pop1
+	i32.ne  	$push2=, $1, $pop1
 	br_if   	1, $pop2        # 1: down to label1
-# BB#4:                                 # %for.cond
+# %bb.4:                                # %for.cond
                                         #   in Loop: Header=BB0_3 Depth=1
-	i32.const	$push14=, 4
-	i32.add 	$0=, $0, $pop14
-	i32.const	$push13=, 197
-	i32.le_u	$push3=, $1, $pop13
+	i32.const	$push10=, 1
+	i32.add 	$1=, $1, $pop10
+	i32.const	$push9=, 4
+	i32.add 	$0=, $0, $pop9
+	i32.const	$push8=, 198
+	i32.le_u	$push3=, $1, $pop8
 	br_if   	0, $pop3        # 0: up to label2
-# BB#5:                                 # %for.end
+# %bb.5:                                # %for.end
 	end_loop
 	i32.const	$push4=, 0
 	return  	$pop4
@@ -63,5 +61,5 @@ a:
 	.size	a, 796
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/loop-12.c.s b/test/torture-s/loop-12.c.s
index 7464a450a..f0905fb15 100644
--- a/test/torture-s/loop-12.c.s
+++ b/test/torture-s/loop-12.c.s
@@ -6,35 +6,33 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$1=, p($pop3)
 .LBB0_1:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.load8_u	$push10=, 0($1)
-	tee_local	$push9=, $0=, $pop10
-	i32.const	$push8=, 10
-	i32.eq  	$push0=, $pop9, $pop8
+	i32.load8_u	$0=, 0($1)
+	i32.const	$push6=, 10
+	i32.eq  	$push0=, $0, $pop6
 	br_if   	1, $pop0        # 1: down to label0
-# BB#2:                                 # %while.cond
+# %bb.2:                                # %while.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push11=, 33
-	i32.eq  	$push1=, $0, $pop11
+	i32.const	$push7=, 33
+	i32.eq  	$push1=, $0, $pop7
 	br_if   	1, $pop1        # 1: down to label0
-# BB#3:                                 # %while.cond
+# %bb.3:                                # %while.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push12=, 59
-	i32.eq  	$push2=, $0, $pop12
+	i32.const	$push8=, 59
+	i32.eq  	$push2=, $0, $pop8
 	br_if   	1, $pop2        # 1: down to label0
-# BB#4:                                 # %while.body
+# %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
+	i32.const	$push5=, 1
+	i32.add 	$1=, $1, $pop5
+	i32.const	$push4=, 0
+	i32.store	p($pop4), $1
 	br      	0               # 0: up to label1
 .LBB0_5:                                # %while.end
 	end_loop
@@ -51,30 +49,29 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, .L.str
 .LBB1_1:                                # %while.cond.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
-	i32.const	$push8=, 0
-	i32.store	p($pop8), $1
-	i32.load8_u	$push7=, 0($1)
-	tee_local	$push6=, $0=, $pop7
+	i32.const	$push6=, 0
+	i32.store	p($pop6), $1
+	i32.load8_u	$0=, 0($1)
 	i32.const	$push5=, 10
-	i32.eq  	$push0=, $pop6, $pop5
+	i32.eq  	$push0=, $0, $pop5
 	br_if   	1, $pop0        # 1: down to label2
-# BB#2:                                 # %while.cond.i
+# %bb.2:                                # %while.cond.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push9=, 33
-	i32.eq  	$push1=, $0, $pop9
+	i32.const	$push7=, 33
+	i32.eq  	$push1=, $0, $pop7
 	br_if   	1, $pop1        # 1: down to label2
-# BB#3:                                 # %while.cond.i
+# %bb.3:                                # %while.cond.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push10=, 59
-	i32.eq  	$push2=, $0, $pop10
+	i32.const	$push8=, 59
+	i32.eq  	$push2=, $0, $pop8
 	br_if   	1, $pop2        # 1: down to label2
-# BB#4:                                 # %while.body.i
+# %bb.4:                                # %while.body.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	i32.const	$push4=, 1
 	i32.add 	$1=, $1, $pop4
@@ -104,4 +101,4 @@ p:
 	.size	.L.str, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/loop-13.c.s b/test/torture-s/loop-13.c.s
index 21464b807..d37c625d0 100644
--- a/test/torture-s/loop-13.c.s
+++ b/test/torture-s/loop-13.c.s
@@ -7,52 +7,48 @@
 scale:                                  # @scale
 	.param  	i32, i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$4=, 0($0)
 	block   	
-	i32.load	$push15=, 0($0)
-	tee_local	$push14=, $3=, $pop15
 	i32.const	$push13=, 1
-	i32.eq  	$push0=, $pop14, $pop13
+	i32.eq  	$push0=, $4, $pop13
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push16=, 1
-	i32.lt_s	$push1=, $2, $pop16
+# %bb.1:                                # %entry
+	i32.const	$push14=, 1
+	i32.lt_s	$push1=, $2, $pop14
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %for.body.lr.ph
+# %bb.2:                                # %for.body.lr.ph
 	i32.load	$push2=, 0($1)
-	i32.mul 	$push3=, $pop2, $3
+	i32.mul 	$push3=, $pop2, $4
 	i32.store	0($1), $pop3
 	i32.load	$push4=, 4($1)
-	i32.mul 	$push5=, $pop4, $3
+	i32.mul 	$push5=, $pop4, $4
 	i32.store	4($1), $pop5
 	i32.const	$push6=, 1
 	i32.eq  	$push7=, $2, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %for.body.for.body_crit_edge.preheader
+# %bb.3:                                # %for.body.for.body_crit_edge.preheader
 	i32.const	$push8=, 12
 	i32.add 	$1=, $1, $pop8
-	i32.const	$push17=, -1
-	i32.add 	$2=, $2, $pop17
+	i32.const	$push15=, -1
+	i32.add 	$4=, $2, $pop15
 .LBB0_4:                                # %for.body.for.body_crit_edge
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
+	i32.load	$2=, 0($0)
 	i32.load	$push9=, 0($1)
-	i32.load	$push26=, 0($0)
-	tee_local	$push25=, $3=, $pop26
-	i32.mul 	$push10=, $pop9, $pop25
+	i32.mul 	$push10=, $pop9, $2
 	i32.store	0($1), $pop10
-	i32.const	$push24=, -4
-	i32.add 	$push23=, $1, $pop24
-	tee_local	$push22=, $4=, $pop23
-	i32.load	$push11=, 0($4)
-	i32.mul 	$push12=, $3, $pop11
-	i32.store	0($pop22), $pop12
-	i32.const	$push21=, 8
-	i32.add 	$1=, $1, $pop21
-	i32.const	$push20=, -1
-	i32.add 	$push19=, $2, $pop20
-	tee_local	$push18=, $2=, $pop19
-	br_if   	0, $pop18       # 0: up to label1
+	i32.const	$push18=, -4
+	i32.add 	$3=, $1, $pop18
+	i32.load	$push11=, 0($3)
+	i32.mul 	$push12=, $2, $pop11
+	i32.store	0($3), $pop12
+	i32.const	$push17=, 8
+	i32.add 	$1=, $1, $pop17
+	i32.const	$push16=, -1
+	i32.add 	$4=, $4, $pop16
+	br_if   	0, $4           # 0: up to label1
 .LBB0_5:                                # %if.end
 	end_loop
 	end_block                       # label0:
@@ -67,7 +63,7 @@ scale:                                  # @scale
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -75,4 +71,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/loop-14.c.s b/test/torture-s/loop-14.c.s
index d5084e128..68c66b37f 100644
--- a/test/torture-s/loop-14.c.s
+++ b/test/torture-s/loop-14.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 90194313258
 	i64.store	4($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -20,7 +20,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, 90194313258
 	i64.store	a3+4($pop1):p2align=2, $pop0
@@ -41,5 +41,5 @@ a3:
 	.size	a3, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-15.c.s b/test/torture-s/loop-15.c.s
index 01c8e3c7e..41bc7fd7b 100644
--- a/test/torture-s/loop-15.c.s
+++ b/test/torture-s/loop-15.c.s
@@ -7,18 +7,17 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.le_u	$push0=, $1, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.preheader
+# %bb.1:                                # %while.body.preheader
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push5=, -4
-	i32.add 	$push4=, $1, $pop5
-	tee_local	$push3=, $2=, $pop4
-	i32.load	$push1=, 0($pop3)
+	i32.const	$push3=, -4
+	i32.add 	$2=, $1, $pop3
+	i32.load	$push1=, 0($2)
 	i32.store	0($1), $pop1
 	copy_local	$1=, $2
 	i32.gt_u	$push2=, $2, $0
@@ -38,34 +37,30 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
-	i32.const	$push18=, 0
-	i32.load	$push17=, __stack_pointer($pop18)
-	i32.const	$push19=, 32
-	i32.sub 	$push28=, $pop17, $pop19
-	tee_local	$push27=, $10=, $pop28
-	i32.store	__stack_pointer($pop20), $pop27
-	i32.const	$9=, 0
+# %bb.0:                                # %entry
+	i32.const	$push19=, 0
+	i32.load	$push18=, __stack_pointer($pop19)
+	i32.const	$push20=, 32
+	i32.sub 	$10=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $10
+	i32.const	$push25=, 4
+	i32.or  	$0=, $10, $pop25
+	i32.const	$2=, 0
 	i32.const	$push1=, 16
 	i32.add 	$6=, $10, $pop1
-	i32.const	$push26=, 4
-	i32.or  	$push25=, $10, $pop26
-	tee_local	$push24=, $0=, $pop25
-	copy_local	$1=, $pop24
+	copy_local	$1=, $0
 .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_13 Depth 3
+                                        #       Child Loop BB1_12 Depth 3
 	block   	
 	loop    	                # label3:
-	copy_local	$push31=, $9
-	tee_local	$push30=, $2=, $pop31
-	i32.const	$push29=, 2
-	i32.shl 	$push0=, $pop30, $pop29
+	i32.const	$push26=, 2
+	i32.shl 	$push0=, $2, $pop26
 	i32.add 	$3=, $10, $pop0
 	copy_local	$4=, $0
 	i32.const	$5=, 0
@@ -75,35 +70,33 @@ main:                                   # @main
                                         #       Child Loop BB1_4 Depth 3
                                         #       Child Loop BB1_6 Depth 3
                                         #       Child Loop BB1_9 Depth 3
-                                        #       Child Loop BB1_13 Depth 3
+                                        #       Child Loop BB1_12 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
+	i32.const	$push29=, 4
+	i32.store	0($6), $pop29
+	i64.const	$push28=, 4294967296
+	i64.store	0($10), $pop28
+	i64.const	$push27=, 12884901890
+	i64.store	8($10), $pop27
+	i32.le_u	$7=, $5, $2
 	block   	
-	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
+	br_if   	0, $7           # 0: down to label5
+# %bb.3:                                # %while.body.lr.ph.i
                                         #   in Loop: Header=BB1_2 Depth=2
-	i32.const	$push37=, 2
-	i32.shl 	$push2=, $5, $pop37
-	i32.add 	$9=, $10, $pop2
+	i32.const	$push30=, 2
+	i32.shl 	$push2=, $5, $pop30
+	i32.add 	$8=, $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    	                # 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
+	i32.const	$push31=, -4
+	i32.add 	$9=, $8, $pop31
+	i32.load	$push3=, 0($9)
+	i32.store	0($8), $pop3
+	copy_local	$8=, $9
+	i32.gt_u	$push4=, $9, $3
 	br_if   	0, $pop4        # 0: up to label6
 .LBB1_5:                                # %for.body11.preheader
                                         #   in Loop: Header=BB1_2 Depth=2
@@ -116,23 +109,22 @@ main:                                   # @main
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label7:
-	i32.const	$push43=, 1
-	i32.add 	$push42=, $9, $pop43
-	tee_local	$push41=, $9=, $pop42
+	i32.const	$push32=, 1
+	i32.add 	$9=, $9, $pop32
 	i32.load	$push5=, 0($8)
-	i32.ne  	$push6=, $pop41, $pop5
+	i32.ne  	$push6=, $9, $pop5
 	br_if   	3, $pop6        # 3: down to label2
-# BB#7:                                 # %for.cond9
+# %bb.7:                                # %for.cond9
                                         #   in Loop: Header=BB1_6 Depth=3
-	i32.const	$push44=, 4
-	i32.add 	$8=, $8, $pop44
+	i32.const	$push33=, 4
+	i32.add 	$8=, $8, $pop33
 	i32.lt_u	$push7=, $9, $2
 	br_if   	0, $pop7        # 0: up to label7
-# BB#8:                                 # %for.end16
+# %bb.8:                                # %for.end16
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
-	copy_local	$9=, $1
-	copy_local	$8=, $2
+	copy_local	$8=, $1
+	copy_local	$9=, $2
 	block   	
 	br_if   	0, $7           # 0: down to label8
 .LBB1_9:                                # %for.body19
@@ -140,78 +132,74 @@ main:                                   # @main
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label9:
-	i32.load	$push8=, 0($9)
-	i32.ne  	$push9=, $8, $pop8
+	i32.load	$push8=, 0($8)
+	i32.ne  	$push9=, $9, $pop8
 	br_if   	4, $pop9        # 4: down to label2
-# BB#10:                                # %for.cond17
+# %bb.10:                               # %for.cond17
                                         #   in Loop: Header=BB1_9 Depth=3
-	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
+	i32.const	$push35=, 1
+	i32.add 	$9=, $9, $pop35
+	i32.const	$push34=, 4
+	i32.add 	$8=, $8, $pop34
+	i32.lt_u	$push10=, $9, $5
 	br_if   	0, $pop10       # 0: up to label9
 .LBB1_11:                               # %for.end26
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
 	end_block                       # label8:
 	block   	
-	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 	$7=, $5, $pop50
+	i32.const	$push37=, 1
+	i32.add 	$8=, $5, $pop37
 	copy_local	$9=, $4
-	copy_local	$8=, $5
-.LBB1_13:                               # %for.body30
+	i32.const	$push36=, 4
+	i32.gt_u	$push11=, $8, $pop36
+	br_if   	0, $pop11       # 0: down to label10
+.LBB1_12:                               # %for.body30
                                         #   Parent Loop BB1_1 Depth=1
                                         #     Parent Loop BB1_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label11:
-	i32.const	$push53=, 1
-	i32.add 	$push52=, $8, $pop53
-	tee_local	$push51=, $8=, $pop52
+	i32.const	$push38=, 1
+	i32.add 	$5=, $5, $pop38
 	i32.load	$push12=, 0($9)
-	i32.ne  	$push13=, $pop51, $pop12
+	i32.ne  	$push13=, $5, $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 	$9=, $9, $pop55
-	i32.const	$push54=, 3
-	i32.le_u	$push14=, $8, $pop54
+# %bb.13:                               # %for.cond28
+                                        #   in Loop: Header=BB1_12 Depth=3
+	i32.const	$push40=, 4
+	i32.add 	$9=, $9, $pop40
+	i32.const	$push39=, 3
+	i32.le_u	$push14=, $5, $pop39
 	br_if   	0, $pop14       # 0: up to label11
-# BB#15:                                # %for.inc38
+# %bb.14:                               # %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.lt_u	$9=, $5, $pop56
-	copy_local	$5=, $7
-	br_if   	1, $9           # 1: up to label4
-.LBB1_16:                               # %for.inc41
+	i32.const	$push42=, 4
+	i32.add 	$4=, $4, $pop42
+	copy_local	$5=, $8
+	i32.const	$push41=, 5
+	i32.lt_u	$push15=, $8, $pop41
+	br_if   	1, $pop15       # 1: up to label4
+.LBB1_15:                               # %for.inc41
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label10:
 	end_loop
-	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
+	i32.const	$push45=, 4
+	i32.add 	$1=, $1, $pop45
+	i32.const	$push44=, 1
+	i32.add 	$2=, $2, $pop44
+	i32.const	$push43=, 5
+	i32.lt_u	$push16=, $2, $pop43
+	br_if   	0, $pop16       # 0: up to label3
+# %bb.16:                               # %for.end43
 	end_loop
-	i32.const	$push23=, 0
-	i32.const	$push21=, 32
-	i32.add 	$push22=, $10, $pop21
-	i32.store	__stack_pointer($pop23), $pop22
-	i32.const	$push16=, 0
-	return  	$pop16
-.LBB1_18:                               # %if.then
+	i32.const	$push24=, 0
+	i32.const	$push22=, 32
+	i32.add 	$push23=, $10, $pop22
+	i32.store	__stack_pointer($pop24), $pop23
+	i32.const	$push17=, 0
+	return  	$pop17
+.LBB1_17:                               # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
 	unreachable
@@ -220,5 +208,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/loop-2.c.s b/test/torture-s/loop-2.c.s
index 005d0e1ed..825832a4b 100644
--- a/test/torture-s/loop-2.c.s
+++ b/test/torture-s/loop-2.c.s
@@ -8,31 +8,30 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push7=, $0
-	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push5=, $0
+	br_if   	0, $pop5        # 0: down to label0
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 0
 	i32.const	$1=, a
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push6=, -2
-	i32.add 	$push0=, $2, $pop6
+	i32.const	$push4=, -2
+	i32.add 	$push0=, $2, $pop4
 	i32.store	0($1), $pop0
-	i32.const	$push5=, 4
-	i32.add 	$1=, $1, $pop5
-	i32.const	$push4=, 1
-	i32.add 	$push3=, $2, $pop4
-	tee_local	$push2=, $2=, $pop3
-	i32.ne  	$push1=, $0, $pop2
+	i32.const	$push3=, 4
+	i32.add 	$1=, $1, $pop3
+	i32.const	$push2=, 1
+	i32.add 	$2=, $2, $pop2
+	i32.ne  	$push1=, $0, $2
 	br_if   	0, $pop1        # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push8=, $2
-                                        # fallthrough-return: $pop8
+	copy_local	$push6=, $2
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -43,7 +42,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, -2
 	i64.store	a($pop1):p2align=2, $pop0
@@ -64,5 +63,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2b.c.s b/test/torture-s/loop-2b.c.s
index 389ac9db1..8ad7946bd 100644
--- a/test/torture-s/loop-2b.c.s
+++ b/test/torture-s/loop-2b.c.s
@@ -8,40 +8,39 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 2147483647
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push2=, 2147483646
-	i32.sub 	$2=, $pop2, $0
+	i32.sub 	$1=, $pop2, $0
 	i32.const	$push3=, 2
 	i32.shl 	$push4=, $0, $pop3
 	i32.const	$push5=, a
-	i32.add 	$0=, $pop4, $pop5
+	i32.add 	$2=, $pop4, $pop5
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push10=, -2
-	i32.store	0($0), $pop10
-	copy_local	$push9=, $2
-	tee_local	$push8=, $1=, $pop9
+	copy_local	$0=, $1
+	i32.const	$push8=, -2
+	i32.store	0($2), $pop8
 	i32.const	$push7=, 2147483645
-	i32.eq  	$push6=, $pop8, $pop7
+	i32.eq  	$push6=, $0, $pop7
 	br_if   	1, $pop6        # 1: down to label0
-# BB#3:                                 # %for.body
+# %bb.3:                                # %for.body
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push12=, -1
-	i32.add 	$2=, $1, $pop12
-	i32.const	$push11=, 4
-	i32.add 	$0=, $0, $pop11
-	br_if   	0, $1           # 0: up to label1
+	i32.const	$push10=, -1
+	i32.add 	$1=, $0, $pop10
+	i32.const	$push9=, 4
+	i32.add 	$2=, $2, $pop9
+	br_if   	0, $0           # 0: up to label1
 .LBB0_4:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push13=, $0
-                                        # fallthrough-return: $pop13
+	copy_local	$push11=, $0
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -52,7 +51,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, -4294967298
 	i64.store	a($pop1):p2align=2, $pop0
@@ -73,5 +72,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2c.c.s b/test/torture-s/loop-2c.c.s
index f5ea63535..cb718c057 100644
--- a/test/torture-s/loop-2c.c.s
+++ b/test/torture-s/loop-2c.c.s
@@ -8,11 +8,11 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push12=, $0
-	br_if   	0, $pop12       # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label0
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-4
@@ -26,19 +26,18 @@ f:                                      # @f
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.store	0($2), $1
-	i32.const	$push11=, -4
-	i32.add 	$2=, $2, $pop11
-	i32.const	$push10=, -3
-	i32.add 	$1=, $1, $pop10
-	i32.const	$push9=, -1
-	i32.add 	$push8=, $0, $pop9
-	tee_local	$push7=, $0=, $pop8
-	br_if   	0, $pop7        # 0: up to label1
+	i32.const	$push9=, -4
+	i32.add 	$2=, $2, $pop9
+	i32.const	$push8=, -3
+	i32.add 	$1=, $1, $pop8
+	i32.const	$push7=, -1
+	i32.add 	$0=, $0, $pop7
+	br_if   	0, $0           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push13=, $2
-                                        # fallthrough-return: $pop13
+	copy_local	$push11=, $0
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -51,11 +50,11 @@ g:                                      # @g
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push11=, $0
-	br_if   	0, $pop11       # 0: down to label2
-# BB#1:                                 # %for.body.lr.ph.i
+	i32.eqz 	$push9=, $0
+	br_if   	0, $pop9        # 0: down to label2
+# %bb.1:                                # %for.body.lr.ph.i
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-4
@@ -68,19 +67,18 @@ g:                                      # @g
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
 	i32.store	0($1), $2
-	i32.const	$push10=, -4
-	i32.add 	$1=, $1, $pop10
-	i32.const	$push9=, -3
-	i32.add 	$2=, $2, $pop9
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label3
+	i32.const	$push8=, -4
+	i32.add 	$1=, $1, $pop8
+	i32.const	$push7=, -3
+	i32.add 	$2=, $2, $pop7
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label3
 .LBB1_3:                                # %f.exit
 	end_loop
 	end_block                       # label2:
-	copy_local	$push12=, $1
-                                        # fallthrough-return: $pop12
+	copy_local	$push10=, $0
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end1:
 	.size	g, .Lfunc_end1-g
@@ -91,7 +89,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, a
 	i32.store	a($pop1), $pop0
@@ -115,5 +113,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2d.c.s b/test/torture-s/loop-2d.c.s
index b2d36ef74..da8cf8425 100644
--- a/test/torture-s/loop-2d.c.s
+++ b/test/torture-s/loop-2d.c.s
@@ -8,11 +8,11 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push11=, $0
-	br_if   	0, $pop11       # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+	i32.eqz 	$push9=, $0
+	br_if   	0, $pop9        # 0: down to label0
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a-4
@@ -25,19 +25,18 @@ f:                                      # @f
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.store	0($1), $2
-	i32.const	$push10=, -4
-	i32.add 	$1=, $1, $pop10
-	i32.const	$push9=, -3
-	i32.add 	$2=, $2, $pop9
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label1
+	i32.const	$push8=, -4
+	i32.add 	$1=, $1, $pop8
+	i32.const	$push7=, -3
+	i32.add 	$2=, $2, $pop7
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
+	br_if   	0, $0           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push12=, $1
-                                        # fallthrough-return: $pop12
+	copy_local	$push10=, $0
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -48,7 +47,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, a
 	i32.store	a($pop1), $pop0
@@ -72,5 +71,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-2e.c.s b/test/torture-s/loop-2e.c.s
index bf242f86b..9f02f0974 100644
--- a/test/torture-s/loop-2e.c.s
+++ b/test/torture-s/loop-2e.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.store	0($1), $0
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $0, $pop0
@@ -136,7 +136,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -144,4 +144,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/loop-2f.c.s b/test/torture-s/loop-2f.c.s
index 34ff254ff..84c199183 100644
--- a/test/torture-s/loop-2f.c.s
+++ b/test/torture-s/loop-2f.c.s
@@ -7,12 +7,12 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 39
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.add 	$push4=, $1, $0
 	i32.const	$push5=, 254
 	i32.const	$push2=, 40
@@ -33,47 +33,46 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push6=, 2147450880
 	i32.const	$push5=, 65536
 	i32.const	$push4=, 3
 	i32.const	$push3=, 50
 	i32.const	$push0=, .L.str
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.call	$push1=, open@FUNCTION, $pop0, $pop21, $pop20
+	i32.const	$push19=, 0
+	i32.const	$push18=, 0
+	i32.call	$push1=, open@FUNCTION, $pop0, $pop19, $pop18
 	i64.const	$push2=, 0
-	i32.call	$push19=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
-	tee_local	$push18=, $0=, $pop19
+	i32.call	$0=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
+	block   	
 	i32.const	$push7=, -1
-	i32.eq  	$push8=, $pop18, $pop7
+	i32.eq  	$push8=, $0, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.const	$push9=, -72340172838076674
 	i64.store	32766($0):p2align=0, $pop9
-	i32.const	$push26=, 0
-	i32.store8	32805($0), $pop26
+	i32.const	$push24=, 0
+	i32.store8	32805($0), $pop24
 	i32.const	$push10=, 32797
 	i32.add 	$push11=, $0, $pop10
-	i64.const	$push25=, -72340172838076674
-	i64.store	0($pop11):p2align=0, $pop25
+	i64.const	$push23=, -72340172838076674
+	i64.store	0($pop11):p2align=0, $pop23
 	i32.const	$push12=, 32790
 	i32.add 	$push13=, $0, $pop12
-	i64.const	$push24=, -72340172838076674
-	i64.store	0($pop13):p2align=0, $pop24
+	i64.const	$push22=, -72340172838076674
+	i64.store	0($pop13):p2align=0, $pop22
 	i32.const	$push14=, 32782
 	i32.add 	$push15=, $0, $pop14
-	i64.const	$push23=, -72340172838076674
-	i64.store	0($pop15):p2align=0, $pop23
+	i64.const	$push21=, -72340172838076674
+	i64.store	0($pop15):p2align=0, $pop21
 	i32.const	$push16=, 32774
 	i32.add 	$push17=, $0, $pop16
-	i64.const	$push22=, -72340172838076674
-	i64.store	0($pop17):p2align=0, $pop22
+	i64.const	$push20=, -72340172838076674
+	i64.store	0($pop17):p2align=0, $pop20
 .LBB1_2:                                # %if.end15
 	end_block                       # label1:
-	i32.const	$push27=, 0
-	call    	exit@FUNCTION, $pop27
+	i32.const	$push25=, 0
+	call    	exit@FUNCTION, $pop25
 	unreachable
 	.endfunc
 .Lfunc_end1:
@@ -86,7 +85,7 @@ main:                                   # @main
 	.size	.L.str, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a7a1be8a5..223b139dc 100644
--- a/test/torture-s/loop-2g.c.s
+++ b/test/torture-s/loop-2g.c.s
@@ -7,12 +7,12 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 39
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.add 	$push4=, $1, $0
 	i32.const	$push5=, 254
 	i32.const	$push2=, 40
@@ -33,47 +33,46 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push6=, 2147450880
 	i32.const	$push5=, 65536
 	i32.const	$push4=, 3
 	i32.const	$push3=, 50
 	i32.const	$push0=, .L.str
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.call	$push1=, open@FUNCTION, $pop0, $pop21, $pop20
+	i32.const	$push19=, 0
+	i32.const	$push18=, 0
+	i32.call	$push1=, open@FUNCTION, $pop0, $pop19, $pop18
 	i64.const	$push2=, 0
-	i32.call	$push19=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
-	tee_local	$push18=, $0=, $pop19
+	i32.call	$0=, mmap@FUNCTION, $pop6, $pop5, $pop4, $pop3, $pop1, $pop2
+	block   	
 	i32.const	$push7=, -1
-	i32.eq  	$push8=, $pop18, $pop7
+	i32.eq  	$push8=, $0, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.const	$push9=, -72340172838076674
 	i64.store	32766($0):p2align=0, $pop9
-	i32.const	$push26=, 0
-	i32.store8	32805($0), $pop26
+	i32.const	$push24=, 0
+	i32.store8	32805($0), $pop24
 	i32.const	$push10=, 32797
 	i32.add 	$push11=, $0, $pop10
-	i64.const	$push25=, -72340172838076674
-	i64.store	0($pop11):p2align=0, $pop25
+	i64.const	$push23=, -72340172838076674
+	i64.store	0($pop11):p2align=0, $pop23
 	i32.const	$push12=, 32790
 	i32.add 	$push13=, $0, $pop12
-	i64.const	$push24=, -72340172838076674
-	i64.store	0($pop13):p2align=0, $pop24
+	i64.const	$push22=, -72340172838076674
+	i64.store	0($pop13):p2align=0, $pop22
 	i32.const	$push14=, 32782
 	i32.add 	$push15=, $0, $pop14
-	i64.const	$push23=, -72340172838076674
-	i64.store	0($pop15):p2align=0, $pop23
+	i64.const	$push21=, -72340172838076674
+	i64.store	0($pop15):p2align=0, $pop21
 	i32.const	$push16=, 32774
 	i32.add 	$push17=, $0, $pop16
-	i64.const	$push22=, -72340172838076674
-	i64.store	0($pop17):p2align=0, $pop22
+	i64.const	$push20=, -72340172838076674
+	i64.store	0($pop17):p2align=0, $pop20
 .LBB1_2:                                # %if.end15
 	end_block                       # label1:
-	i32.const	$push27=, 0
-	call    	exit@FUNCTION, $pop27
+	i32.const	$push25=, 0
+	call    	exit@FUNCTION, $pop25
 	unreachable
 	.endfunc
 .Lfunc_end1:
@@ -86,7 +85,7 @@ main:                                   # @main
 	.size	.L.str, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7341f795c..630a1902b 100644
--- a/test/torture-s/loop-3.c.s
+++ b/test/torture-s/loop-3.c.s
@@ -8,7 +8,7 @@ g:                                      # @g
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, n($pop4)
@@ -28,24 +28,24 @@ g:                                      # @g
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+	.local  	i32
+# %bb.0:                                # %entry
+	i32.const	$push0=, -1
+	i32.xor 	$1=, $0, $pop0
 	i32.const	$push4=, 0
-	i32.const	$push13=, 0
-	i32.load	$push5=, n($pop13)
+	i32.const	$push11=, 0
+	i32.load	$push5=, n($pop11)
 	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.gt_s	$push2=, $1, $pop10
+	i32.select	$push3=, $1, $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
+	copy_local	$push12=, $0
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
@@ -57,19 +57,18 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, n($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, n($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 4
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	n($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	n($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+# %bb.1:                                # %if.end
+	i32.const	$push4=, 0
+	call    	exit@FUNCTION, $pop4
 	unreachable
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
@@ -89,6 +88,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b55235f37..c1ddc477c 100644
--- a/test/torture-s/loop-3b.c.s
+++ b/test/torture-s/loop-3b.c.s
@@ -8,7 +8,7 @@ g:                                      # @g
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, n($pop4)
@@ -29,17 +29,16 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
-	i32.const	$push17=, 0
-	i32.load	$push9=, n($pop17)
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
-	i32.xor 	$push16=, $0, $pop0
-	tee_local	$push15=, $1=, $pop16
+	i32.xor 	$1=, $0, $pop0
+	i32.const	$push8=, 0
+	i32.const	$push15=, 0
+	i32.load	$push9=, n($pop15)
 	i32.const	$push1=, -268435456
 	i32.const	$push14=, -268435456
 	i32.gt_s	$push2=, $1, $pop14
-	i32.select	$push3=, $pop15, $pop1, $pop2
+	i32.select	$push3=, $1, $pop1, $pop2
 	i32.add 	$push4=, $pop3, $0
 	i32.const	$push5=, 268435455
 	i32.add 	$push6=, $pop4, $pop5
@@ -49,8 +48,8 @@ f:                                      # @f
 	i32.const	$push11=, 1
 	i32.add 	$push12=, $pop10, $pop11
 	i32.store	n($pop8), $pop12
-	copy_local	$push18=, $0
-                                        # fallthrough-return: $pop18
+	copy_local	$push16=, $0
+                                        # fallthrough-return: $pop16
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
@@ -62,19 +61,18 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, n($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, n($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 4
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	n($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	n($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+# %bb.1:                                # %if.end
+	i32.const	$push4=, 0
+	call    	exit@FUNCTION, $pop4
 	unreachable
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
@@ -94,6 +92,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 cf556067a..7d310098f 100644
--- a/test/torture-s/loop-3c.c.s
+++ b/test/torture-s/loop-3c.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -4
 	i32.add 	$1=, $0, $pop0
 	i32.const	$push1=, 3
@@ -19,26 +19,24 @@ f:                                      # @f
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # 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.const	$push12=, 1
+	i32.shr_s	$2=, $2, $pop12
+	i32.const	$push11=, 2
+	i32.shl 	$push3=, $2, $pop11
+	i32.const	$push10=, a
+	i32.add 	$push4=, $pop3, $pop10
 	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	$push9=, 32
+	i32.add 	$0=, $0, $pop9
+	i32.const	$push8=, 4
+	i32.add 	$1=, $1, $pop8
 	i32.const	$push7=, 1073741836
-	i32.lt_s	$push5=, $pop8, $pop7
+	i32.lt_s	$push5=, $1, $pop7
 	br_if   	0, $pop5        # 0: up to label0
-# BB#2:                                 # %do.end
+# %bb.2:                                # %do.end
 	end_loop
-	copy_local	$push17=, $0
-                                        # fallthrough-return: $pop17
+	copy_local	$push13=, $1
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -49,7 +47,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end7
+# %bb.0:                                # %if.end7
 	i32.const	$push1=, 0
 	i32.const	$push0=, a
 	i32.store	a+512($pop1), $pop0
@@ -82,5 +80,5 @@ a:
 	.size	a, 1020
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-4.c.s b/test/torture-s/loop-4.c.s
index 757653f41..afb54aa24 100644
--- a/test/torture-s/loop-4.c.s
+++ b/test/torture-s/loop-4.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8192
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-4b.c.s b/test/torture-s/loop-4b.c.s
index 1f23f3e46..1864b3f48 100644
--- a/test/torture-s/loop-4b.c.s
+++ b/test/torture-s/loop-4b.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-5.c.s b/test/torture-s/loop-5.c.s
index 48dc11606..d2fecc208 100644
--- a/test/torture-s/loop-5.c.s
+++ b/test/torture-s/loop-5.c.s
@@ -7,92 +7,88 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push27=, 0
+	i32.load	$0=, t($pop27)
 	block   	
-	i32.const	$push29=, 0
-	i32.load	$push28=, t($pop29)
-	tee_local	$push27=, $0=, $pop28
 	i32.const	$push0=, 4
-	i32.ge_s	$push1=, $pop27, $pop0
+	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %ap.exit.i
-	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
+# %bb.1:                                # %ap.exit.i
+	i32.const	$push33=, 1
+	i32.add 	$1=, $0, $pop33
+	i32.const	$push32=, 0
+	i32.store	t($pop32), $1
+	i32.const	$push31=, 2
+	i32.shl 	$push2=, $0, $pop31
+	i32.const	$push30=, a
+	i32.add 	$push3=, $pop2, $pop30
+	i32.const	$push29=, 0
+	i32.store	0($pop3), $pop29
+	i32.const	$push28=, 3
+	i32.eq  	$push4=, $0, $pop28
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %ap.exit.1.i
-	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.store	0($pop6), $pop39
-	i32.const	$push38=, 1
-	i32.gt_s	$push7=, $0, $pop38
+# %bb.2:                                # %ap.exit.1.i
+	i32.const	$push39=, 2
+	i32.add 	$2=, $0, $pop39
+	i32.const	$push38=, 0
+	i32.store	t($pop38), $2
+	i32.const	$push37=, 2
+	i32.shl 	$push5=, $1, $pop37
+	i32.const	$push36=, a
+	i32.add 	$push6=, $pop5, $pop36
+	i32.const	$push35=, 3
+	i32.store	0($pop6), $pop35
+	i32.const	$push34=, 1
+	i32.gt_s	$push7=, $0, $pop34
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %ap.exit.2.i
-	i32.const	$push52=, 0
+# %bb.3:                                # %ap.exit.2.i
 	i32.const	$push8=, 3
-	i32.add 	$push51=, $0, $pop8
-	tee_local	$push50=, $1=, $pop51
-	i32.store	t($pop52), $pop50
+	i32.add 	$1=, $0, $pop8
+	i32.const	$push44=, 0
+	i32.store	t($pop44), $1
+	i32.const	$push43=, 2
+	i32.shl 	$push9=, $2, $pop43
+	i32.const	$push42=, a
+	i32.add 	$push10=, $pop9, $pop42
+	i32.const	$push41=, 2
+	i32.store	0($pop10), $pop41
+	i32.const	$push40=, 1
+	i32.eq  	$push11=, $0, $pop40
+	br_if   	0, $pop11       # 0: down to label0
+# %bb.4:                                # %testit.exit
 	i32.const	$push49=, 2
-	i32.shl 	$push9=, $2, $pop49
+	i32.shl 	$push12=, $1, $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 	$push12=, $1, $pop57
-	i32.const	$push56=, a
-	i32.add 	$push13=, $pop12, $pop56
-	i32.const	$push55=, 1
-	i32.store	0($pop13), $pop55
-	i32.const	$push54=, 0
+	i32.add 	$push13=, $pop12, $pop48
+	i32.const	$push47=, 1
+	i32.store	0($pop13), $pop47
+	i32.const	$push46=, 0
 	i32.const	$push14=, 4
 	i32.add 	$push15=, $0, $pop14
-	i32.store	t($pop54), $pop15
-	i32.const	$push53=, 0
-	i32.load	$push16=, a($pop53)
+	i32.store	t($pop46), $pop15
+	i32.const	$push45=, 0
+	i32.load	$push16=, a($pop45)
 	br_if   	0, $pop16       # 0: down to label0
-# BB#5:                                 # %if.end
-	i32.const	$push58=, 0
-	i32.load	$push17=, a+4($pop58)
+# %bb.5:                                # %if.end
+	i32.const	$push50=, 0
+	i32.load	$push17=, a+4($pop50)
 	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	$push20=, a+8($pop59)
+# %bb.6:                                # %if.end3
+	i32.const	$push51=, 0
+	i32.load	$push20=, a+8($pop51)
 	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	$push23=, a+12($pop60)
+# %bb.7:                                # %if.end6
+	i32.const	$push52=, 0
+	i32.load	$push23=, a+12($pop52)
 	i32.const	$push24=, 1
 	i32.ne  	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label0
-# BB#8:                                 # %if.end9
+# %bb.8:                                # %if.end9
 	i32.const	$push26=, 0
 	call    	exit@FUNCTION, $pop26
 	unreachable
@@ -119,6 +115,6 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 87f0a5ca8..abae57c7e 100644
--- a/test/torture-s/loop-6.c.s
+++ b/test/torture-s/loop-6.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end8
+# %bb.0:                                # %if.end8
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/loop-7.c.s b/test/torture-s/loop-7.c.s
index 08b4b35b5..9e67046f1 100644
--- a/test/torture-s/loop-7.c.s
+++ b/test/torture-s/loop-7.c.s
@@ -7,26 +7,26 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -1
 	i32.const	$2=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push7=, 1
-	i32.shl 	$push0=, $pop7, $2
+	i32.const	$push8=, 1
+	i32.shl 	$push0=, $pop8, $2
 	i32.eq  	$push1=, $pop0, $0
 	i32.select	$1=, $2, $1, $pop1
-	i32.const	$push6=, 8
+	i32.const	$push7=, 1
+	i32.add 	$2=, $2, $pop7
+	i32.const	$push6=, 9
 	i32.gt_u	$push2=, $2, $pop6
 	br_if   	1, $pop2        # 1: down to label0
-# BB#2:                                 # %for.body
+# %bb.2:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push9=, 1
-	i32.add 	$2=, $2, $pop9
-	i32.const	$push8=, 0
-	i32.lt_s	$push3=, $1, $pop8
+	i32.const	$push9=, 0
+	i32.lt_s	$push3=, $1, $pop9
 	br_if   	0, $pop3        # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
@@ -35,7 +35,7 @@ foo:                                    # @foo
 	i32.const	$push4=, -1
 	i32.le_s	$push5=, $1, $pop4
 	br_if   	0, $pop5        # 0: down to label2
-# BB#4:                                 # %if.end5
+# %bb.4:                                # %if.end5
 	return
 .LBB0_5:                                # %if.then4
 	end_block                       # label2:
@@ -51,7 +51,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 64
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -62,6 +62,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 03b4425da..bfc006982 100644
--- a/test/torture-s/loop-8.c.s
+++ b/test/torture-s/loop-8.c.s
@@ -6,15 +6,15 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	f64.load	$push0=, 0($1)
 	f64.const	$push1=, 0x1p0
 	f64.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -31,49 +31,45 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	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
+	i32.sub 	$1=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $1
+	i32.const	$push14=, 0
+	f64.load	$0=, a($pop14)
 	block   	
 	block   	
-	i32.const	$push16=, 0
-	f64.load	$push15=, a($pop16)
-	tee_local	$push14=, $0=, $pop15
 	f64.const	$push13=, 0x0p0
-	f64.gt  	$push0=, $pop14, $pop13
+	f64.gt  	$push0=, $0, $pop13
 	br_if   	0, $pop0        # 0: down to label2
-# BB#1:                                 # %for.cond
-	i32.const	$push22=, 0
-	f64.load	$push21=, a+8($pop22)
-	tee_local	$push20=, $0=, $pop21
-	f64.const	$push19=, 0x0p0
-	f64.le  	$push1=, $pop20, $pop19
+# %bb.1:                                # %for.cond
+	i32.const	$push16=, 0
+	f64.load	$0=, a+8($pop16)
+	f64.const	$push15=, 0x0p0
+	f64.le  	$push1=, $0, $pop15
 	f64.ne  	$push2=, $0, $0
 	i32.or  	$push3=, $pop1, $pop2
-	i32.eqz 	$push27=, $pop3
-	br_if   	0, $pop27       # 0: down to label2
-# BB#2:                                 # %for.cond.1
+	i32.eqz 	$push19=, $pop3
+	br_if   	0, $pop19       # 0: down to label2
+# %bb.2:                                # %for.cond.1
 	i32.const	$push4=, 0
-	f64.load	$push24=, a+16($pop4)
-	tee_local	$push23=, $0=, $pop24
+	f64.load	$0=, a+16($pop4)
 	f64.const	$push5=, 0x0p0
-	f64.gt  	$push6=, $pop23, $pop5
-	i32.eqz 	$push28=, $pop6
-	br_if   	1, $pop28       # 1: down to label1
+	f64.gt  	$push6=, $0, $pop5
+	i32.eqz 	$push20=, $pop6
+	br_if   	1, $pop20       # 1: down to label1
 .LBB1_3:                                # %e
 	end_block                       # label2:
 	f64.store	8($1), $0
-	i32.const	$push26=, 0
+	i32.const	$push18=, 0
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $1, $pop11
-	call    	bar@FUNCTION, $pop26, $pop12
-	i32.const	$push25=, 0
-	call    	exit@FUNCTION, $pop25
+	call    	bar@FUNCTION, $pop18, $pop12
+	i32.const	$push17=, 0
+	call    	exit@FUNCTION, $pop17
 	unreachable
 .LBB1_4:                                # %for.cond.2
 	end_block                       # label1:
@@ -95,6 +91,6 @@ a:
 	.size	a, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1c2e7ce5d..2441e86e9 100644
--- a/test/torture-s/loop-9.c.s
+++ b/test/torture-s/loop-9.c.s
@@ -6,7 +6,7 @@
 	.type	false,@function
 false:                                  # @false
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ false:                                  # @false
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -28,4 +28,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/loop-ivopts-1.c.s b/test/torture-s/loop-ivopts-1.c.s
index 2151c0cce..2b7e1fd23 100644
--- a/test/torture-s/loop-ivopts-1.c.s
+++ b/test/torture-s/loop-ivopts-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1126498304
 	i32.store	foo.tmp+8($pop1), $pop0
@@ -25,7 +25,7 @@ main:                                   # @main
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %for.inc9.3
+# %bb.0:                                # %for.inc9.3
 	i32.const	$push1=, 0
 	i64.const	$push0=, 4838273375797772288
 	i64.store	foo.tmp+4($pop1):p2align=2, $pop0
@@ -55,4 +55,4 @@ foo.tmp:
 	.size	foo.tmp, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/loop-ivopts-2.c.s b/test/torture-s/loop-ivopts-2.c.s
index 03fee6617..be270eb65 100644
--- a/test/torture-s/loop-ivopts-2.c.s
+++ b/test/torture-s/loop-ivopts-2.c.s
@@ -7,8 +7,8 @@
 check:                                  # @check
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$1=, -1
+# %bb.0:                                # %entry
+	i32.const	$1=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
@@ -16,29 +16,28 @@ check:                                  # @check
 	i32.load	$push6=, 0($0)
 	i32.const	$push14=, 8
 	i32.const	$push13=, 7
-	i32.const	$push12=, -255
+	i32.const	$push12=, -256
 	i32.add 	$push0=, $1, $pop12
 	i32.const	$push11=, 23
 	i32.gt_u	$push1=, $pop0, $pop11
 	i32.select	$push2=, $pop14, $pop13, $pop1
-	i32.const	$push10=, -143
+	i32.const	$push10=, -144
 	i32.add 	$push3=, $1, $pop10
 	i32.const	$push9=, 112
 	i32.lt_u	$push4=, $pop3, $pop9
 	i32.add 	$push5=, $pop2, $pop4
 	i32.ne  	$push7=, $pop6, $pop5
 	br_if   	1, $pop7        # 1: down to label0
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push19=, 4
-	i32.add 	$0=, $0, $pop19
-	i32.const	$push18=, 1
-	i32.add 	$push17=, $1, $pop18
-	tee_local	$push16=, $1=, $pop17
-	i32.const	$push15=, 286
-	i32.le_u	$push8=, $pop16, $pop15
+	i32.const	$push17=, 1
+	i32.add 	$1=, $1, $pop17
+	i32.const	$push16=, 4
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, 287
+	i32.le_u	$push8=, $1, $pop15
 	br_if   	0, $pop8        # 0: up to label1
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	return
 .LBB0_4:                                # %if.then
@@ -56,144 +55,115 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push18=, 0
+	i32.load	$push17=, __stack_pointer($pop18)
+	i32.const	$push19=, 1152
+	i32.sub 	$2=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $2
 	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	i32.add 	$push0=, $2, $1
-	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
+	i32.const	$push26=, 8
+	i32.store	0($pop0), $pop26
+	i32.const	$push25=, 4
+	i32.add 	$1=, $1, $pop25
+	i32.const	$push24=, 576
+	i32.ne  	$push1=, $1, $pop24
 	br_if   	0, $pop1        # 0: up to label2
-# BB#2:                                 # %for.body3.preheader
+# %bb.2:                                # %for.body3.preheader
 	end_loop
 	i32.const	$push2=, 576
-	i32.add 	$1=, $2, $pop2
-	i32.const	$0=, 143
+	i32.add 	$0=, $2, $pop2
+	i32.const	$1=, 0
 .LBB1_3:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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
-	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	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
+	i32.add 	$push3=, $0, $1
+	i32.const	$push29=, 9
+	i32.store	0($pop3), $pop29
+	i32.const	$push28=, 4
+	i32.add 	$1=, $1, $pop28
+	i32.const	$push27=, 448
+	i32.ne  	$push4=, $1, $pop27
+	br_if   	0, $pop4        # 0: up to label3
+# %bb.4:                                # %for.body10
 	end_loop
-	end_block                       # label7:
+	i64.const	$push5=, 30064771079
+	i64.store	1024($2), $pop5
+	i64.const	$push43=, 30064771079
+	i64.store	1032($2), $pop43
+	i64.const	$push42=, 30064771079
+	i64.store	1040($2), $pop42
+	i64.const	$push41=, 30064771079
+	i64.store	1048($2), $pop41
+	i64.const	$push40=, 30064771079
+	i64.store	1056($2), $pop40
+	i64.const	$push39=, 30064771079
+	i64.store	1064($2), $pop39
+	i64.const	$push38=, 30064771079
+	i64.store	1072($2), $pop38
+	i64.const	$push37=, 30064771079
+	i64.store	1080($2), $pop37
+	i64.const	$push36=, 30064771079
+	i64.store	1088($2), $pop36
+	i64.const	$push35=, 30064771079
+	i64.store	1096($2), $pop35
+	i64.const	$push34=, 30064771079
+	i64.store	1104($2), $pop34
+	i64.const	$push33=, 30064771079
+	i64.store	1112($2), $pop33
+	i64.const	$push6=, 34359738376
+	i64.store	1120($2), $pop6
+	i64.const	$push32=, 34359738376
+	i64.store	1128($2), $pop32
+	i64.const	$push31=, 34359738376
+	i64.store	1136($2), $pop31
+	i64.const	$push30=, 34359738376
+	i64.store	1144($2), $pop30
+	i32.const	$1=, 0
 	copy_local	$0=, $2
-	i32.const	$1=, -1
-.LBB1_13:                               # %for.body.i
+.LBB1_5:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
-	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
+	loop    	                # label5:
+	i32.load	$push13=, 0($0)
+	i32.const	$push49=, 8
+	i32.const	$push48=, 7
+	i32.const	$push47=, -256
+	i32.add 	$push7=, $1, $pop47
+	i32.const	$push46=, 23
+	i32.gt_u	$push8=, $pop7, $pop46
+	i32.select	$push9=, $pop49, $pop48, $pop8
+	i32.const	$push45=, -144
+	i32.add 	$push10=, $1, $pop45
+	i32.const	$push44=, 112
+	i32.lt_u	$push11=, $pop10, $pop44
+	i32.add 	$push12=, $pop9, $pop11
+	i32.ne  	$push14=, $pop13, $pop12
+	br_if   	1, $pop14       # 1: down to label4
+# %bb.6:                                # %for.cond.i
+                                        #   in Loop: Header=BB1_5 Depth=1
+	i32.const	$push52=, 1
+	i32.add 	$1=, $1, $pop52
+	i32.const	$push51=, 4
+	i32.add 	$0=, $0, $pop51
+	i32.const	$push50=, 287
+	i32.le_u	$push15=, $1, $pop50
+	br_if   	0, $pop15       # 0: up to label5
+# %bb.7:                                # %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
-	return  	$pop22
-.LBB1_16:                               # %if.then.i
-	end_block                       # label9:
+	i32.const	$push23=, 0
+	i32.const	$push21=, 1152
+	i32.add 	$push22=, $2, $pop21
+	i32.store	__stack_pointer($pop23), $pop22
+	i32.const	$push16=, 0
+	return  	$pop16
+.LBB1_8:                                # %if.then.i
+	end_block                       # label4:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -201,5 +171,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/lshrdi-1.c.s b/test/torture-s/lshrdi-1.c.s
index c4f8b3c55..db84c4bf0 100644
--- a/test/torture-s/lshrdi-1.c.s
+++ b/test/torture-s/lshrdi-1.c.s
@@ -6,59 +6,58 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i64
-# BB#0:                                 # %entry
-	i64.const	$3=, -1
+	.local  	i32, i32, i64
+# %bb.0:                                # %entry
+	i64.const	$2=, 0
 	i32.const	$1=, .Lswitch.table.main
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	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
+	i64.const	$push8=, -8690466092652643696
+	i64.shr_u	$push0=, $pop8, $2
+	i64.load	$push1=, 0($1)
+	i64.ne  	$push2=, $pop0, $pop1
+	br_if   	1, $pop2        # 1: down to label0
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i64.const	$push11=, 1
+	i64.add 	$2=, $2, $pop11
+	i32.const	$push10=, 8
+	i32.add 	$1=, $1, $pop10
+	i64.const	$push9=, 64
+	i64.lt_u	$push3=, $2, $pop9
+	br_if   	0, $pop3        # 0: up to label1
+# %bb.3:                                # %for.body4.preheader
 	end_loop
 	i32.const	$1=, 0
 	i32.const	$0=, .Lswitch.table.main
 .LBB0_4:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push13=, 64
-	i32.ge_u	$push5=, $1, $pop13
+	i32.const	$push13=, 2147483647
+	i32.and 	$push4=, $1, $pop13
+	i32.const	$push12=, 64
+	i32.ge_u	$push5=, $pop4, $pop12
 	br_if   	1, $pop5        # 1: down to label0
-# BB#5:                                 # %switch.lookup
+# %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
+# %bb.6:                                # %for.cond2
                                         #   in Loop: Header=BB0_4 Depth=1
-	i32.const	$push17=, 8
-	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
+	i32.const	$push17=, 1
+	i32.add 	$1=, $1, $pop17
+	i32.const	$push16=, 8
+	i32.add 	$0=, $0, $pop16
+	i32.const	$push15=, 63
+	i32.le_u	$push6=, $1, $pop15
+	br_if   	0, $pop6        # 0: up to label2
+# %bb.7:                                # %for.end13
 	end_loop
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+	i32.const	$push7=, 0
+	call    	exit@FUNCTION, $pop7
 	unreachable
 .LBB0_8:                                # %if.then
 	end_block                       # label0:
@@ -139,6 +138,6 @@ main:                                   # @main
 	.size	.Lswitch.table.main, 512
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ce058b3c4..26a06d3a4 100644
--- a/test/torture-s/mayalias-1.c.s
+++ b/test/torture-s/mayalias-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/mayalias-2.c.s b/test/torture-s/mayalias-2.c.s
index 5d2eac86e..ddf6c9e7b 100644
--- a/test/torture-s/mayalias-2.c.s
+++ b/test/torture-s/mayalias-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/mayalias-3.c.s b/test/torture-s/mayalias-3.c.s
index 8716a5467..da2f42c72 100644
--- a/test/torture-s/mayalias-3.c.s
+++ b/test/torture-s/mayalias-3.c.s
@@ -7,7 +7,7 @@
 g:                                      # @g
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	p($pop0), $0
 	copy_local	$push1=, $0
@@ -23,22 +23,19 @@ g:                                      # @g
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.load	$push4=, __stack_pointer($pop5)
-	i32.const	$push6=, 16
-	i32.sub 	$push10=, $pop4, $pop6
-	tee_local	$push9=, $0=, $pop10
-	i32.const	$push0=, 10
-	i32.store	12($pop9), $pop0
-	i32.const	$push1=, 1
-	i32.store16	12($0), $pop1
-	i32.const	$push2=, 0
-	i32.const	$push7=, 12
-	i32.add 	$push8=, $0, $pop7
-	i32.store	p($pop2), $pop8
-	i32.load	$push3=, 12($0)
-                                        # fallthrough-return: $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$push2=, __stack_pointer($pop3)
+	i32.const	$push4=, 16
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push0=, 1
+	i32.store	12($0), $pop0
+	i32.const	$push1=, 0
+	i32.const	$push5=, 12
+	i32.add 	$push6=, $0, $pop5
+	i32.store	p($pop1), $pop6
+	i32.const	$push7=, 1
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end1:
 	.size	f, .Lfunc_end1-f
@@ -49,39 +46,17 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %if.end
+	i32.const	$push0=, 0
+	i32.const	$push2=, 0
+	i32.load	$push1=, __stack_pointer($pop2)
+	i32.const	$push3=, 16
+	i32.sub 	$push6=, $pop1, $pop3
+	i32.const	$push4=, 12
+	i32.add 	$push5=, $pop6, $pop4
+	i32.store	p($pop0), $pop5
 	i32.const	$push7=, 0
-	i32.const	$push5=, 0
-	i32.load	$push4=, __stack_pointer($pop5)
-	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
-	i32.const	$push0=, 10
-	i32.store	12($0), $pop0
-	i32.const	$push1=, 1
-	i32.store16	12($0), $pop1
-	i32.const	$push14=, 0
-	i32.const	$push11=, 12
-	i32.add 	$push12=, $0, $pop11
-	i32.store	p($pop14), $pop12
-	block   	
-	i32.load	$push2=, 12($0)
-	i32.const	$push13=, 10
-	i32.eq  	$push3=, $pop2, $pop13
-	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push10=, 0
-	i32.const	$push8=, 16
-	i32.add 	$push9=, $0, $pop8
-	i32.store	__stack_pointer($pop10), $pop9
-	i32.const	$push17=, 0
-	return  	$pop17
-.LBB2_2:                                # %if.then
-	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
@@ -96,5 +71,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
-	.functype	abort, void
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/medce-1.c.s b/test/torture-s/medce-1.c.s
index dbbd29cea..5f70b9c38 100644
--- a/test/torture-s/medce-1.c.s
+++ b/test/torture-s/medce-1.c.s
@@ -5,10 +5,7 @@
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i32.const	$push0=, 1
-	i32.store8	ok($pop1), $pop0
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -20,17 +17,7 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push2=, 1
-	i32.ne  	$push0=, $0, $pop2
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %sw.bb1
-	i32.const	$push1=, 0
-	i32.const	$push3=, 1
-	i32.store8	ok($pop1), $pop3
-.LBB1_2:                                # %sw.epilog
-	end_block                       # label0:
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -42,22 +29,12 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
-	i32.const	$push1=, 0
-	i32.const	$push0=, 1
-	i32.store8	ok($pop1), $pop0
-	i32.const	$push2=, 0
-                                        # fallthrough-return: $pop2
+# %bb.0:                                # %if.end
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
                                         # -- End function
-	.type	ok,@object              # @ok
-	.section	.bss.ok,"aw",@nobits
-	.p2align	2
-ok:
-	.int8	0                       # 0x0
-	.size	ok, 1
 
-
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/memcpy-1.c.s b/test/torture-s/memcpy-1.c.s
index b669dc161..769953a92 100644
--- a/test/torture-s/memcpy-1.c.s
+++ b/test/torture-s/memcpy-1.c.s
@@ -7,7 +7,7 @@
 copy:                                   # @copy
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$push0=, memcpy@FUNCTION, $0, $1, $2
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,36 +21,34 @@ copy:                                   # @copy
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push40=, 0
+# %bb.0:                                # %entry
 	i32.const	$push38=, 0
 	i32.load	$push37=, __stack_pointer($pop38)
-	i32.const	$push39=, 696320
-	i32.sub 	$push54=, $pop37, $pop39
-	tee_local	$push53=, $1=, $pop54
-	i32.store	__stack_pointer($pop40), $pop53
+	i32.const	$push39=, 349536
+	i32.sub 	$1=, $pop37, $pop39
+	i32.const	$push40=, 0
+	i32.store	__stack_pointer($pop40), $1
 	i32.const	$2=, 0
 	i32.const	$push52=, 0
-	i32.const	$push51=, 348160
+	i32.const	$push51=, 174762
 	i32.call	$drop=, memset@FUNCTION, $1, $pop52, $pop51
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push41=, 348160
+	i32.const	$push41=, 174768
 	i32.add 	$push42=, $1, $pop41
 	i32.add 	$push2=, $pop42, $2
 	i32.store8	0($pop2), $2
-	i32.const	$push58=, 1
-	i32.add 	$push57=, $2, $pop58
-	tee_local	$push56=, $2=, $pop57
-	i32.const	$push55=, 348160
-	i32.ne  	$push3=, $pop56, $pop55
+	i32.const	$push54=, 1
+	i32.add 	$2=, $2, $pop54
+	i32.const	$push53=, 174762
+	i32.ne  	$push3=, $2, $pop53
 	br_if   	0, $pop3        # 0: up to label0
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	i32.const	$push43=, 348160
+	i32.const	$push43=, 174768
 	i32.add 	$push44=, $1, $pop43
-	i32.const	$push4=, 2720
+	i32.const	$push4=, 1365
 	i32.call	$drop=, memcpy@FUNCTION, $1, $pop44, $pop4
 	i32.const	$2=, 0
 .LBB1_3:                                # %for.body6
@@ -59,48 +57,47 @@ main:                                   # @main
 	loop    	                # label2:
 	i32.add 	$push6=, $1, $2
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push59=, 255
-	i32.and 	$push5=, $2, $pop59
+	i32.const	$push55=, 255
+	i32.and 	$push5=, $2, $pop55
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	1, $pop8        # 1: down to label1
-# BB#4:                                 # %for.cond3
+# %bb.4:                                # %for.cond3
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push63=, 1
-	i32.add 	$push62=, $2, $pop63
-	tee_local	$push61=, $2=, $pop62
-	i32.const	$push60=, 2719
-	i32.le_u	$push9=, $pop61, $pop60
+	i32.const	$push57=, 1
+	i32.add 	$2=, $2, $pop57
+	i32.const	$push56=, 1364
+	i32.le_u	$push9=, $2, $pop56
 	br_if   	0, $pop9        # 0: up to label2
-# BB#5:                                 # %for.end15
+# %bb.5:                                # %for.end15
 	end_loop
-	i32.const	$push64=, 1
-	i32.const	$push10=, 2720
-	i32.call	$0=, memset@FUNCTION, $1, $pop64, $pop10
+	i32.const	$push58=, 1
+	i32.const	$push10=, 1365
+	i32.call	$0=, memset@FUNCTION, $1, $pop58, $pop10
 	i32.const	$2=, 1
 .LBB1_6:                                # %for.cond17
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	i32.const	$push65=, 2719
-	i32.gt_u	$push11=, $2, $pop65
+	i32.const	$push59=, 1364
+	i32.gt_u	$push11=, $2, $pop59
 	br_if   	1, $pop11       # 1: down to label3
-# BB#7:                                 # %for.cond17.for.body20_crit_edge
+# %bb.7:                                # %for.cond17.for.body20_crit_edge
                                         #   in Loop: Header=BB1_6 Depth=1
 	i32.add 	$1=, $0, $2
-	i32.const	$push67=, 1
-	i32.add 	$push0=, $2, $pop67
+	i32.const	$push61=, 1
+	i32.add 	$push0=, $2, $pop61
 	copy_local	$2=, $pop0
 	i32.load8_u	$push35=, 0($1)
-	i32.const	$push66=, 1
-	i32.eq  	$push36=, $pop35, $pop66
+	i32.const	$push60=, 1
+	i32.eq  	$push36=, $pop35, $pop60
 	br_if   	0, $pop36       # 0: up to label4
 	br      	2               # 2: down to label1
 .LBB1_8:                                # %for.end29
 	end_loop
 	end_block                       # label3:
-	i32.const	$push45=, 348160
+	i32.const	$push45=, 174768
 	i32.add 	$push46=, $0, $pop45
-	i32.const	$push12=, 348160
+	i32.const	$push12=, 174762
 	i32.call	$1=, memcpy@FUNCTION, $0, $pop46, $pop12
 	i32.const	$2=, 0
 .LBB1_9:                                # %for.body35
@@ -108,47 +105,46 @@ main:                                   # @main
 	loop    	                # label5:
 	i32.add 	$push14=, $1, $2
 	i32.load8_u	$push15=, 0($pop14)
-	i32.const	$push68=, 255
-	i32.and 	$push13=, $2, $pop68
+	i32.const	$push62=, 255
+	i32.and 	$push13=, $2, $pop62
 	i32.ne  	$push16=, $pop15, $pop13
 	br_if   	1, $pop16       # 1: down to label1
-# BB#10:                                # %for.cond32
+# %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
+	i32.const	$push64=, 1
+	i32.add 	$2=, $2, $pop64
+	i32.const	$push63=, 174761
+	i32.le_u	$push17=, $2, $pop63
 	br_if   	0, $pop17       # 0: up to label5
-# BB#11:                                # %for.end46
+# %bb.11:                               # %for.end46
 	end_loop
 	i32.const	$push19=, 0
-	i32.const	$push18=, 348160
+	i32.const	$push18=, 174762
 	i32.call	$0=, memset@FUNCTION, $1, $pop19, $pop18
 	i32.const	$2=, 1
 .LBB1_12:                               # %for.cond48
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label7:
-	i32.const	$push73=, 348159
-	i32.gt_u	$push20=, $2, $pop73
+	i32.const	$push65=, 174761
+	i32.gt_u	$push20=, $2, $pop65
 	br_if   	1, $pop20       # 1: down to label6
-# BB#13:                                # %for.cond48.for.body51_crit_edge
+# %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
+	i32.const	$push66=, 1
+	i32.add 	$push1=, $2, $pop66
 	copy_local	$2=, $pop1
 	i32.load8_u	$push34=, 0($1)
-	i32.eqz 	$push85=, $pop34
-	br_if   	0, $pop85       # 0: up to label7
+	i32.eqz 	$push73=, $pop34
+	br_if   	0, $pop73       # 0: up to label7
 	br      	2               # 2: down to label1
 .LBB1_14:                               # %for.end60
 	end_loop
 	end_block                       # label6:
-	i32.const	$push47=, 348160
+	i32.const	$push47=, 174768
 	i32.add 	$push48=, $0, $pop47
-	i32.const	$push21=, 2720
+	i32.const	$push21=, 1365
 	i32.call	$1=, memcpy@FUNCTION, $0, $pop48, $pop21
 	i32.const	$2=, 0
 .LBB1_15:                               # %for.body66
@@ -156,23 +152,22 @@ main:                                   # @main
 	loop    	                # label8:
 	i32.add 	$push23=, $1, $2
 	i32.load8_u	$push24=, 0($pop23)
-	i32.const	$push75=, 255
-	i32.and 	$push22=, $2, $pop75
+	i32.const	$push67=, 255
+	i32.and 	$push22=, $2, $pop67
 	i32.ne  	$push25=, $pop24, $pop22
 	br_if   	1, $pop25       # 1: down to label1
-# BB#16:                                # %for.cond63
+# %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
+	i32.const	$push69=, 1
+	i32.add 	$2=, $2, $pop69
+	i32.const	$push68=, 1364
+	i32.le_u	$push26=, $2, $pop68
 	br_if   	0, $pop26       # 0: up to label8
-# BB#17:                                # %for.end77
+# %bb.17:                               # %for.end77
 	end_loop
-	i32.const	$push49=, 348160
+	i32.const	$push49=, 174768
 	i32.add 	$push50=, $1, $pop49
-	i32.const	$push27=, 348160
+	i32.const	$push27=, 174762
 	i32.call	$drop=, memcpy@FUNCTION, $1, $pop50, $pop27
 	i32.const	$2=, 0
 .LBB1_18:                               # %for.body85
@@ -180,19 +175,18 @@ main:                                   # @main
 	loop    	                # label9:
 	i32.add 	$push29=, $1, $2
 	i32.load8_u	$push30=, 0($pop29)
-	i32.const	$push80=, 255
-	i32.and 	$push28=, $2, $pop80
+	i32.const	$push70=, 255
+	i32.and 	$push28=, $2, $pop70
 	i32.ne  	$push31=, $pop30, $pop28
 	br_if   	1, $pop31       # 1: down to label1
-# BB#19:                                # %for.cond82
+# %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
+	i32.const	$push72=, 1
+	i32.add 	$2=, $2, $pop72
+	i32.const	$push71=, 174761
+	i32.le_u	$push32=, $2, $pop71
 	br_if   	0, $pop32       # 0: up to label9
-# BB#20:                                # %for.end96
+# %bb.20:                               # %for.end96
 	end_loop
 	i32.const	$push33=, 0
 	call    	exit@FUNCTION, $pop33
@@ -206,6 +200,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 6c49bce9f..3a238190d 100644
--- a/test/torture-s/memcpy-2.c.s
+++ b/test/torture-s/memcpy-2.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
@@ -46,41 +46,39 @@ main:                                   # @main
 	i32.const	$push47=, 97
 	i32.const	$push46=, 96
 	i32.call	$7=, memset@FUNCTION, $pop48, $pop47, $pop46
-	i32.const	$8=, 65
-	i32.const	$6=, -96
+	i32.const	$6=, 65
+	i32.const	$8=, -96
 .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    	                # label4:
-	i32.const	$push59=, u2+96
-	i32.add 	$push3=, $6, $pop59
-	i32.const	$push58=, 65
-	i32.const	$push57=, 24
-	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 	$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
+	i32.const	$push55=, 65
+	i32.const	$push54=, 24
+	i32.shl 	$push0=, $6, $pop54
+	i32.const	$push53=, 24
+	i32.shr_s	$push1=, $pop0, $pop53
+	i32.const	$push52=, 95
+	i32.gt_s	$push2=, $pop1, $pop52
+	i32.select	$6=, $pop55, $6, $pop2
+	i32.const	$push51=, u2+96
+	i32.add 	$push3=, $8, $pop51
+	i32.store8	0($pop3), $6
+	i32.const	$push50=, 1
+	i32.add 	$8=, $8, $pop50
+	i32.const	$push49=, 1
+	i32.add 	$6=, $6, $pop49
+	br_if   	0, $8           # 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.eqz 	$push104=, $0
-	br_if   	0, $pop104      # 0: down to label6
-# BB#6:                                 # %for.body23.preheader
+	i32.eqz 	$push86=, $0
+	br_if   	0, $pop86       # 0: down to label6
+# %bb.6:                                # %for.body23.preheader
                                         #   in Loop: Header=BB0_3 Depth=3
 	i32.const	$8=, 0
 .LBB0_7:                                # %for.body23
@@ -91,17 +89,16 @@ main:                                   # @main
 	loop    	                # label7:
 	i32.add 	$push4=, $8, $7
 	i32.load8_u	$push5=, 0($pop4)
-	i32.const	$push60=, 97
-	i32.ne  	$push6=, $pop5, $pop60
+	i32.const	$push56=, 97
+	i32.ne  	$push6=, $pop5, $pop56
 	br_if   	6, $pop6        # 6: down to label0
-# BB#8:                                 # %for.inc29
+# %bb.8:                                # %for.inc29
                                         #   in Loop: Header=BB0_7 Depth=4
-	i32.const	$push63=, 1
-	i32.add 	$push62=, $8, $pop63
-	tee_local	$push61=, $8=, $pop62
-	i32.lt_u	$push7=, $pop61, $0
+	i32.const	$push57=, 1
+	i32.add 	$8=, $8, $pop57
+	i32.lt_u	$push7=, $8, $0
 	br_if   	0, $pop7        # 0: up to label7
-# BB#9:                                 # %for.body36.preheader.loopexit
+# %bb.9:                                # %for.body36.preheader.loopexit
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
 	i32.add 	$7=, $8, $7
@@ -120,122 +117,116 @@ main:                                   # @main
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
 	loop    	                # label8:
+	i32.const	$push62=, 65
+	i32.const	$push61=, 24
+	i32.shl 	$push8=, $6, $pop61
+	i32.const	$push60=, 24
+	i32.shr_s	$push9=, $pop8, $pop60
+	i32.const	$push59=, 95
+	i32.gt_s	$push10=, $pop9, $pop59
+	i32.select	$6=, $pop62, $6, $pop10
 	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.const	$push58=, 255
+	i32.and 	$push11=, $6, $pop58
 	i32.ne  	$push14=, $pop13, $pop11
 	br_if   	4, $pop14       # 4: down to label0
-# BB#13:                                # %for.inc48
+# %bb.13:                               # %for.inc48
                                         #   in Loop: Header=BB0_12 Depth=4
-	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
+	i32.const	$push64=, 1
+	i32.add 	$6=, $6, $pop64
+	i32.const	$push63=, 1
+	i32.add 	$8=, $8, $pop63
+	i32.lt_u	$push15=, $8, $5
 	br_if   	0, $pop15       # 0: up to label8
-# BB#14:                                # %for.end52
+# %bb.14:                               # %for.end52
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
-	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
+	i32.add 	$8=, $7, $8
+	i32.load8_u	$push16=, 0($8)
+	i32.const	$push65=, 97
+	i32.ne  	$push17=, $pop16, $pop65
 	br_if   	3, $pop17       # 3: down to label0
-# BB#15:                                # %for.inc62
+# %bb.15:                               # %for.inc62
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push79=, 1
-	i32.add 	$push18=, $8, $pop79
+	i32.const	$push67=, 1
+	i32.add 	$push18=, $8, $pop67
 	i32.load8_u	$push19=, 0($pop18)
-	i32.const	$push78=, 97
-	i32.ne  	$push20=, $pop19, $pop78
+	i32.const	$push66=, 97
+	i32.ne  	$push20=, $pop19, $pop66
 	br_if   	3, $pop20       # 3: down to label0
-# BB#16:                                # %for.inc62.1
+# %bb.16:                               # %for.inc62.1
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push81=, 2
-	i32.add 	$push21=, $8, $pop81
+	i32.const	$push69=, 2
+	i32.add 	$push21=, $8, $pop69
 	i32.load8_u	$push22=, 0($pop21)
-	i32.const	$push80=, 97
-	i32.ne  	$push23=, $pop22, $pop80
+	i32.const	$push68=, 97
+	i32.ne  	$push23=, $pop22, $pop68
 	br_if   	3, $pop23       # 3: down to label0
-# BB#17:                                # %for.inc62.2
+# %bb.17:                               # %for.inc62.2
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push83=, 3
-	i32.add 	$push24=, $8, $pop83
+	i32.const	$push71=, 3
+	i32.add 	$push24=, $8, $pop71
 	i32.load8_u	$push25=, 0($pop24)
-	i32.const	$push82=, 97
-	i32.ne  	$push26=, $pop25, $pop82
+	i32.const	$push70=, 97
+	i32.ne  	$push26=, $pop25, $pop70
 	br_if   	3, $pop26       # 3: down to label0
-# BB#18:                                # %for.inc62.3
+# %bb.18:                               # %for.inc62.3
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push85=, 4
-	i32.add 	$push27=, $8, $pop85
+	i32.const	$push73=, 4
+	i32.add 	$push27=, $8, $pop73
 	i32.load8_u	$push28=, 0($pop27)
-	i32.const	$push84=, 97
-	i32.ne  	$push29=, $pop28, $pop84
+	i32.const	$push72=, 97
+	i32.ne  	$push29=, $pop28, $pop72
 	br_if   	3, $pop29       # 3: down to label0
-# BB#19:                                # %for.inc62.4
+# %bb.19:                               # %for.inc62.4
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push87=, 5
-	i32.add 	$push30=, $8, $pop87
+	i32.const	$push75=, 5
+	i32.add 	$push30=, $8, $pop75
 	i32.load8_u	$push31=, 0($pop30)
-	i32.const	$push86=, 97
-	i32.ne  	$push32=, $pop31, $pop86
+	i32.const	$push74=, 97
+	i32.ne  	$push32=, $pop31, $pop74
 	br_if   	3, $pop32       # 3: down to label0
-# BB#20:                                # %for.inc62.5
+# %bb.20:                               # %for.inc62.5
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push89=, 6
-	i32.add 	$push33=, $8, $pop89
+	i32.const	$push77=, 6
+	i32.add 	$push33=, $8, $pop77
 	i32.load8_u	$push34=, 0($pop33)
-	i32.const	$push88=, 97
-	i32.ne  	$push35=, $pop34, $pop88
+	i32.const	$push76=, 97
+	i32.ne  	$push35=, $pop34, $pop76
 	br_if   	3, $pop35       # 3: down to label0
-# BB#21:                                # %for.inc62.6
+# %bb.21:                               # %for.inc62.6
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push91=, 7
-	i32.add 	$push36=, $8, $pop91
+	i32.const	$push79=, 7
+	i32.add 	$push36=, $8, $pop79
 	i32.load8_u	$push37=, 0($pop36)
-	i32.const	$push90=, 97
-	i32.ne  	$push38=, $pop37, $pop90
+	i32.const	$push78=, 97
+	i32.ne  	$push38=, $pop37, $pop78
 	br_if   	3, $pop38       # 3: down to label0
-# BB#22:                                # %for.inc62.7
+# %bb.22:                               # %for.inc62.7
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push95=, 1
-	i32.add 	$push94=, $5, $pop95
-	tee_local	$push93=, $5=, $pop94
-	i32.const	$push92=, 80
-	i32.lt_u	$push39=, $pop93, $pop92
+	i32.const	$push81=, 1
+	i32.add 	$5=, $5, $pop81
+	i32.const	$push80=, 80
+	i32.lt_u	$push39=, $5, $pop80
 	br_if   	0, $pop39       # 0: up to label3
-# BB#23:                                # %for.inc69
+# %bb.23:                               # %for.inc69
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push99=, 1
-	i32.add 	$push98=, $2, $pop99
-	tee_local	$push97=, $2=, $pop98
-	i32.const	$push96=, 8
-	i32.lt_u	$push40=, $pop97, $pop96
+	i32.const	$push83=, 1
+	i32.add 	$2=, $2, $pop83
+	i32.const	$push82=, 8
+	i32.lt_u	$push40=, $2, $pop82
 	br_if   	0, $pop40       # 0: up to label2
-# BB#24:                                # %for.inc72
+# %bb.24:                               # %for.inc72
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push103=, 1
-	i32.add 	$push102=, $0, $pop103
-	tee_local	$push101=, $0=, $pop102
-	i32.const	$push100=, 8
-	i32.lt_u	$push41=, $pop101, $pop100
+	i32.const	$push85=, 1
+	i32.add 	$0=, $0, $pop85
+	i32.const	$push84=, 8
+	i32.lt_u	$push41=, $0, $pop84
 	br_if   	0, $pop41       # 0: up to label1
-# BB#25:                                # %for.end74
+# %bb.25:                               # %for.end74
 	end_loop
 	i32.const	$push42=, 0
 	call    	exit@FUNCTION, $pop42
@@ -263,6 +254,6 @@ u2:
 	.size	u2, 96
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3aa82b306..aabac662b 100644
--- a/test/torture-s/memcpy-bi.c.s
+++ b/test/torture-s/memcpy-bi.c.s
@@ -6,11 +6,11 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push0=, memcmp@FUNCTION, $0, $1, $2
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,1683 +27,1676 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push469=, src
-	i32.add 	$push8=, $0, $pop469
+	i32.const	$push470=, src
+	i32.add 	$push8=, $0, $pop470
+	i32.const	$push469=, 97
 	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.div_u	$push9=, $0, $pop468
+	i32.const	$push467=, 26
+	i32.mul 	$push10=, $pop9, $pop467
+	i32.sub 	$push11=, $pop469, $pop10
+	i32.add 	$push12=, $0, $pop11
+	i32.store8	0($pop8), $pop12
 	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
+	i32.add 	$0=, $0, $pop466
+	i32.const	$push465=, 80
+	i32.ne  	$push13=, $0, $pop465
+	br_if   	0, $pop13       # 0: up to label1
+# %bb.2:                                # %check.exit
 	end_loop
-	i32.const	$push473=, 0
 	i32.const	$push472=, 0
-	i32.load16_u	$push471=, src($pop472)
-	tee_local	$push470=, $0=, $pop471
-	i32.store16	dst($pop473), $pop470
+	i32.load16_u	$0=, src($pop472)
+	i32.const	$push471=, 0
+	i32.store16	dst($pop471), $0
 	block   	
-	i32.ne  	$push12=, $0, $0
-	br_if   	0, $pop12       # 0: down to label2
-# BB#3:                                 # %check.exit13
-	i32.const	$push479=, 0
+	i32.ne  	$push14=, $0, $0
+	br_if   	0, $pop14       # 0: down to label2
+# %bb.3:                                # %check.exit13
 	i32.const	$push478=, 0
-	i32.load8_u	$push13=, src+2($pop478)
-	i32.store8	dst+2($pop479), $pop13
 	i32.const	$push477=, 0
+	i32.load8_u	$push15=, src+2($pop477)
+	i32.store8	dst+2($pop478), $pop15
 	i32.const	$push476=, 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.const	$push475=, 0
+	i32.load16_u	$push16=, src($pop475)
+	i32.store16	dst($pop476), $pop16
+	i32.const	$push474=, dst
+	i32.const	$push473=, src
+	i32.const	$push17=, 3
+	i32.call	$push18=, memcmp@FUNCTION, $pop474, $pop473, $pop17
+	br_if   	0, $pop18       # 0: down to label2
+# %bb.4:                                # %check.exit17
 	i32.const	$push484=, 0
-	i32.load8_u	$push17=, src+4($pop484)
-	i32.store8	dst+4($pop485), $pop17
 	i32.const	$push483=, 0
+	i32.load8_u	$push19=, src+4($pop483)
+	i32.store8	dst+4($pop484), $pop19
 	i32.const	$push482=, 0
-	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	$push481=, 0
+	i32.load	$push20=, src($pop481)
+	i32.store	dst($pop482), $pop20
+	i32.const	$push480=, dst
+	i32.const	$push479=, src
+	i32.const	$push21=, 5
+	i32.call	$push22=, memcmp@FUNCTION, $pop480, $pop479, $pop21
+	br_if   	0, $pop22       # 0: down to label2
+# %bb.5:                                # %check.exit25
 	i32.const	$push490=, 0
-	i32.load16_u	$push21=, src+4($pop490)
-	i32.store16	dst+4($pop491), $pop21
 	i32.const	$push489=, 0
+	i32.load16_u	$push23=, src+4($pop489)
+	i32.store16	dst+4($pop490), $pop23
 	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	$push487=, 0
+	i32.load	$push24=, src($pop487)
+	i32.store	dst($pop488), $pop24
+	i32.const	$push486=, dst
+	i32.const	$push485=, src
+	i32.const	$push25=, 6
+	i32.call	$push26=, memcmp@FUNCTION, $pop486, $pop485, $pop25
+	br_if   	0, $pop26       # 0: down to label2
+# %bb.6:                                # %check.exit29
 	i32.const	$push498=, 0
-	i32.load8_u	$push25=, src+6($pop498)
-	i32.store8	dst+6($pop499), $pop25
 	i32.const	$push497=, 0
+	i32.load8_u	$push27=, src+6($pop497)
+	i32.store8	dst+6($pop498), $pop27
 	i32.const	$push496=, 0
-	i32.load16_u	$push26=, src+4($pop496)
-	i32.store16	dst+4($pop497), $pop26
 	i32.const	$push495=, 0
+	i32.load16_u	$push28=, src+4($pop495)
+	i32.store16	dst+4($pop496), $pop28
 	i32.const	$push494=, 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
+	i32.const	$push493=, 0
+	i32.load	$push29=, src($pop493)
+	i32.store	dst($pop494), $pop29
+	i32.const	$push492=, dst
+	i32.const	$push491=, src
+	i32.const	$push30=, 7
+	i32.call	$push31=, memcmp@FUNCTION, $pop492, $pop491, $pop30
+	br_if   	0, $pop31       # 0: down to label2
+# %bb.7:                                # %check.exit33
 	i32.const	$push504=, 0
-	i32.load8_u	$push30=, src+8($pop504)
-	i32.store8	dst+8($pop505), $pop30
 	i32.const	$push503=, 0
+	i32.load8_u	$push32=, src+8($pop503)
+	i32.store8	dst+8($pop504), $pop32
 	i32.const	$push502=, 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	$push501=, 0
+	i64.load	$push33=, src($pop501)
+	i64.store	dst($pop502), $pop33
+	i32.const	$push500=, dst
+	i32.const	$push499=, src
+	i32.const	$push34=, 9
+	i32.call	$push35=, memcmp@FUNCTION, $pop500, $pop499, $pop34
+	br_if   	0, $pop35       # 0: down to label2
+# %bb.8:                                # %check.exit41
 	i32.const	$push510=, 0
-	i32.load16_u	$push34=, src+8($pop510)
-	i32.store16	dst+8($pop511), $pop34
 	i32.const	$push509=, 0
+	i32.load16_u	$push36=, src+8($pop509)
+	i32.store16	dst+8($pop510), $pop36
 	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.const	$push507=, 0
+	i64.load	$push37=, src($pop507)
+	i64.store	dst($pop508), $pop37
+	i32.const	$push506=, dst
+	i32.const	$push505=, src
+	i32.const	$push38=, 10
+	i32.call	$push39=, memcmp@FUNCTION, $pop506, $pop505, $pop38
+	br_if   	0, $pop39       # 0: down to label2
+# %bb.9:                                # %check.exit45
 	i32.const	$push518=, 0
-	i32.load8_u	$push38=, src+10($pop518)
-	i32.store8	dst+10($pop519), $pop38
 	i32.const	$push517=, 0
+	i32.load8_u	$push40=, src+10($pop517)
+	i32.store8	dst+10($pop518), $pop40
 	i32.const	$push516=, 0
-	i32.load16_u	$push39=, src+8($pop516)
-	i32.store16	dst+8($pop517), $pop39
 	i32.const	$push515=, 0
+	i32.load16_u	$push41=, src+8($pop515)
+	i32.store16	dst+8($pop516), $pop41
 	i32.const	$push514=, 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	$push513=, 0
+	i64.load	$push42=, src($pop513)
+	i64.store	dst($pop514), $pop42
+	i32.const	$push512=, dst
+	i32.const	$push511=, src
+	i32.const	$push43=, 11
+	i32.call	$push44=, memcmp@FUNCTION, $pop512, $pop511, $pop43
+	br_if   	0, $pop44       # 0: down to label2
+# %bb.10:                               # %check.exit49
 	i32.const	$push524=, 0
-	i32.load	$push43=, src+8($pop524)
-	i32.store	dst+8($pop525), $pop43
 	i32.const	$push523=, 0
+	i32.load	$push45=, src+8($pop523)
+	i32.store	dst+8($pop524), $pop45
 	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.const	$push521=, 0
+	i64.load	$push46=, src($pop521)
+	i64.store	dst($pop522), $pop46
+	i32.const	$push520=, dst
+	i32.const	$push519=, src
+	i32.const	$push47=, 12
+	i32.call	$push48=, memcmp@FUNCTION, $pop520, $pop519, $pop47
+	br_if   	0, $pop48       # 0: down to label2
+# %bb.11:                               # %check.exit53
 	i32.const	$push530=, 0
-	i64.load	$push47=, src+5($pop530):p2align=0
-	i64.store	dst+5($pop531):p2align=0, $pop47
 	i32.const	$push529=, 0
+	i64.load	$push49=, src+5($pop529):p2align=0
+	i64.store	dst+5($pop530):p2align=0, $pop49
 	i32.const	$push528=, 0
-	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	$push527=, 0
+	i64.load	$push50=, src($pop527)
+	i64.store	dst($pop528), $pop50
+	i32.const	$push526=, dst
+	i32.const	$push525=, src
+	i32.const	$push51=, 13
+	i32.call	$push52=, memcmp@FUNCTION, $pop526, $pop525, $pop51
+	br_if   	0, $pop52       # 0: down to label2
+# %bb.12:                               # %check.exit57
 	i32.const	$push536=, 0
-	i64.load	$push51=, src+6($pop536):p2align=1
-	i64.store	dst+6($pop537):p2align=1, $pop51
 	i32.const	$push535=, 0
+	i64.load	$push53=, src+6($pop535):p2align=1
+	i64.store	dst+6($pop536):p2align=1, $pop53
 	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	$push533=, 0
+	i64.load	$push54=, src($pop533)
+	i64.store	dst($pop534), $pop54
+	i32.const	$push532=, dst
+	i32.const	$push531=, src
+	i32.const	$push55=, 14
+	i32.call	$push56=, memcmp@FUNCTION, $pop532, $pop531, $pop55
+	br_if   	0, $pop56       # 0: down to label2
+# %bb.13:                               # %check.exit61
 	i32.const	$push542=, 0
-	i64.load	$push55=, src+7($pop542):p2align=0
-	i64.store	dst+7($pop543):p2align=0, $pop55
 	i32.const	$push541=, 0
+	i64.load	$push57=, src+7($pop541):p2align=0
+	i64.store	dst+7($pop542):p2align=0, $pop57
 	i32.const	$push540=, 0
-	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	$push539=, 0
+	i64.load	$push58=, src($pop539)
+	i64.store	dst($pop540), $pop58
+	i32.const	$push538=, dst
+	i32.const	$push537=, src
+	i32.const	$push59=, 15
+	i32.call	$push60=, memcmp@FUNCTION, $pop538, $pop537, $pop59
+	br_if   	0, $pop60       # 0: down to label2
+# %bb.14:                               # %check.exit65
 	i32.const	$push548=, 0
-	i64.load	$push59=, src+8($pop548)
-	i64.store	dst+8($pop549), $pop59
 	i32.const	$push547=, 0
+	i64.load	$push61=, src+8($pop547)
+	i64.store	dst+8($pop548), $pop61
 	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	$push545=, 0
+	i64.load	$push62=, src($pop545)
+	i64.store	dst($pop546), $pop62
+	i32.const	$push544=, dst
+	i32.const	$push543=, src
+	i32.const	$push63=, 16
+	i32.call	$push64=, memcmp@FUNCTION, $pop544, $pop543, $pop63
+	br_if   	0, $pop64       # 0: down to label2
+# %bb.15:                               # %check.exit69
 	i32.const	$push556=, 0
-	i32.load8_u	$push63=, src+16($pop556)
-	i32.store8	dst+16($pop557), $pop63
 	i32.const	$push555=, 0
+	i32.load8_u	$push65=, src+16($pop555)
+	i32.store8	dst+16($pop556), $pop65
 	i32.const	$push554=, 0
-	i64.load	$push64=, src+8($pop554)
-	i64.store	dst+8($pop555), $pop64
 	i32.const	$push553=, 0
+	i64.load	$push66=, src+8($pop553)
+	i64.store	dst+8($pop554), $pop66
 	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	$push551=, 0
+	i64.load	$push67=, src($pop551)
+	i64.store	dst($pop552), $pop67
+	i32.const	$push550=, dst
+	i32.const	$push549=, src
+	i32.const	$push68=, 17
+	i32.call	$push69=, memcmp@FUNCTION, $pop550, $pop549, $pop68
+	br_if   	0, $pop69       # 0: down to label2
+# %bb.16:                               # %check.exit73
 	i32.const	$push564=, 0
-	i32.load16_u	$push68=, src+16($pop564)
-	i32.store16	dst+16($pop565), $pop68
 	i32.const	$push563=, 0
+	i32.load16_u	$push70=, src+16($pop563)
+	i32.store16	dst+16($pop564), $pop70
 	i32.const	$push562=, 0
-	i64.load	$push69=, src+8($pop562)
-	i64.store	dst+8($pop563), $pop69
 	i32.const	$push561=, 0
+	i64.load	$push71=, src+8($pop561)
+	i64.store	dst+8($pop562), $pop71
 	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	$push559=, 0
+	i64.load	$push72=, src($pop559)
+	i64.store	dst($pop560), $pop72
+	i32.const	$push558=, dst
+	i32.const	$push557=, src
+	i32.const	$push73=, 18
+	i32.call	$push74=, memcmp@FUNCTION, $pop558, $pop557, $pop73
+	br_if   	0, $pop74       # 0: down to label2
+# %bb.17:                               # %check.exit77
 	i32.const	$push574=, 0
-	i32.load8_u	$push73=, src+18($pop574)
-	i32.store8	dst+18($pop575), $pop73
 	i32.const	$push573=, 0
+	i32.load8_u	$push75=, src+18($pop573)
+	i32.store8	dst+18($pop574), $pop75
 	i32.const	$push572=, 0
-	i32.load16_u	$push74=, src+16($pop572)
-	i32.store16	dst+16($pop573), $pop74
 	i32.const	$push571=, 0
+	i32.load16_u	$push76=, src+16($pop571)
+	i32.store16	dst+16($pop572), $pop76
 	i32.const	$push570=, 0
-	i64.load	$push75=, src+8($pop570)
-	i64.store	dst+8($pop571), $pop75
 	i32.const	$push569=, 0
+	i64.load	$push77=, src+8($pop569)
+	i64.store	dst+8($pop570), $pop77
 	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	$push567=, 0
+	i64.load	$push78=, src($pop567)
+	i64.store	dst($pop568), $pop78
+	i32.const	$push566=, dst
+	i32.const	$push565=, src
+	i32.const	$push79=, 19
+	i32.call	$push80=, memcmp@FUNCTION, $pop566, $pop565, $pop79
+	br_if   	0, $pop80       # 0: down to label2
+# %bb.18:                               # %check.exit81
 	i32.const	$push582=, 0
-	i32.load	$push79=, src+16($pop582)
-	i32.store	dst+16($pop583), $pop79
 	i32.const	$push581=, 0
+	i32.load	$push81=, src+16($pop581)
+	i32.store	dst+16($pop582), $pop81
 	i32.const	$push580=, 0
-	i64.load	$push80=, src+8($pop580)
-	i64.store	dst+8($pop581), $pop80
 	i32.const	$push579=, 0
+	i64.load	$push82=, src+8($pop579)
+	i64.store	dst+8($pop580), $pop82
 	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	$push577=, 0
+	i64.load	$push83=, src($pop577)
+	i64.store	dst($pop578), $pop83
+	i32.const	$push576=, dst
+	i32.const	$push575=, src
+	i32.const	$push84=, 20
+	i32.call	$push85=, memcmp@FUNCTION, $pop576, $pop575, $pop84
+	br_if   	0, $pop85       # 0: down to label2
+# %bb.19:                               # %check.exit85
 	i32.const	$push590=, 0
-	i64.load	$push84=, src+13($pop590):p2align=0
-	i64.store	dst+13($pop591):p2align=0, $pop84
 	i32.const	$push589=, 0
+	i64.load	$push86=, src+13($pop589):p2align=0
+	i64.store	dst+13($pop590):p2align=0, $pop86
 	i32.const	$push588=, 0
-	i64.load	$push85=, src+8($pop588)
-	i64.store	dst+8($pop589), $pop85
 	i32.const	$push587=, 0
+	i64.load	$push87=, src+8($pop587)
+	i64.store	dst+8($pop588), $pop87
 	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	$push585=, 0
+	i64.load	$push88=, src($pop585)
+	i64.store	dst($pop586), $pop88
+	i32.const	$push584=, dst
+	i32.const	$push583=, src
+	i32.const	$push89=, 21
+	i32.call	$push90=, memcmp@FUNCTION, $pop584, $pop583, $pop89
+	br_if   	0, $pop90       # 0: down to label2
+# %bb.20:                               # %check.exit89
 	i32.const	$push598=, 0
-	i64.load	$push89=, src+14($pop598):p2align=1
-	i64.store	dst+14($pop599):p2align=1, $pop89
 	i32.const	$push597=, 0
+	i64.load	$push91=, src+14($pop597):p2align=1
+	i64.store	dst+14($pop598):p2align=1, $pop91
 	i32.const	$push596=, 0
-	i64.load	$push90=, src+8($pop596)
-	i64.store	dst+8($pop597), $pop90
 	i32.const	$push595=, 0
+	i64.load	$push92=, src+8($pop595)
+	i64.store	dst+8($pop596), $pop92
 	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	$push593=, 0
+	i64.load	$push93=, src($pop593)
+	i64.store	dst($pop594), $pop93
+	i32.const	$push592=, dst
+	i32.const	$push591=, src
+	i32.const	$push94=, 22
+	i32.call	$push95=, memcmp@FUNCTION, $pop592, $pop591, $pop94
+	br_if   	0, $pop95       # 0: down to label2
+# %bb.21:                               # %check.exit93
 	i32.const	$push606=, 0
-	i64.load	$push94=, src+15($pop606):p2align=0
-	i64.store	dst+15($pop607):p2align=0, $pop94
 	i32.const	$push605=, 0
+	i64.load	$push96=, src+15($pop605):p2align=0
+	i64.store	dst+15($pop606):p2align=0, $pop96
 	i32.const	$push604=, 0
-	i64.load	$push95=, src+8($pop604)
-	i64.store	dst+8($pop605), $pop95
 	i32.const	$push603=, 0
+	i64.load	$push97=, src+8($pop603)
+	i64.store	dst+8($pop604), $pop97
 	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	$push601=, 0
+	i64.load	$push98=, src($pop601)
+	i64.store	dst($pop602), $pop98
+	i32.const	$push600=, dst
+	i32.const	$push599=, src
+	i32.const	$push99=, 23
+	i32.call	$push100=, memcmp@FUNCTION, $pop600, $pop599, $pop99
+	br_if   	0, $pop100      # 0: down to label2
+# %bb.22:                               # %check.exit97
 	i32.const	$push614=, 0
-	i64.load	$push99=, src+16($pop614)
-	i64.store	dst+16($pop615), $pop99
 	i32.const	$push613=, 0
+	i64.load	$push101=, src+16($pop613)
+	i64.store	dst+16($pop614), $pop101
 	i32.const	$push612=, 0
-	i64.load	$push100=, src+8($pop612)
-	i64.store	dst+8($pop613), $pop100
 	i32.const	$push611=, 0
+	i64.load	$push102=, src+8($pop611)
+	i64.store	dst+8($pop612), $pop102
 	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	$push609=, 0
+	i64.load	$push103=, src($pop609)
+	i64.store	dst($pop610), $pop103
+	i32.const	$push608=, dst
+	i32.const	$push607=, src
+	i32.const	$push104=, 24
+	i32.call	$push105=, memcmp@FUNCTION, $pop608, $pop607, $pop104
+	br_if   	0, $pop105      # 0: down to label2
+# %bb.23:                               # %check.exit101
 	i32.const	$push624=, 0
-	i32.load8_u	$push104=, src+24($pop624)
-	i32.store8	dst+24($pop625), $pop104
 	i32.const	$push623=, 0
+	i32.load8_u	$push106=, src+24($pop623)
+	i32.store8	dst+24($pop624), $pop106
 	i32.const	$push622=, 0
-	i64.load	$push105=, src+16($pop622)
-	i64.store	dst+16($pop623), $pop105
 	i32.const	$push621=, 0
+	i64.load	$push107=, src+16($pop621)
+	i64.store	dst+16($pop622), $pop107
 	i32.const	$push620=, 0
-	i64.load	$push106=, src+8($pop620)
-	i64.store	dst+8($pop621), $pop106
 	i32.const	$push619=, 0
+	i64.load	$push108=, src+8($pop619)
+	i64.store	dst+8($pop620), $pop108
 	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	$push617=, 0
+	i64.load	$push109=, src($pop617)
+	i64.store	dst($pop618), $pop109
+	i32.const	$push616=, dst
+	i32.const	$push615=, src
+	i32.const	$push110=, 25
+	i32.call	$push111=, memcmp@FUNCTION, $pop616, $pop615, $pop110
+	br_if   	0, $pop111      # 0: down to label2
+# %bb.24:                               # %check.exit105
 	i32.const	$push634=, 0
-	i32.load16_u	$push110=, src+24($pop634)
-	i32.store16	dst+24($pop635), $pop110
 	i32.const	$push633=, 0
+	i32.load16_u	$push112=, src+24($pop633)
+	i32.store16	dst+24($pop634), $pop112
 	i32.const	$push632=, 0
-	i64.load	$push111=, src+16($pop632)
-	i64.store	dst+16($pop633), $pop111
 	i32.const	$push631=, 0
+	i64.load	$push113=, src+16($pop631)
+	i64.store	dst+16($pop632), $pop113
 	i32.const	$push630=, 0
-	i64.load	$push112=, src+8($pop630)
-	i64.store	dst+8($pop631), $pop112
 	i32.const	$push629=, 0
+	i64.load	$push114=, src+8($pop629)
+	i64.store	dst+8($pop630), $pop114
 	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	$push627=, 0
+	i64.load	$push115=, src($pop627)
+	i64.store	dst($pop628), $pop115
+	i32.const	$push626=, dst
+	i32.const	$push625=, src
+	i32.const	$push116=, 26
+	i32.call	$push117=, memcmp@FUNCTION, $pop626, $pop625, $pop116
+	br_if   	0, $pop117      # 0: down to label2
+# %bb.25:                               # %check.exit109
 	i32.const	$push646=, 0
-	i32.load8_u	$push116=, src+26($pop646)
-	i32.store8	dst+26($pop647), $pop116
 	i32.const	$push645=, 0
+	i32.load8_u	$push118=, src+26($pop645)
+	i32.store8	dst+26($pop646), $pop118
 	i32.const	$push644=, 0
-	i32.load16_u	$push117=, src+24($pop644)
-	i32.store16	dst+24($pop645), $pop117
 	i32.const	$push643=, 0
+	i32.load16_u	$push119=, src+24($pop643)
+	i32.store16	dst+24($pop644), $pop119
 	i32.const	$push642=, 0
-	i64.load	$push118=, src+16($pop642)
-	i64.store	dst+16($pop643), $pop118
 	i32.const	$push641=, 0
+	i64.load	$push120=, src+16($pop641)
+	i64.store	dst+16($pop642), $pop120
 	i32.const	$push640=, 0
-	i64.load	$push119=, src+8($pop640)
-	i64.store	dst+8($pop641), $pop119
 	i32.const	$push639=, 0
+	i64.load	$push121=, src+8($pop639)
+	i64.store	dst+8($pop640), $pop121
 	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	$push637=, 0
+	i64.load	$push122=, src($pop637)
+	i64.store	dst($pop638), $pop122
+	i32.const	$push636=, dst
+	i32.const	$push635=, src
+	i32.const	$push123=, 27
+	i32.call	$push124=, memcmp@FUNCTION, $pop636, $pop635, $pop123
+	br_if   	0, $pop124      # 0: down to label2
+# %bb.26:                               # %check.exit113
 	i32.const	$push656=, 0
-	i32.load	$push123=, src+24($pop656)
-	i32.store	dst+24($pop657), $pop123
 	i32.const	$push655=, 0
+	i32.load	$push125=, src+24($pop655)
+	i32.store	dst+24($pop656), $pop125
 	i32.const	$push654=, 0
-	i64.load	$push124=, src+16($pop654)
-	i64.store	dst+16($pop655), $pop124
 	i32.const	$push653=, 0
+	i64.load	$push126=, src+16($pop653)
+	i64.store	dst+16($pop654), $pop126
 	i32.const	$push652=, 0
-	i64.load	$push125=, src+8($pop652)
-	i64.store	dst+8($pop653), $pop125
 	i32.const	$push651=, 0
+	i64.load	$push127=, src+8($pop651)
+	i64.store	dst+8($pop652), $pop127
 	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	$push649=, 0
+	i64.load	$push128=, src($pop649)
+	i64.store	dst($pop650), $pop128
+	i32.const	$push648=, dst
+	i32.const	$push647=, src
+	i32.const	$push129=, 28
+	i32.call	$push130=, memcmp@FUNCTION, $pop648, $pop647, $pop129
+	br_if   	0, $pop130      # 0: down to label2
+# %bb.27:                               # %check.exit117
 	i32.const	$push666=, 0
-	i64.load	$push129=, src+21($pop666):p2align=0
-	i64.store	dst+21($pop667):p2align=0, $pop129
 	i32.const	$push665=, 0
+	i64.load	$push131=, src+21($pop665):p2align=0
+	i64.store	dst+21($pop666):p2align=0, $pop131
 	i32.const	$push664=, 0
-	i64.load	$push130=, src+16($pop664)
-	i64.store	dst+16($pop665), $pop130
 	i32.const	$push663=, 0
+	i64.load	$push132=, src+16($pop663)
+	i64.store	dst+16($pop664), $pop132
 	i32.const	$push662=, 0
-	i64.load	$push131=, src+8($pop662)
-	i64.store	dst+8($pop663), $pop131
 	i32.const	$push661=, 0
+	i64.load	$push133=, src+8($pop661)
+	i64.store	dst+8($pop662), $pop133
 	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	$push659=, 0
+	i64.load	$push134=, src($pop659)
+	i64.store	dst($pop660), $pop134
+	i32.const	$push658=, dst
+	i32.const	$push657=, src
+	i32.const	$push135=, 29
+	i32.call	$push136=, memcmp@FUNCTION, $pop658, $pop657, $pop135
+	br_if   	0, $pop136      # 0: down to label2
+# %bb.28:                               # %check.exit121
 	i32.const	$push676=, 0
-	i64.load	$push135=, src+22($pop676):p2align=1
-	i64.store	dst+22($pop677):p2align=1, $pop135
 	i32.const	$push675=, 0
+	i64.load	$push137=, src+22($pop675):p2align=1
+	i64.store	dst+22($pop676):p2align=1, $pop137
 	i32.const	$push674=, 0
-	i64.load	$push136=, src+16($pop674)
-	i64.store	dst+16($pop675), $pop136
 	i32.const	$push673=, 0
+	i64.load	$push138=, src+16($pop673)
+	i64.store	dst+16($pop674), $pop138
 	i32.const	$push672=, 0
-	i64.load	$push137=, src+8($pop672)
-	i64.store	dst+8($pop673), $pop137
 	i32.const	$push671=, 0
+	i64.load	$push139=, src+8($pop671)
+	i64.store	dst+8($pop672), $pop139
 	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	$push669=, 0
+	i64.load	$push140=, src($pop669)
+	i64.store	dst($pop670), $pop140
+	i32.const	$push668=, dst
+	i32.const	$push667=, src
+	i32.const	$push141=, 30
+	i32.call	$push142=, memcmp@FUNCTION, $pop668, $pop667, $pop141
+	br_if   	0, $pop142      # 0: down to label2
+# %bb.29:                               # %check.exit125
 	i32.const	$push686=, 0
-	i64.load	$push141=, src+23($pop686):p2align=0
-	i64.store	dst+23($pop687):p2align=0, $pop141
 	i32.const	$push685=, 0
+	i64.load	$push143=, src+23($pop685):p2align=0
+	i64.store	dst+23($pop686):p2align=0, $pop143
 	i32.const	$push684=, 0
-	i64.load	$push142=, src+16($pop684)
-	i64.store	dst+16($pop685), $pop142
 	i32.const	$push683=, 0
+	i64.load	$push144=, src+16($pop683)
+	i64.store	dst+16($pop684), $pop144
 	i32.const	$push682=, 0
-	i64.load	$push143=, src+8($pop682)
-	i64.store	dst+8($pop683), $pop143
 	i32.const	$push681=, 0
+	i64.load	$push145=, src+8($pop681)
+	i64.store	dst+8($pop682), $pop145
 	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	$push679=, 0
+	i64.load	$push146=, src($pop679)
+	i64.store	dst($pop680), $pop146
+	i32.const	$push678=, dst
+	i32.const	$push677=, src
+	i32.const	$push147=, 31
+	i32.call	$push148=, memcmp@FUNCTION, $pop678, $pop677, $pop147
+	br_if   	0, $pop148      # 0: down to label2
+# %bb.30:                               # %check.exit129
 	i32.const	$push696=, 0
-	i64.load	$push147=, src+24($pop696)
-	i64.store	dst+24($pop697), $pop147
 	i32.const	$push695=, 0
+	i64.load	$push149=, src+24($pop695)
+	i64.store	dst+24($pop696), $pop149
 	i32.const	$push694=, 0
-	i64.load	$push148=, src+16($pop694)
-	i64.store	dst+16($pop695), $pop148
 	i32.const	$push693=, 0
+	i64.load	$push150=, src+16($pop693)
+	i64.store	dst+16($pop694), $pop150
 	i32.const	$push692=, 0
-	i64.load	$push149=, src+8($pop692)
-	i64.store	dst+8($pop693), $pop149
 	i32.const	$push691=, 0
+	i64.load	$push151=, src+8($pop691)
+	i64.store	dst+8($pop692), $pop151
 	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	$push709=, 0
+	i32.const	$push689=, 0
+	i64.load	$push152=, src($pop689)
+	i64.store	dst($pop690), $pop152
+	i32.const	$push688=, dst
+	i32.const	$push687=, src
+	i32.const	$push153=, 32
+	i32.call	$push154=, memcmp@FUNCTION, $pop688, $pop687, $pop153
+	br_if   	0, $pop154      # 0: down to label2
+# %bb.31:                               # %check.exit133
 	i32.const	$push708=, 0
-	i32.load8_u	$push153=, src+32($pop708)
-	i32.store8	dst+32($pop709), $pop153
 	i32.const	$push707=, 0
+	i32.load8_u	$push155=, src+32($pop707)
+	i32.store8	dst+32($pop708), $pop155
 	i32.const	$push706=, 0
-	i64.load	$push154=, src+24($pop706)
-	i64.store	dst+24($pop707), $pop154
 	i32.const	$push705=, 0
+	i64.load	$push156=, src+24($pop705)
+	i64.store	dst+24($pop706), $pop156
 	i32.const	$push704=, 0
-	i64.load	$push155=, src+16($pop704)
-	i64.store	dst+16($pop705), $pop155
 	i32.const	$push703=, 0
+	i64.load	$push157=, src+16($pop703)
+	i64.store	dst+16($pop704), $pop157
 	i32.const	$push702=, 0
-	i64.load	$push156=, src+8($pop702)
-	i64.store	dst+8($pop703), $pop156
 	i32.const	$push701=, 0
+	i64.load	$push158=, src+8($pop701)
+	i64.store	dst+8($pop702), $pop158
 	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	$push721=, 0
+	i32.const	$push699=, 0
+	i64.load	$push159=, src($pop699)
+	i64.store	dst($pop700), $pop159
+	i32.const	$push698=, dst
+	i32.const	$push697=, src
+	i32.const	$push160=, 33
+	i32.call	$push161=, memcmp@FUNCTION, $pop698, $pop697, $pop160
+	br_if   	0, $pop161      # 0: down to label2
+# %bb.32:                               # %check.exit137
 	i32.const	$push720=, 0
-	i32.load16_u	$push160=, src+32($pop720)
-	i32.store16	dst+32($pop721), $pop160
 	i32.const	$push719=, 0
+	i32.load16_u	$push162=, src+32($pop719)
+	i32.store16	dst+32($pop720), $pop162
 	i32.const	$push718=, 0
-	i64.load	$push161=, src+24($pop718)
-	i64.store	dst+24($pop719), $pop161
 	i32.const	$push717=, 0
+	i64.load	$push163=, src+24($pop717)
+	i64.store	dst+24($pop718), $pop163
 	i32.const	$push716=, 0
-	i64.load	$push162=, src+16($pop716)
-	i64.store	dst+16($pop717), $pop162
 	i32.const	$push715=, 0
+	i64.load	$push164=, src+16($pop715)
+	i64.store	dst+16($pop716), $pop164
 	i32.const	$push714=, 0
-	i64.load	$push163=, src+8($pop714)
-	i64.store	dst+8($pop715), $pop163
 	i32.const	$push713=, 0
+	i64.load	$push165=, src+8($pop713)
+	i64.store	dst+8($pop714), $pop165
 	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	$push735=, 0
+	i32.const	$push711=, 0
+	i64.load	$push166=, src($pop711)
+	i64.store	dst($pop712), $pop166
+	i32.const	$push710=, dst
+	i32.const	$push709=, src
+	i32.const	$push167=, 34
+	i32.call	$push168=, memcmp@FUNCTION, $pop710, $pop709, $pop167
+	br_if   	0, $pop168      # 0: down to label2
+# %bb.33:                               # %check.exit141
 	i32.const	$push734=, 0
-	i32.load8_u	$push167=, src+34($pop734)
-	i32.store8	dst+34($pop735), $pop167
 	i32.const	$push733=, 0
+	i32.load8_u	$push169=, src+34($pop733)
+	i32.store8	dst+34($pop734), $pop169
 	i32.const	$push732=, 0
-	i32.load16_u	$push168=, src+32($pop732)
-	i32.store16	dst+32($pop733), $pop168
 	i32.const	$push731=, 0
+	i32.load16_u	$push170=, src+32($pop731)
+	i32.store16	dst+32($pop732), $pop170
 	i32.const	$push730=, 0
-	i64.load	$push169=, src+24($pop730)
-	i64.store	dst+24($pop731), $pop169
 	i32.const	$push729=, 0
+	i64.load	$push171=, src+24($pop729)
+	i64.store	dst+24($pop730), $pop171
 	i32.const	$push728=, 0
-	i64.load	$push170=, src+16($pop728)
-	i64.store	dst+16($pop729), $pop170
 	i32.const	$push727=, 0
+	i64.load	$push172=, src+16($pop727)
+	i64.store	dst+16($pop728), $pop172
 	i32.const	$push726=, 0
-	i64.load	$push171=, src+8($pop726)
-	i64.store	dst+8($pop727), $pop171
 	i32.const	$push725=, 0
+	i64.load	$push173=, src+8($pop725)
+	i64.store	dst+8($pop726), $pop173
 	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	$push747=, 0
+	i32.const	$push723=, 0
+	i64.load	$push174=, src($pop723)
+	i64.store	dst($pop724), $pop174
+	i32.const	$push722=, dst
+	i32.const	$push721=, src
+	i32.const	$push175=, 35
+	i32.call	$push176=, memcmp@FUNCTION, $pop722, $pop721, $pop175
+	br_if   	0, $pop176      # 0: down to label2
+# %bb.34:                               # %check.exit145
 	i32.const	$push746=, 0
-	i32.load	$push175=, src+32($pop746)
-	i32.store	dst+32($pop747), $pop175
 	i32.const	$push745=, 0
+	i32.load	$push177=, src+32($pop745)
+	i32.store	dst+32($pop746), $pop177
 	i32.const	$push744=, 0
-	i64.load	$push176=, src+24($pop744)
-	i64.store	dst+24($pop745), $pop176
 	i32.const	$push743=, 0
+	i64.load	$push178=, src+24($pop743)
+	i64.store	dst+24($pop744), $pop178
 	i32.const	$push742=, 0
-	i64.load	$push177=, src+16($pop742)
-	i64.store	dst+16($pop743), $pop177
 	i32.const	$push741=, 0
+	i64.load	$push179=, src+16($pop741)
+	i64.store	dst+16($pop742), $pop179
 	i32.const	$push740=, 0
-	i64.load	$push178=, src+8($pop740)
-	i64.store	dst+8($pop741), $pop178
 	i32.const	$push739=, 0
+	i64.load	$push180=, src+8($pop739)
+	i64.store	dst+8($pop740), $pop180
 	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	$push759=, 0
+	i32.const	$push737=, 0
+	i64.load	$push181=, src($pop737)
+	i64.store	dst($pop738), $pop181
+	i32.const	$push736=, dst
+	i32.const	$push735=, src
+	i32.const	$push182=, 36
+	i32.call	$push183=, memcmp@FUNCTION, $pop736, $pop735, $pop182
+	br_if   	0, $pop183      # 0: down to label2
+# %bb.35:                               # %check.exit149
 	i32.const	$push758=, 0
-	i64.load	$push182=, src+29($pop758):p2align=0
-	i64.store	dst+29($pop759):p2align=0, $pop182
 	i32.const	$push757=, 0
+	i64.load	$push184=, src+29($pop757):p2align=0
+	i64.store	dst+29($pop758):p2align=0, $pop184
 	i32.const	$push756=, 0
-	i64.load	$push183=, src+24($pop756)
-	i64.store	dst+24($pop757), $pop183
 	i32.const	$push755=, 0
+	i64.load	$push185=, src+24($pop755)
+	i64.store	dst+24($pop756), $pop185
 	i32.const	$push754=, 0
-	i64.load	$push184=, src+16($pop754)
-	i64.store	dst+16($pop755), $pop184
 	i32.const	$push753=, 0
+	i64.load	$push186=, src+16($pop753)
+	i64.store	dst+16($pop754), $pop186
 	i32.const	$push752=, 0
-	i64.load	$push185=, src+8($pop752)
-	i64.store	dst+8($pop753), $pop185
 	i32.const	$push751=, 0
+	i64.load	$push187=, src+8($pop751)
+	i64.store	dst+8($pop752), $pop187
 	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	$push771=, 0
+	i32.const	$push749=, 0
+	i64.load	$push188=, src($pop749)
+	i64.store	dst($pop750), $pop188
+	i32.const	$push748=, dst
+	i32.const	$push747=, src
+	i32.const	$push189=, 37
+	i32.call	$push190=, memcmp@FUNCTION, $pop748, $pop747, $pop189
+	br_if   	0, $pop190      # 0: down to label2
+# %bb.36:                               # %check.exit153
 	i32.const	$push770=, 0
-	i64.load	$push189=, src+30($pop770):p2align=1
-	i64.store	dst+30($pop771):p2align=1, $pop189
 	i32.const	$push769=, 0
+	i64.load	$push191=, src+30($pop769):p2align=1
+	i64.store	dst+30($pop770):p2align=1, $pop191
 	i32.const	$push768=, 0
-	i64.load	$push190=, src+24($pop768)
-	i64.store	dst+24($pop769), $pop190
 	i32.const	$push767=, 0
+	i64.load	$push192=, src+24($pop767)
+	i64.store	dst+24($pop768), $pop192
 	i32.const	$push766=, 0
-	i64.load	$push191=, src+16($pop766)
-	i64.store	dst+16($pop767), $pop191
 	i32.const	$push765=, 0
+	i64.load	$push193=, src+16($pop765)
+	i64.store	dst+16($pop766), $pop193
 	i32.const	$push764=, 0
-	i64.load	$push192=, src+8($pop764)
-	i64.store	dst+8($pop765), $pop192
 	i32.const	$push763=, 0
+	i64.load	$push194=, src+8($pop763)
+	i64.store	dst+8($pop764), $pop194
 	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	$push761=, 0
+	i64.load	$push195=, src($pop761)
+	i64.store	dst($pop762), $pop195
+	i32.const	$push760=, dst
+	i32.const	$push759=, src
+	i32.const	$push196=, 38
+	i32.call	$push197=, memcmp@FUNCTION, $pop760, $pop759, $pop196
+	br_if   	0, $pop197      # 0: down to label2
+# %bb.37:                               # %check.exit157
 	i32.const	$push782=, 0
-	i64.load	$push196=, src+31($pop782):p2align=0
-	i64.store	dst+31($pop783):p2align=0, $pop196
 	i32.const	$push781=, 0
+	i64.load	$push198=, src+31($pop781):p2align=0
+	i64.store	dst+31($pop782):p2align=0, $pop198
 	i32.const	$push780=, 0
-	i64.load	$push197=, src+24($pop780)
-	i64.store	dst+24($pop781), $pop197
 	i32.const	$push779=, 0
+	i64.load	$push199=, src+24($pop779)
+	i64.store	dst+24($pop780), $pop199
 	i32.const	$push778=, 0
-	i64.load	$push198=, src+16($pop778)
-	i64.store	dst+16($pop779), $pop198
 	i32.const	$push777=, 0
+	i64.load	$push200=, src+16($pop777)
+	i64.store	dst+16($pop778), $pop200
 	i32.const	$push776=, 0
-	i64.load	$push199=, src+8($pop776)
-	i64.store	dst+8($pop777), $pop199
 	i32.const	$push775=, 0
+	i64.load	$push201=, src+8($pop775)
+	i64.store	dst+8($pop776), $pop201
 	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	$push795=, 0
+	i32.const	$push773=, 0
+	i64.load	$push202=, src($pop773)
+	i64.store	dst($pop774), $pop202
+	i32.const	$push772=, dst
+	i32.const	$push771=, src
+	i32.const	$push203=, 39
+	i32.call	$push204=, memcmp@FUNCTION, $pop772, $pop771, $pop203
+	br_if   	0, $pop204      # 0: down to label2
+# %bb.38:                               # %check.exit161
 	i32.const	$push794=, 0
-	i64.load	$push203=, src+32($pop794)
-	i64.store	dst+32($pop795), $pop203
 	i32.const	$push793=, 0
+	i64.load	$push205=, src+32($pop793)
+	i64.store	dst+32($pop794), $pop205
 	i32.const	$push792=, 0
-	i64.load	$push204=, src+24($pop792)
-	i64.store	dst+24($pop793), $pop204
 	i32.const	$push791=, 0
+	i64.load	$push206=, src+24($pop791)
+	i64.store	dst+24($pop792), $pop206
 	i32.const	$push790=, 0
-	i64.load	$push205=, src+16($pop790)
-	i64.store	dst+16($pop791), $pop205
 	i32.const	$push789=, 0
+	i64.load	$push207=, src+16($pop789)
+	i64.store	dst+16($pop790), $pop207
 	i32.const	$push788=, 0
-	i64.load	$push206=, src+8($pop788)
-	i64.store	dst+8($pop789), $pop206
 	i32.const	$push787=, 0
+	i64.load	$push208=, src+8($pop787)
+	i64.store	dst+8($pop788), $pop208
 	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	$push809=, 0
+	i32.const	$push785=, 0
+	i64.load	$push209=, src($pop785)
+	i64.store	dst($pop786), $pop209
+	i32.const	$push784=, dst
+	i32.const	$push783=, src
+	i32.const	$push210=, 40
+	i32.call	$push211=, memcmp@FUNCTION, $pop784, $pop783, $pop210
+	br_if   	0, $pop211      # 0: down to label2
+# %bb.39:                               # %check.exit165
 	i32.const	$push808=, 0
-	i32.load8_u	$push210=, src+40($pop808)
-	i32.store8	dst+40($pop809), $pop210
 	i32.const	$push807=, 0
+	i32.load8_u	$push212=, src+40($pop807)
+	i32.store8	dst+40($pop808), $pop212
 	i32.const	$push806=, 0
-	i64.load	$push211=, src+32($pop806)
-	i64.store	dst+32($pop807), $pop211
 	i32.const	$push805=, 0
+	i64.load	$push213=, src+32($pop805)
+	i64.store	dst+32($pop806), $pop213
 	i32.const	$push804=, 0
-	i64.load	$push212=, src+24($pop804)
-	i64.store	dst+24($pop805), $pop212
 	i32.const	$push803=, 0
+	i64.load	$push214=, src+24($pop803)
+	i64.store	dst+24($pop804), $pop214
 	i32.const	$push802=, 0
-	i64.load	$push213=, src+16($pop802)
-	i64.store	dst+16($pop803), $pop213
 	i32.const	$push801=, 0
+	i64.load	$push215=, src+16($pop801)
+	i64.store	dst+16($pop802), $pop215
 	i32.const	$push800=, 0
-	i64.load	$push214=, src+8($pop800)
-	i64.store	dst+8($pop801), $pop214
 	i32.const	$push799=, 0
+	i64.load	$push216=, src+8($pop799)
+	i64.store	dst+8($pop800), $pop216
 	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	$push823=, 0
+	i32.const	$push797=, 0
+	i64.load	$push217=, src($pop797)
+	i64.store	dst($pop798), $pop217
+	i32.const	$push796=, dst
+	i32.const	$push795=, src
+	i32.const	$push218=, 41
+	i32.call	$push219=, memcmp@FUNCTION, $pop796, $pop795, $pop218
+	br_if   	0, $pop219      # 0: down to label2
+# %bb.40:                               # %check.exit169
 	i32.const	$push822=, 0
-	i32.load16_u	$push218=, src+40($pop822)
-	i32.store16	dst+40($pop823), $pop218
 	i32.const	$push821=, 0
+	i32.load16_u	$push220=, src+40($pop821)
+	i32.store16	dst+40($pop822), $pop220
 	i32.const	$push820=, 0
-	i64.load	$push219=, src+32($pop820)
-	i64.store	dst+32($pop821), $pop219
 	i32.const	$push819=, 0
+	i64.load	$push221=, src+32($pop819)
+	i64.store	dst+32($pop820), $pop221
 	i32.const	$push818=, 0
-	i64.load	$push220=, src+24($pop818)
-	i64.store	dst+24($pop819), $pop220
 	i32.const	$push817=, 0
+	i64.load	$push222=, src+24($pop817)
+	i64.store	dst+24($pop818), $pop222
 	i32.const	$push816=, 0
-	i64.load	$push221=, src+16($pop816)
-	i64.store	dst+16($pop817), $pop221
 	i32.const	$push815=, 0
+	i64.load	$push223=, src+16($pop815)
+	i64.store	dst+16($pop816), $pop223
 	i32.const	$push814=, 0
-	i64.load	$push222=, src+8($pop814)
-	i64.store	dst+8($pop815), $pop222
 	i32.const	$push813=, 0
+	i64.load	$push224=, src+8($pop813)
+	i64.store	dst+8($pop814), $pop224
 	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	$push839=, 0
+	i32.const	$push811=, 0
+	i64.load	$push225=, src($pop811)
+	i64.store	dst($pop812), $pop225
+	i32.const	$push810=, dst
+	i32.const	$push809=, src
+	i32.const	$push226=, 42
+	i32.call	$push227=, memcmp@FUNCTION, $pop810, $pop809, $pop226
+	br_if   	0, $pop227      # 0: down to label2
+# %bb.41:                               # %check.exit173
 	i32.const	$push838=, 0
-	i32.load8_u	$push226=, src+42($pop838)
-	i32.store8	dst+42($pop839), $pop226
 	i32.const	$push837=, 0
+	i32.load8_u	$push228=, src+42($pop837)
+	i32.store8	dst+42($pop838), $pop228
 	i32.const	$push836=, 0
-	i32.load16_u	$push227=, src+40($pop836)
-	i32.store16	dst+40($pop837), $pop227
 	i32.const	$push835=, 0
+	i32.load16_u	$push229=, src+40($pop835)
+	i32.store16	dst+40($pop836), $pop229
 	i32.const	$push834=, 0
-	i64.load	$push228=, src+32($pop834)
-	i64.store	dst+32($pop835), $pop228
 	i32.const	$push833=, 0
+	i64.load	$push230=, src+32($pop833)
+	i64.store	dst+32($pop834), $pop230
 	i32.const	$push832=, 0
-	i64.load	$push229=, src+24($pop832)
-	i64.store	dst+24($pop833), $pop229
 	i32.const	$push831=, 0
+	i64.load	$push231=, src+24($pop831)
+	i64.store	dst+24($pop832), $pop231
 	i32.const	$push830=, 0
-	i64.load	$push230=, src+16($pop830)
-	i64.store	dst+16($pop831), $pop230
 	i32.const	$push829=, 0
+	i64.load	$push232=, src+16($pop829)
+	i64.store	dst+16($pop830), $pop232
 	i32.const	$push828=, 0
-	i64.load	$push231=, src+8($pop828)
-	i64.store	dst+8($pop829), $pop231
 	i32.const	$push827=, 0
+	i64.load	$push233=, src+8($pop827)
+	i64.store	dst+8($pop828), $pop233
 	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	$push853=, 0
+	i32.const	$push825=, 0
+	i64.load	$push234=, src($pop825)
+	i64.store	dst($pop826), $pop234
+	i32.const	$push824=, dst
+	i32.const	$push823=, src
+	i32.const	$push235=, 43
+	i32.call	$push236=, memcmp@FUNCTION, $pop824, $pop823, $pop235
+	br_if   	0, $pop236      # 0: down to label2
+# %bb.42:                               # %check.exit177
 	i32.const	$push852=, 0
-	i32.load	$push235=, src+40($pop852)
-	i32.store	dst+40($pop853), $pop235
 	i32.const	$push851=, 0
+	i32.load	$push237=, src+40($pop851)
+	i32.store	dst+40($pop852), $pop237
 	i32.const	$push850=, 0
-	i64.load	$push236=, src+32($pop850)
-	i64.store	dst+32($pop851), $pop236
 	i32.const	$push849=, 0
+	i64.load	$push238=, src+32($pop849)
+	i64.store	dst+32($pop850), $pop238
 	i32.const	$push848=, 0
-	i64.load	$push237=, src+24($pop848)
-	i64.store	dst+24($pop849), $pop237
 	i32.const	$push847=, 0
+	i64.load	$push239=, src+24($pop847)
+	i64.store	dst+24($pop848), $pop239
 	i32.const	$push846=, 0
-	i64.load	$push238=, src+16($pop846)
-	i64.store	dst+16($pop847), $pop238
 	i32.const	$push845=, 0
+	i64.load	$push240=, src+16($pop845)
+	i64.store	dst+16($pop846), $pop240
 	i32.const	$push844=, 0
-	i64.load	$push239=, src+8($pop844)
-	i64.store	dst+8($pop845), $pop239
 	i32.const	$push843=, 0
+	i64.load	$push241=, src+8($pop843)
+	i64.store	dst+8($pop844), $pop241
 	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	$push867=, 0
+	i32.const	$push841=, 0
+	i64.load	$push242=, src($pop841)
+	i64.store	dst($pop842), $pop242
+	i32.const	$push840=, dst
+	i32.const	$push839=, src
+	i32.const	$push243=, 44
+	i32.call	$push244=, memcmp@FUNCTION, $pop840, $pop839, $pop243
+	br_if   	0, $pop244      # 0: down to label2
+# %bb.43:                               # %check.exit181
 	i32.const	$push866=, 0
-	i64.load	$push243=, src+37($pop866):p2align=0
-	i64.store	dst+37($pop867):p2align=0, $pop243
 	i32.const	$push865=, 0
+	i64.load	$push245=, src+37($pop865):p2align=0
+	i64.store	dst+37($pop866):p2align=0, $pop245
 	i32.const	$push864=, 0
-	i64.load	$push244=, src+32($pop864)
-	i64.store	dst+32($pop865), $pop244
 	i32.const	$push863=, 0
+	i64.load	$push246=, src+32($pop863)
+	i64.store	dst+32($pop864), $pop246
 	i32.const	$push862=, 0
-	i64.load	$push245=, src+24($pop862)
-	i64.store	dst+24($pop863), $pop245
 	i32.const	$push861=, 0
+	i64.load	$push247=, src+24($pop861)
+	i64.store	dst+24($pop862), $pop247
 	i32.const	$push860=, 0
-	i64.load	$push246=, src+16($pop860)
-	i64.store	dst+16($pop861), $pop246
 	i32.const	$push859=, 0
+	i64.load	$push248=, src+16($pop859)
+	i64.store	dst+16($pop860), $pop248
 	i32.const	$push858=, 0
-	i64.load	$push247=, src+8($pop858)
-	i64.store	dst+8($pop859), $pop247
 	i32.const	$push857=, 0
+	i64.load	$push249=, src+8($pop857)
+	i64.store	dst+8($pop858), $pop249
 	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	$push881=, 0
+	i32.const	$push855=, 0
+	i64.load	$push250=, src($pop855)
+	i64.store	dst($pop856), $pop250
+	i32.const	$push854=, dst
+	i32.const	$push853=, src
+	i32.const	$push251=, 45
+	i32.call	$push252=, memcmp@FUNCTION, $pop854, $pop853, $pop251
+	br_if   	0, $pop252      # 0: down to label2
+# %bb.44:                               # %check.exit185
 	i32.const	$push880=, 0
-	i64.load	$push251=, src+38($pop880):p2align=1
-	i64.store	dst+38($pop881):p2align=1, $pop251
 	i32.const	$push879=, 0
+	i64.load	$push253=, src+38($pop879):p2align=1
+	i64.store	dst+38($pop880):p2align=1, $pop253
 	i32.const	$push878=, 0
-	i64.load	$push252=, src+32($pop878)
-	i64.store	dst+32($pop879), $pop252
 	i32.const	$push877=, 0
+	i64.load	$push254=, src+32($pop877)
+	i64.store	dst+32($pop878), $pop254
 	i32.const	$push876=, 0
-	i64.load	$push253=, src+24($pop876)
-	i64.store	dst+24($pop877), $pop253
 	i32.const	$push875=, 0
+	i64.load	$push255=, src+24($pop875)
+	i64.store	dst+24($pop876), $pop255
 	i32.const	$push874=, 0
-	i64.load	$push254=, src+16($pop874)
-	i64.store	dst+16($pop875), $pop254
 	i32.const	$push873=, 0
+	i64.load	$push256=, src+16($pop873)
+	i64.store	dst+16($pop874), $pop256
 	i32.const	$push872=, 0
-	i64.load	$push255=, src+8($pop872)
-	i64.store	dst+8($pop873), $pop255
 	i32.const	$push871=, 0
+	i64.load	$push257=, src+8($pop871)
+	i64.store	dst+8($pop872), $pop257
 	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	$push895=, 0
+	i32.const	$push869=, 0
+	i64.load	$push258=, src($pop869)
+	i64.store	dst($pop870), $pop258
+	i32.const	$push868=, dst
+	i32.const	$push867=, src
+	i32.const	$push259=, 46
+	i32.call	$push260=, memcmp@FUNCTION, $pop868, $pop867, $pop259
+	br_if   	0, $pop260      # 0: down to label2
+# %bb.45:                               # %check.exit189
 	i32.const	$push894=, 0
-	i64.load	$push259=, src+39($pop894):p2align=0
-	i64.store	dst+39($pop895):p2align=0, $pop259
 	i32.const	$push893=, 0
+	i64.load	$push261=, src+39($pop893):p2align=0
+	i64.store	dst+39($pop894):p2align=0, $pop261
 	i32.const	$push892=, 0
-	i64.load	$push260=, src+32($pop892)
-	i64.store	dst+32($pop893), $pop260
 	i32.const	$push891=, 0
+	i64.load	$push262=, src+32($pop891)
+	i64.store	dst+32($pop892), $pop262
 	i32.const	$push890=, 0
-	i64.load	$push261=, src+24($pop890)
-	i64.store	dst+24($pop891), $pop261
 	i32.const	$push889=, 0
+	i64.load	$push263=, src+24($pop889)
+	i64.store	dst+24($pop890), $pop263
 	i32.const	$push888=, 0
-	i64.load	$push262=, src+16($pop888)
-	i64.store	dst+16($pop889), $pop262
 	i32.const	$push887=, 0
+	i64.load	$push264=, src+16($pop887)
+	i64.store	dst+16($pop888), $pop264
 	i32.const	$push886=, 0
-	i64.load	$push263=, src+8($pop886)
-	i64.store	dst+8($pop887), $pop263
 	i32.const	$push885=, 0
+	i64.load	$push265=, src+8($pop885)
+	i64.store	dst+8($pop886), $pop265
 	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	$push909=, 0
+	i32.const	$push883=, 0
+	i64.load	$push266=, src($pop883)
+	i64.store	dst($pop884), $pop266
+	i32.const	$push882=, dst
+	i32.const	$push881=, src
+	i32.const	$push267=, 47
+	i32.call	$push268=, memcmp@FUNCTION, $pop882, $pop881, $pop267
+	br_if   	0, $pop268      # 0: down to label2
+# %bb.46:                               # %check.exit193
 	i32.const	$push908=, 0
-	i64.load	$push267=, src+40($pop908)
-	i64.store	dst+40($pop909), $pop267
 	i32.const	$push907=, 0
+	i64.load	$push269=, src+40($pop907)
+	i64.store	dst+40($pop908), $pop269
 	i32.const	$push906=, 0
-	i64.load	$push268=, src+32($pop906)
-	i64.store	dst+32($pop907), $pop268
 	i32.const	$push905=, 0
+	i64.load	$push270=, src+32($pop905)
+	i64.store	dst+32($pop906), $pop270
 	i32.const	$push904=, 0
-	i64.load	$push269=, src+24($pop904)
-	i64.store	dst+24($pop905), $pop269
 	i32.const	$push903=, 0
+	i64.load	$push271=, src+24($pop903)
+	i64.store	dst+24($pop904), $pop271
 	i32.const	$push902=, 0
-	i64.load	$push270=, src+16($pop902)
-	i64.store	dst+16($pop903), $pop270
 	i32.const	$push901=, 0
+	i64.load	$push272=, src+16($pop901)
+	i64.store	dst+16($pop902), $pop272
 	i32.const	$push900=, 0
-	i64.load	$push271=, src+8($pop900)
-	i64.store	dst+8($pop901), $pop271
 	i32.const	$push899=, 0
+	i64.load	$push273=, src+8($pop899)
+	i64.store	dst+8($pop900), $pop273
 	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	$push925=, 0
+	i32.const	$push897=, 0
+	i64.load	$push274=, src($pop897)
+	i64.store	dst($pop898), $pop274
+	i32.const	$push896=, dst
+	i32.const	$push895=, src
+	i32.const	$push275=, 48
+	i32.call	$push276=, memcmp@FUNCTION, $pop896, $pop895, $pop275
+	br_if   	0, $pop276      # 0: down to label2
+# %bb.47:                               # %check.exit197
 	i32.const	$push924=, 0
-	i32.load8_u	$push275=, src+48($pop924)
-	i32.store8	dst+48($pop925), $pop275
 	i32.const	$push923=, 0
+	i32.load8_u	$push277=, src+48($pop923)
+	i32.store8	dst+48($pop924), $pop277
 	i32.const	$push922=, 0
-	i64.load	$push276=, src+40($pop922)
-	i64.store	dst+40($pop923), $pop276
 	i32.const	$push921=, 0
+	i64.load	$push278=, src+40($pop921)
+	i64.store	dst+40($pop922), $pop278
 	i32.const	$push920=, 0
-	i64.load	$push277=, src+32($pop920)
-	i64.store	dst+32($pop921), $pop277
 	i32.const	$push919=, 0
+	i64.load	$push279=, src+32($pop919)
+	i64.store	dst+32($pop920), $pop279
 	i32.const	$push918=, 0
-	i64.load	$push278=, src+24($pop918)
-	i64.store	dst+24($pop919), $pop278
 	i32.const	$push917=, 0
+	i64.load	$push280=, src+24($pop917)
+	i64.store	dst+24($pop918), $pop280
 	i32.const	$push916=, 0
-	i64.load	$push279=, src+16($pop916)
-	i64.store	dst+16($pop917), $pop279
 	i32.const	$push915=, 0
+	i64.load	$push281=, src+16($pop915)
+	i64.store	dst+16($pop916), $pop281
 	i32.const	$push914=, 0
-	i64.load	$push280=, src+8($pop914)
-	i64.store	dst+8($pop915), $pop280
 	i32.const	$push913=, 0
+	i64.load	$push282=, src+8($pop913)
+	i64.store	dst+8($pop914), $pop282
 	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	$push941=, 0
+	i32.const	$push911=, 0
+	i64.load	$push283=, src($pop911)
+	i64.store	dst($pop912), $pop283
+	i32.const	$push910=, dst
+	i32.const	$push909=, src
+	i32.const	$push284=, 49
+	i32.call	$push285=, memcmp@FUNCTION, $pop910, $pop909, $pop284
+	br_if   	0, $pop285      # 0: down to label2
+# %bb.48:                               # %check.exit201
 	i32.const	$push940=, 0
-	i32.load16_u	$push284=, src+48($pop940)
-	i32.store16	dst+48($pop941), $pop284
 	i32.const	$push939=, 0
+	i32.load16_u	$push286=, src+48($pop939)
+	i32.store16	dst+48($pop940), $pop286
 	i32.const	$push938=, 0
-	i64.load	$push285=, src+40($pop938)
-	i64.store	dst+40($pop939), $pop285
 	i32.const	$push937=, 0
+	i64.load	$push287=, src+40($pop937)
+	i64.store	dst+40($pop938), $pop287
 	i32.const	$push936=, 0
-	i64.load	$push286=, src+32($pop936)
-	i64.store	dst+32($pop937), $pop286
 	i32.const	$push935=, 0
+	i64.load	$push288=, src+32($pop935)
+	i64.store	dst+32($pop936), $pop288
 	i32.const	$push934=, 0
-	i64.load	$push287=, src+24($pop934)
-	i64.store	dst+24($pop935), $pop287
 	i32.const	$push933=, 0
+	i64.load	$push289=, src+24($pop933)
+	i64.store	dst+24($pop934), $pop289
 	i32.const	$push932=, 0
-	i64.load	$push288=, src+16($pop932)
-	i64.store	dst+16($pop933), $pop288
 	i32.const	$push931=, 0
+	i64.load	$push290=, src+16($pop931)
+	i64.store	dst+16($pop932), $pop290
 	i32.const	$push930=, 0
-	i64.load	$push289=, src+8($pop930)
-	i64.store	dst+8($pop931), $pop289
 	i32.const	$push929=, 0
+	i64.load	$push291=, src+8($pop929)
+	i64.store	dst+8($pop930), $pop291
 	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	$push959=, 0
+	i32.const	$push927=, 0
+	i64.load	$push292=, src($pop927)
+	i64.store	dst($pop928), $pop292
+	i32.const	$push926=, dst
+	i32.const	$push925=, src
+	i32.const	$push293=, 50
+	i32.call	$push294=, memcmp@FUNCTION, $pop926, $pop925, $pop293
+	br_if   	0, $pop294      # 0: down to label2
+# %bb.49:                               # %check.exit205
 	i32.const	$push958=, 0
-	i32.load8_u	$push293=, src+50($pop958)
-	i32.store8	dst+50($pop959), $pop293
 	i32.const	$push957=, 0
+	i32.load8_u	$push295=, src+50($pop957)
+	i32.store8	dst+50($pop958), $pop295
 	i32.const	$push956=, 0
-	i32.load16_u	$push294=, src+48($pop956)
-	i32.store16	dst+48($pop957), $pop294
 	i32.const	$push955=, 0
+	i32.load16_u	$push296=, src+48($pop955)
+	i32.store16	dst+48($pop956), $pop296
 	i32.const	$push954=, 0
-	i64.load	$push295=, src+40($pop954)
-	i64.store	dst+40($pop955), $pop295
 	i32.const	$push953=, 0
+	i64.load	$push297=, src+40($pop953)
+	i64.store	dst+40($pop954), $pop297
 	i32.const	$push952=, 0
-	i64.load	$push296=, src+32($pop952)
-	i64.store	dst+32($pop953), $pop296
 	i32.const	$push951=, 0
+	i64.load	$push298=, src+32($pop951)
+	i64.store	dst+32($pop952), $pop298
 	i32.const	$push950=, 0
-	i64.load	$push297=, src+24($pop950)
-	i64.store	dst+24($pop951), $pop297
 	i32.const	$push949=, 0
+	i64.load	$push299=, src+24($pop949)
+	i64.store	dst+24($pop950), $pop299
 	i32.const	$push948=, 0
-	i64.load	$push298=, src+16($pop948)
-	i64.store	dst+16($pop949), $pop298
 	i32.const	$push947=, 0
+	i64.load	$push300=, src+16($pop947)
+	i64.store	dst+16($pop948), $pop300
 	i32.const	$push946=, 0
-	i64.load	$push299=, src+8($pop946)
-	i64.store	dst+8($pop947), $pop299
 	i32.const	$push945=, 0
+	i64.load	$push301=, src+8($pop945)
+	i64.store	dst+8($pop946), $pop301
 	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	$push975=, 0
+	i32.const	$push943=, 0
+	i64.load	$push302=, src($pop943)
+	i64.store	dst($pop944), $pop302
+	i32.const	$push942=, dst
+	i32.const	$push941=, src
+	i32.const	$push303=, 51
+	i32.call	$push304=, memcmp@FUNCTION, $pop942, $pop941, $pop303
+	br_if   	0, $pop304      # 0: down to label2
+# %bb.50:                               # %check.exit209
 	i32.const	$push974=, 0
-	i32.load	$push303=, src+48($pop974)
-	i32.store	dst+48($pop975), $pop303
 	i32.const	$push973=, 0
+	i32.load	$push305=, src+48($pop973)
+	i32.store	dst+48($pop974), $pop305
 	i32.const	$push972=, 0
-	i64.load	$push304=, src+40($pop972)
-	i64.store	dst+40($pop973), $pop304
 	i32.const	$push971=, 0
+	i64.load	$push306=, src+40($pop971)
+	i64.store	dst+40($pop972), $pop306
 	i32.const	$push970=, 0
-	i64.load	$push305=, src+32($pop970)
-	i64.store	dst+32($pop971), $pop305
 	i32.const	$push969=, 0
+	i64.load	$push307=, src+32($pop969)
+	i64.store	dst+32($pop970), $pop307
 	i32.const	$push968=, 0
-	i64.load	$push306=, src+24($pop968)
-	i64.store	dst+24($pop969), $pop306
 	i32.const	$push967=, 0
+	i64.load	$push308=, src+24($pop967)
+	i64.store	dst+24($pop968), $pop308
 	i32.const	$push966=, 0
-	i64.load	$push307=, src+16($pop966)
-	i64.store	dst+16($pop967), $pop307
 	i32.const	$push965=, 0
+	i64.load	$push309=, src+16($pop965)
+	i64.store	dst+16($pop966), $pop309
 	i32.const	$push964=, 0
-	i64.load	$push308=, src+8($pop964)
-	i64.store	dst+8($pop965), $pop308
 	i32.const	$push963=, 0
+	i64.load	$push310=, src+8($pop963)
+	i64.store	dst+8($pop964), $pop310
 	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	$push991=, 0
+	i32.const	$push961=, 0
+	i64.load	$push311=, src($pop961)
+	i64.store	dst($pop962), $pop311
+	i32.const	$push960=, dst
+	i32.const	$push959=, src
+	i32.const	$push312=, 52
+	i32.call	$push313=, memcmp@FUNCTION, $pop960, $pop959, $pop312
+	br_if   	0, $pop313      # 0: down to label2
+# %bb.51:                               # %check.exit213
 	i32.const	$push990=, 0
-	i64.load	$push312=, src+45($pop990):p2align=0
-	i64.store	dst+45($pop991):p2align=0, $pop312
 	i32.const	$push989=, 0
+	i64.load	$push314=, src+45($pop989):p2align=0
+	i64.store	dst+45($pop990):p2align=0, $pop314
 	i32.const	$push988=, 0
-	i64.load	$push313=, src+40($pop988)
-	i64.store	dst+40($pop989), $pop313
 	i32.const	$push987=, 0
+	i64.load	$push315=, src+40($pop987)
+	i64.store	dst+40($pop988), $pop315
 	i32.const	$push986=, 0
-	i64.load	$push314=, src+32($pop986)
-	i64.store	dst+32($pop987), $pop314
 	i32.const	$push985=, 0
+	i64.load	$push316=, src+32($pop985)
+	i64.store	dst+32($pop986), $pop316
 	i32.const	$push984=, 0
-	i64.load	$push315=, src+24($pop984)
-	i64.store	dst+24($pop985), $pop315
 	i32.const	$push983=, 0
+	i64.load	$push317=, src+24($pop983)
+	i64.store	dst+24($pop984), $pop317
 	i32.const	$push982=, 0
-	i64.load	$push316=, src+16($pop982)
-	i64.store	dst+16($pop983), $pop316
 	i32.const	$push981=, 0
+	i64.load	$push318=, src+16($pop981)
+	i64.store	dst+16($pop982), $pop318
 	i32.const	$push980=, 0
-	i64.load	$push317=, src+8($pop980)
-	i64.store	dst+8($pop981), $pop317
 	i32.const	$push979=, 0
+	i64.load	$push319=, src+8($pop979)
+	i64.store	dst+8($pop980), $pop319
 	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	$push1007=, 0
+	i32.const	$push977=, 0
+	i64.load	$push320=, src($pop977)
+	i64.store	dst($pop978), $pop320
+	i32.const	$push976=, dst
+	i32.const	$push975=, src
+	i32.const	$push321=, 53
+	i32.call	$push322=, memcmp@FUNCTION, $pop976, $pop975, $pop321
+	br_if   	0, $pop322      # 0: down to label2
+# %bb.52:                               # %check.exit217
 	i32.const	$push1006=, 0
-	i64.load	$push321=, src+46($pop1006):p2align=1
-	i64.store	dst+46($pop1007):p2align=1, $pop321
 	i32.const	$push1005=, 0
+	i64.load	$push323=, src+46($pop1005):p2align=1
+	i64.store	dst+46($pop1006):p2align=1, $pop323
 	i32.const	$push1004=, 0
-	i64.load	$push322=, src+40($pop1004)
-	i64.store	dst+40($pop1005), $pop322
 	i32.const	$push1003=, 0
+	i64.load	$push324=, src+40($pop1003)
+	i64.store	dst+40($pop1004), $pop324
 	i32.const	$push1002=, 0
-	i64.load	$push323=, src+32($pop1002)
-	i64.store	dst+32($pop1003), $pop323
 	i32.const	$push1001=, 0
+	i64.load	$push325=, src+32($pop1001)
+	i64.store	dst+32($pop1002), $pop325
 	i32.const	$push1000=, 0
-	i64.load	$push324=, src+24($pop1000)
-	i64.store	dst+24($pop1001), $pop324
 	i32.const	$push999=, 0
+	i64.load	$push326=, src+24($pop999)
+	i64.store	dst+24($pop1000), $pop326
 	i32.const	$push998=, 0
-	i64.load	$push325=, src+16($pop998)
-	i64.store	dst+16($pop999), $pop325
 	i32.const	$push997=, 0
+	i64.load	$push327=, src+16($pop997)
+	i64.store	dst+16($pop998), $pop327
 	i32.const	$push996=, 0
-	i64.load	$push326=, src+8($pop996)
-	i64.store	dst+8($pop997), $pop326
 	i32.const	$push995=, 0
+	i64.load	$push328=, src+8($pop995)
+	i64.store	dst+8($pop996), $pop328
 	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	$push1023=, 0
+	i32.const	$push993=, 0
+	i64.load	$push329=, src($pop993)
+	i64.store	dst($pop994), $pop329
+	i32.const	$push992=, dst
+	i32.const	$push991=, src
+	i32.const	$push330=, 54
+	i32.call	$push331=, memcmp@FUNCTION, $pop992, $pop991, $pop330
+	br_if   	0, $pop331      # 0: down to label2
+# %bb.53:                               # %check.exit221
 	i32.const	$push1022=, 0
-	i64.load	$push330=, src+47($pop1022):p2align=0
-	i64.store	dst+47($pop1023):p2align=0, $pop330
 	i32.const	$push1021=, 0
+	i64.load	$push332=, src+47($pop1021):p2align=0
+	i64.store	dst+47($pop1022):p2align=0, $pop332
 	i32.const	$push1020=, 0
-	i64.load	$push331=, src+40($pop1020)
-	i64.store	dst+40($pop1021), $pop331
 	i32.const	$push1019=, 0
+	i64.load	$push333=, src+40($pop1019)
+	i64.store	dst+40($pop1020), $pop333
 	i32.const	$push1018=, 0
-	i64.load	$push332=, src+32($pop1018)
-	i64.store	dst+32($pop1019), $pop332
 	i32.const	$push1017=, 0
+	i64.load	$push334=, src+32($pop1017)
+	i64.store	dst+32($pop1018), $pop334
 	i32.const	$push1016=, 0
-	i64.load	$push333=, src+24($pop1016)
-	i64.store	dst+24($pop1017), $pop333
 	i32.const	$push1015=, 0
+	i64.load	$push335=, src+24($pop1015)
+	i64.store	dst+24($pop1016), $pop335
 	i32.const	$push1014=, 0
-	i64.load	$push334=, src+16($pop1014)
-	i64.store	dst+16($pop1015), $pop334
 	i32.const	$push1013=, 0
+	i64.load	$push336=, src+16($pop1013)
+	i64.store	dst+16($pop1014), $pop336
 	i32.const	$push1012=, 0
-	i64.load	$push335=, src+8($pop1012)
-	i64.store	dst+8($pop1013), $pop335
 	i32.const	$push1011=, 0
+	i64.load	$push337=, src+8($pop1011)
+	i64.store	dst+8($pop1012), $pop337
 	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	$push1039=, 0
+	i32.const	$push1009=, 0
+	i64.load	$push338=, src($pop1009)
+	i64.store	dst($pop1010), $pop338
+	i32.const	$push1008=, dst
+	i32.const	$push1007=, src
+	i32.const	$push339=, 55
+	i32.call	$push340=, memcmp@FUNCTION, $pop1008, $pop1007, $pop339
+	br_if   	0, $pop340      # 0: down to label2
+# %bb.54:                               # %check.exit225
 	i32.const	$push1038=, 0
-	i64.load	$push339=, src+48($pop1038)
-	i64.store	dst+48($pop1039), $pop339
 	i32.const	$push1037=, 0
+	i64.load	$push341=, src+48($pop1037)
+	i64.store	dst+48($pop1038), $pop341
 	i32.const	$push1036=, 0
-	i64.load	$push340=, src+40($pop1036)
-	i64.store	dst+40($pop1037), $pop340
 	i32.const	$push1035=, 0
+	i64.load	$push342=, src+40($pop1035)
+	i64.store	dst+40($pop1036), $pop342
 	i32.const	$push1034=, 0
-	i64.load	$push341=, src+32($pop1034)
-	i64.store	dst+32($pop1035), $pop341
 	i32.const	$push1033=, 0
+	i64.load	$push343=, src+32($pop1033)
+	i64.store	dst+32($pop1034), $pop343
 	i32.const	$push1032=, 0
-	i64.load	$push342=, src+24($pop1032)
-	i64.store	dst+24($pop1033), $pop342
 	i32.const	$push1031=, 0
+	i64.load	$push344=, src+24($pop1031)
+	i64.store	dst+24($pop1032), $pop344
 	i32.const	$push1030=, 0
-	i64.load	$push343=, src+16($pop1030)
-	i64.store	dst+16($pop1031), $pop343
 	i32.const	$push1029=, 0
+	i64.load	$push345=, src+16($pop1029)
+	i64.store	dst+16($pop1030), $pop345
 	i32.const	$push1028=, 0
-	i64.load	$push344=, src+8($pop1028)
-	i64.store	dst+8($pop1029), $pop344
 	i32.const	$push1027=, 0
+	i64.load	$push346=, src+8($pop1027)
+	i64.store	dst+8($pop1028), $pop346
 	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	$push1057=, 0
+	i32.const	$push1025=, 0
+	i64.load	$push347=, src($pop1025)
+	i64.store	dst($pop1026), $pop347
+	i32.const	$push1024=, dst
+	i32.const	$push1023=, src
+	i32.const	$push348=, 56
+	i32.call	$push349=, memcmp@FUNCTION, $pop1024, $pop1023, $pop348
+	br_if   	0, $pop349      # 0: down to label2
+# %bb.55:                               # %check.exit229
 	i32.const	$push1056=, 0
-	i32.load8_u	$push348=, src+56($pop1056)
-	i32.store8	dst+56($pop1057), $pop348
 	i32.const	$push1055=, 0
+	i32.load8_u	$push350=, src+56($pop1055)
+	i32.store8	dst+56($pop1056), $pop350
 	i32.const	$push1054=, 0
-	i64.load	$push349=, src+48($pop1054)
-	i64.store	dst+48($pop1055), $pop349
 	i32.const	$push1053=, 0
+	i64.load	$push351=, src+48($pop1053)
+	i64.store	dst+48($pop1054), $pop351
 	i32.const	$push1052=, 0
-	i64.load	$push350=, src+40($pop1052)
-	i64.store	dst+40($pop1053), $pop350
 	i32.const	$push1051=, 0
+	i64.load	$push352=, src+40($pop1051)
+	i64.store	dst+40($pop1052), $pop352
 	i32.const	$push1050=, 0
-	i64.load	$push351=, src+32($pop1050)
-	i64.store	dst+32($pop1051), $pop351
 	i32.const	$push1049=, 0
+	i64.load	$push353=, src+32($pop1049)
+	i64.store	dst+32($pop1050), $pop353
 	i32.const	$push1048=, 0
-	i64.load	$push352=, src+24($pop1048)
-	i64.store	dst+24($pop1049), $pop352
 	i32.const	$push1047=, 0
+	i64.load	$push354=, src+24($pop1047)
+	i64.store	dst+24($pop1048), $pop354
 	i32.const	$push1046=, 0
-	i64.load	$push353=, src+16($pop1046)
-	i64.store	dst+16($pop1047), $pop353
 	i32.const	$push1045=, 0
+	i64.load	$push355=, src+16($pop1045)
+	i64.store	dst+16($pop1046), $pop355
 	i32.const	$push1044=, 0
-	i64.load	$push354=, src+8($pop1044)
-	i64.store	dst+8($pop1045), $pop354
 	i32.const	$push1043=, 0
+	i64.load	$push356=, src+8($pop1043)
+	i64.store	dst+8($pop1044), $pop356
 	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	$push358=, 0
-	i32.const	$push1074=, 0
-	i32.load16_u	$push359=, src+56($pop1074)
-	i32.store16	dst+56($pop358), $pop359
+	i32.const	$push1041=, 0
+	i64.load	$push357=, src($pop1041)
+	i64.store	dst($pop1042), $pop357
+	i32.const	$push1040=, dst
+	i32.const	$push1039=, src
+	i32.const	$push358=, 57
+	i32.call	$push359=, memcmp@FUNCTION, $pop1040, $pop1039, $pop358
+	br_if   	0, $pop359      # 0: down to label2
+# %bb.56:                               # %check.exit233
+	i32.const	$push360=, 0
 	i32.const	$push1073=, 0
+	i32.load16_u	$push361=, src+56($pop1073)
+	i32.store16	dst+56($pop360), $pop361
 	i32.const	$push1072=, 0
-	i64.load	$push360=, src+48($pop1072)
-	i64.store	dst+48($pop1073), $pop360
 	i32.const	$push1071=, 0
+	i64.load	$push362=, src+48($pop1071)
+	i64.store	dst+48($pop1072), $pop362
 	i32.const	$push1070=, 0
-	i64.load	$push361=, src+40($pop1070)
-	i64.store	dst+40($pop1071), $pop361
 	i32.const	$push1069=, 0
+	i64.load	$push363=, src+40($pop1069)
+	i64.store	dst+40($pop1070), $pop363
 	i32.const	$push1068=, 0
-	i64.load	$push362=, src+32($pop1068)
-	i64.store	dst+32($pop1069), $pop362
 	i32.const	$push1067=, 0
+	i64.load	$push364=, src+32($pop1067)
+	i64.store	dst+32($pop1068), $pop364
 	i32.const	$push1066=, 0
-	i64.load	$push363=, src+24($pop1066)
-	i64.store	dst+24($pop1067), $pop363
 	i32.const	$push1065=, 0
+	i64.load	$push365=, src+24($pop1065)
+	i64.store	dst+24($pop1066), $pop365
 	i32.const	$push1064=, 0
-	i64.load	$push364=, src+16($pop1064)
-	i64.store	dst+16($pop1065), $pop364
 	i32.const	$push1063=, 0
+	i64.load	$push366=, src+16($pop1063)
+	i64.store	dst+16($pop1064), $pop366
 	i32.const	$push1062=, 0
-	i64.load	$push365=, src+8($pop1062)
-	i64.store	dst+8($pop1063), $pop365
 	i32.const	$push1061=, 0
+	i64.load	$push367=, src+8($pop1061)
+	i64.store	dst+8($pop1062), $pop367
 	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	$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	$push1059=, 0
+	i64.load	$push368=, src($pop1059)
+	i64.store	dst($pop1060), $pop368
+	i32.const	$push1058=, dst
+	i32.const	$push1057=, src
+	i32.const	$push369=, 58
+	i32.call	$push370=, memcmp@FUNCTION, $pop1058, $pop1057, $pop369
+	br_if   	0, $pop370      # 0: down to label2
+# %bb.57:                               # %check.exit237
+	i32.const	$push372=, dst
 	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	$push1096=, 0
-	i32.const	$push1095=, 0
-	i32.load	$push372=, src+56($pop1095)
-	i32.store	dst+56($pop1096), $pop372
-	i32.const	$push1094=, 0
+	i32.const	$push371=, 59
+	i32.call	$0=, memcpy@FUNCTION, $pop372, $pop1076, $pop371
+	i32.const	$push1075=, src
+	i32.const	$push1074=, 59
+	i32.call	$push373=, memcmp@FUNCTION, $0, $pop1075, $pop1074
+	br_if   	0, $pop373      # 0: down to label2
+# %bb.58:                               # %check.exit241
 	i32.const	$push1093=, 0
-	i64.load	$push373=, src+48($pop1093)
-	i64.store	dst+48($pop1094), $pop373
 	i32.const	$push1092=, 0
+	i32.load	$push374=, src+56($pop1092)
+	i32.store	dst+56($pop1093), $pop374
 	i32.const	$push1091=, 0
-	i64.load	$push374=, src+40($pop1091)
-	i64.store	dst+40($pop1092), $pop374
 	i32.const	$push1090=, 0
+	i64.load	$push375=, src+48($pop1090)
+	i64.store	dst+48($pop1091), $pop375
 	i32.const	$push1089=, 0
-	i64.load	$push375=, src+32($pop1089)
-	i64.store	dst+32($pop1090), $pop375
 	i32.const	$push1088=, 0
+	i64.load	$push376=, src+40($pop1088)
+	i64.store	dst+40($pop1089), $pop376
 	i32.const	$push1087=, 0
-	i64.load	$push376=, src+24($pop1087)
-	i64.store	dst+24($pop1088), $pop376
 	i32.const	$push1086=, 0
+	i64.load	$push377=, src+32($pop1086)
+	i64.store	dst+32($pop1087), $pop377
 	i32.const	$push1085=, 0
-	i64.load	$push377=, src+16($pop1085)
-	i64.store	dst+16($pop1086), $pop377
 	i32.const	$push1084=, 0
+	i64.load	$push378=, src+24($pop1084)
+	i64.store	dst+24($pop1085), $pop378
 	i32.const	$push1083=, 0
-	i64.load	$push378=, src+8($pop1083)
-	i64.store	dst+8($pop1084), $pop378
 	i32.const	$push1082=, 0
+	i64.load	$push379=, src+16($pop1082)
+	i64.store	dst+16($pop1083), $pop379
 	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	$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	$push1080=, 0
+	i64.load	$push380=, src+8($pop1080)
+	i64.store	dst+8($pop1081), $pop380
+	i32.const	$push1079=, 0
+	i32.const	$push1078=, 0
+	i64.load	$push381=, src($pop1078)
+	i64.store	dst($pop1079), $pop381
+	i32.const	$push1077=, src
+	i32.const	$push382=, 60
+	i32.call	$push383=, memcmp@FUNCTION, $0, $pop1077, $pop382
+	br_if   	0, $pop383      # 0: down to label2
+# %bb.59:                               # %check.exit245
 	i32.const	$push1111=, 0
-	i64.load	$push383=, src+48($pop1111)
-	i64.store	dst+48($pop1112), $pop383
 	i32.const	$push1110=, 0
+	i64.load	$push384=, src+53($pop1110):p2align=0
+	i64.store	dst+53($pop1111):p2align=0, $pop384
 	i32.const	$push1109=, 0
-	i64.load	$push384=, src+40($pop1109)
-	i64.store	dst+40($pop1110), $pop384
 	i32.const	$push1108=, 0
+	i64.load	$push385=, src+48($pop1108)
+	i64.store	dst+48($pop1109), $pop385
 	i32.const	$push1107=, 0
-	i64.load	$push385=, src+32($pop1107)
-	i64.store	dst+32($pop1108), $pop385
 	i32.const	$push1106=, 0
+	i64.load	$push386=, src+40($pop1106)
+	i64.store	dst+40($pop1107), $pop386
 	i32.const	$push1105=, 0
-	i64.load	$push386=, src+24($pop1105)
-	i64.store	dst+24($pop1106), $pop386
 	i32.const	$push1104=, 0
+	i64.load	$push387=, src+32($pop1104)
+	i64.store	dst+32($pop1105), $pop387
 	i32.const	$push1103=, 0
-	i64.load	$push387=, src+16($pop1103)
-	i64.store	dst+16($pop1104), $pop387
 	i32.const	$push1102=, 0
+	i64.load	$push388=, src+24($pop1102)
+	i64.store	dst+24($pop1103), $pop388
 	i32.const	$push1101=, 0
-	i64.load	$push388=, src+8($pop1101)
-	i64.store	dst+8($pop1102), $pop388
 	i32.const	$push1100=, 0
+	i64.load	$push389=, src+16($pop1100)
+	i64.store	dst+16($pop1101), $pop389
 	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	$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	$push1098=, 0
+	i64.load	$push390=, src+8($pop1098)
+	i64.store	dst+8($pop1099), $pop390
+	i32.const	$push1097=, 0
+	i32.const	$push1096=, 0
+	i64.load	$push391=, src($pop1096)
+	i64.store	dst($pop1097), $pop391
+	i32.const	$push1095=, dst
+	i32.const	$push1094=, src
+	i32.const	$push392=, 61
+	i32.call	$push393=, memcmp@FUNCTION, $pop1095, $pop1094, $pop392
+	br_if   	0, $pop393      # 0: down to label2
+# %bb.60:                               # %check.exit249
 	i32.const	$push1129=, 0
-	i64.load	$push393=, src+48($pop1129)
-	i64.store	dst+48($pop1130), $pop393
 	i32.const	$push1128=, 0
+	i64.load	$push394=, src+54($pop1128):p2align=1
+	i64.store	dst+54($pop1129):p2align=1, $pop394
 	i32.const	$push1127=, 0
-	i64.load	$push394=, src+40($pop1127)
-	i64.store	dst+40($pop1128), $pop394
 	i32.const	$push1126=, 0
+	i64.load	$push395=, src+48($pop1126)
+	i64.store	dst+48($pop1127), $pop395
 	i32.const	$push1125=, 0
-	i64.load	$push395=, src+32($pop1125)
-	i64.store	dst+32($pop1126), $pop395
 	i32.const	$push1124=, 0
+	i64.load	$push396=, src+40($pop1124)
+	i64.store	dst+40($pop1125), $pop396
 	i32.const	$push1123=, 0
-	i64.load	$push396=, src+24($pop1123)
-	i64.store	dst+24($pop1124), $pop396
 	i32.const	$push1122=, 0
+	i64.load	$push397=, src+32($pop1122)
+	i64.store	dst+32($pop1123), $pop397
 	i32.const	$push1121=, 0
-	i64.load	$push397=, src+16($pop1121)
-	i64.store	dst+16($pop1122), $pop397
 	i32.const	$push1120=, 0
+	i64.load	$push398=, src+24($pop1120)
+	i64.store	dst+24($pop1121), $pop398
 	i32.const	$push1119=, 0
-	i64.load	$push398=, src+8($pop1119)
-	i64.store	dst+8($pop1120), $pop398
 	i32.const	$push1118=, 0
+	i64.load	$push399=, src+16($pop1118)
+	i64.store	dst+16($pop1119), $pop399
 	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	$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	$push1116=, 0
+	i64.load	$push400=, src+8($pop1116)
+	i64.store	dst+8($pop1117), $pop400
+	i32.const	$push1115=, 0
+	i32.const	$push1114=, 0
+	i64.load	$push401=, src($pop1114)
+	i64.store	dst($pop1115), $pop401
+	i32.const	$push1113=, dst
+	i32.const	$push1112=, src
+	i32.const	$push402=, 62
+	i32.call	$push403=, memcmp@FUNCTION, $pop1113, $pop1112, $pop402
+	br_if   	0, $pop403      # 0: down to label2
+# %bb.61:                               # %check.exit253
 	i32.const	$push1147=, 0
-	i64.load	$push403=, src+48($pop1147)
-	i64.store	dst+48($pop1148), $pop403
 	i32.const	$push1146=, 0
+	i64.load	$push404=, src+55($pop1146):p2align=0
+	i64.store	dst+55($pop1147):p2align=0, $pop404
 	i32.const	$push1145=, 0
-	i64.load	$push404=, src+40($pop1145)
-	i64.store	dst+40($pop1146), $pop404
 	i32.const	$push1144=, 0
+	i64.load	$push405=, src+48($pop1144)
+	i64.store	dst+48($pop1145), $pop405
 	i32.const	$push1143=, 0
-	i64.load	$push405=, src+32($pop1143)
-	i64.store	dst+32($pop1144), $pop405
 	i32.const	$push1142=, 0
+	i64.load	$push406=, src+40($pop1142)
+	i64.store	dst+40($pop1143), $pop406
 	i32.const	$push1141=, 0
-	i64.load	$push406=, src+24($pop1141)
-	i64.store	dst+24($pop1142), $pop406
 	i32.const	$push1140=, 0
+	i64.load	$push407=, src+32($pop1140)
+	i64.store	dst+32($pop1141), $pop407
 	i32.const	$push1139=, 0
-	i64.load	$push407=, src+16($pop1139)
-	i64.store	dst+16($pop1140), $pop407
 	i32.const	$push1138=, 0
+	i64.load	$push408=, src+24($pop1138)
+	i64.store	dst+24($pop1139), $pop408
 	i32.const	$push1137=, 0
-	i64.load	$push408=, src+8($pop1137)
-	i64.store	dst+8($pop1138), $pop408
 	i32.const	$push1136=, 0
+	i64.load	$push409=, src+16($pop1136)
+	i64.store	dst+16($pop1137), $pop409
 	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	$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	$push1134=, 0
+	i64.load	$push410=, src+8($pop1134)
+	i64.store	dst+8($pop1135), $pop410
+	i32.const	$push1133=, 0
+	i32.const	$push1132=, 0
+	i64.load	$push411=, src($pop1132)
+	i64.store	dst($pop1133), $pop411
+	i32.const	$push1131=, dst
+	i32.const	$push1130=, src
+	i32.const	$push412=, 63
+	i32.call	$push413=, memcmp@FUNCTION, $pop1131, $pop1130, $pop412
+	br_if   	0, $pop413      # 0: down to label2
+# %bb.62:                               # %check.exit257
+	i32.const	$push414=, 0
 	i32.const	$push1164=, 0
+	i64.load	$push415=, src+56($pop1164)
+	i64.store	dst+56($pop414), $pop415
 	i32.const	$push1163=, 0
-	i64.load	$push415=, src+40($pop1163)
-	i64.store	dst+40($pop1164), $pop415
 	i32.const	$push1162=, 0
+	i64.load	$push416=, src+48($pop1162)
+	i64.store	dst+48($pop1163), $pop416
 	i32.const	$push1161=, 0
-	i64.load	$push416=, src+32($pop1161)
-	i64.store	dst+32($pop1162), $pop416
 	i32.const	$push1160=, 0
+	i64.load	$push417=, src+40($pop1160)
+	i64.store	dst+40($pop1161), $pop417
 	i32.const	$push1159=, 0
-	i64.load	$push417=, src+24($pop1159)
-	i64.store	dst+24($pop1160), $pop417
 	i32.const	$push1158=, 0
+	i64.load	$push418=, src+32($pop1158)
+	i64.store	dst+32($pop1159), $pop418
 	i32.const	$push1157=, 0
-	i64.load	$push418=, src+16($pop1157)
-	i64.store	dst+16($pop1158), $pop418
 	i32.const	$push1156=, 0
+	i64.load	$push419=, src+24($pop1156)
+	i64.store	dst+24($pop1157), $pop419
 	i32.const	$push1155=, 0
-	i64.load	$push419=, src+8($pop1155)
-	i64.store	dst+8($pop1156), $pop419
 	i32.const	$push1154=, 0
+	i64.load	$push420=, src+16($pop1154)
+	i64.store	dst+16($pop1155), $pop420
 	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	$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	$push1152=, 0
+	i64.load	$push421=, src+8($pop1152)
+	i64.store	dst+8($pop1153), $pop421
+	i32.const	$push1151=, 0
+	i32.const	$push1150=, 0
+	i64.load	$push422=, src($pop1150)
+	i64.store	dst($pop1151), $pop422
+	i32.const	$push1149=, dst
+	i32.const	$push1148=, src
+	i32.const	$push423=, 64
+	i32.call	$push424=, memcmp@FUNCTION, $pop1149, $pop1148, $pop423
+	br_if   	0, $pop424      # 0: down to label2
+# %bb.63:                               # %check.exit261
+	i32.const	$push426=, dst
+	i32.const	$push1167=, src
+	i32.const	$push425=, 65
+	i32.call	$0=, memcpy@FUNCTION, $pop426, $pop1167, $pop425
+	i32.const	$push1166=, src
+	i32.const	$push1165=, 65
+	i32.call	$push427=, memcmp@FUNCTION, $0, $pop1166, $pop1165
+	br_if   	0, $pop427      # 0: down to label2
+# %bb.64:                               # %check.exit265
+	i32.const	$push1170=, src
+	i32.const	$push428=, 66
+	i32.call	$push0=, memcpy@FUNCTION, $0, $pop1170, $pop428
 	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	$push1168=, 66
+	i32.call	$push429=, memcmp@FUNCTION, $pop0, $pop1169, $pop1168
+	br_if   	0, $pop429      # 0: down to label2
+# %bb.65:                               # %check.exit269
+	i32.const	$push431=, dst
+	i32.const	$push1173=, src
+	i32.const	$push430=, 67
+	i32.call	$0=, memcpy@FUNCTION, $pop431, $pop1173, $pop430
+	i32.const	$push1172=, src
+	i32.const	$push1171=, 67
+	i32.call	$push432=, memcmp@FUNCTION, $0, $pop1172, $pop1171
+	br_if   	0, $pop432      # 0: down to label2
+# %bb.66:                               # %check.exit273
+	i32.const	$push1176=, src
+	i32.const	$push433=, 68
+	i32.call	$push1=, memcpy@FUNCTION, $0, $pop1176, $pop433
 	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	$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	$push1183=, src
-	i32.const	$push431=, 68
-	i32.call	$push1=, memcpy@FUNCTION, $0, $pop1183, $pop431
+	i32.const	$push1174=, 68
+	i32.call	$push434=, memcmp@FUNCTION, $pop1, $pop1175, $pop1174
+	br_if   	0, $pop434      # 0: down to label2
+# %bb.67:                               # %check.exit277
+	i32.const	$push436=, dst
+	i32.const	$push1179=, src
+	i32.const	$push435=, 69
+	i32.call	$0=, memcpy@FUNCTION, $pop436, $pop1179, $pop435
+	i32.const	$push1178=, src
+	i32.const	$push1177=, 69
+	i32.call	$push437=, memcmp@FUNCTION, $0, $pop1178, $pop1177
+	br_if   	0, $pop437      # 0: down to label2
+# %bb.68:                               # %check.exit281
 	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	$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	$push438=, 70
+	i32.call	$push2=, memcpy@FUNCTION, $0, $pop1182, $pop438
+	i32.const	$push1181=, src
+	i32.const	$push1180=, 70
+	i32.call	$push439=, memcmp@FUNCTION, $pop2, $pop1181, $pop1180
+	br_if   	0, $pop439      # 0: down to label2
+# %bb.69:                               # %check.exit285
+	i32.const	$push441=, dst
 	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	$push440=, 71
+	i32.call	$0=, memcpy@FUNCTION, $pop441, $pop1185, $pop440
+	i32.const	$push1184=, src
+	i32.const	$push1183=, 71
+	i32.call	$push442=, memcmp@FUNCTION, $0, $pop1184, $pop1183
+	br_if   	0, $pop442      # 0: down to label2
+# %bb.70:                               # %check.exit289
+	i32.const	$push1188=, src
+	i32.const	$push443=, 72
+	i32.call	$push3=, memcpy@FUNCTION, $0, $pop1188, $pop443
+	i32.const	$push1187=, src
+	i32.const	$push1186=, 72
+	i32.call	$push444=, memcmp@FUNCTION, $pop3, $pop1187, $pop1186
+	br_if   	0, $pop444      # 0: down to label2
+# %bb.71:                               # %check.exit293
+	i32.const	$push446=, dst
 	i32.const	$push1191=, src
-	i32.const	$push436=, 70
-	i32.call	$push2=, memcpy@FUNCTION, $0, $pop1191, $pop436
+	i32.const	$push445=, 73
+	i32.call	$0=, memcpy@FUNCTION, $pop446, $pop1191, $pop445
 	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	$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	$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	$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	$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
+	i32.const	$push1189=, 73
+	i32.call	$push447=, memcmp@FUNCTION, $0, $pop1190, $pop1189
 	br_if   	0, $pop447      # 0: down to label2
-# BB#73:                                # %check.exit301
-	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	$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
+# %bb.72:                               # %check.exit297
+	i32.const	$push1194=, src
+	i32.const	$push448=, 74
+	i32.call	$push4=, memcpy@FUNCTION, $0, $pop1194, $pop448
+	i32.const	$push1193=, src
+	i32.const	$push1192=, 74
+	i32.call	$push449=, memcmp@FUNCTION, $pop4, $pop1193, $pop1192
+	br_if   	0, $pop449      # 0: down to label2
+# %bb.73:                               # %check.exit301
+	i32.const	$push451=, dst
+	i32.const	$push1197=, src
+	i32.const	$push450=, 75
+	i32.call	$0=, memcpy@FUNCTION, $pop451, $pop1197, $pop450
+	i32.const	$push1196=, src
+	i32.const	$push1195=, 75
+	i32.call	$push452=, memcmp@FUNCTION, $0, $pop1196, $pop1195
 	br_if   	0, $pop452      # 0: down to label2
-# BB#75:                                # %check.exit309
-	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	$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
+# %bb.74:                               # %check.exit305
+	i32.const	$push1200=, src
+	i32.const	$push453=, 76
+	i32.call	$push5=, memcpy@FUNCTION, $0, $pop1200, $pop453
+	i32.const	$push1199=, src
+	i32.const	$push1198=, 76
+	i32.call	$push454=, memcmp@FUNCTION, $pop5, $pop1199, $pop1198
+	br_if   	0, $pop454      # 0: down to label2
+# %bb.75:                               # %check.exit309
+	i32.const	$push456=, dst
+	i32.const	$push1203=, src
+	i32.const	$push455=, 77
+	i32.call	$0=, memcpy@FUNCTION, $pop456, $pop1203, $pop455
+	i32.const	$push1202=, src
+	i32.const	$push1201=, 77
+	i32.call	$push457=, memcmp@FUNCTION, $0, $pop1202, $pop1201
 	br_if   	0, $pop457      # 0: down to label2
-# BB#77:                                # %check.exit317
-	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	$push462=, 0
-	return  	$pop462
+# %bb.76:                               # %check.exit313
+	i32.const	$push1206=, src
+	i32.const	$push458=, 78
+	i32.call	$push6=, memcpy@FUNCTION, $0, $pop1206, $pop458
+	i32.const	$push1205=, src
+	i32.const	$push1204=, 78
+	i32.call	$push459=, memcmp@FUNCTION, $pop6, $pop1205, $pop1204
+	br_if   	0, $pop459      # 0: down to label2
+# %bb.77:                               # %check.exit317
+	i32.const	$push462=, dst
+	i32.const	$push461=, src
+	i32.const	$push460=, 79
+	i32.call	$push7=, memcpy@FUNCTION, $pop462, $pop461, $pop460
+	i32.const	$push1208=, src
+	i32.const	$push1207=, 79
+	i32.call	$push463=, memcmp@FUNCTION, $pop7, $pop1208, $pop1207
+	br_if   	0, $pop463      # 0: down to label2
+# %bb.78:                               # %check.exit321
+	i32.const	$push464=, 0
+	return  	$pop464
 .LBB1_79:                               # %if.then.i12
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -1731,6 +1724,6 @@ dst:
 	.size	dst, 80
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a992f7eb7..6bc9729ff 100644
--- a/test/torture-s/memset-1.c.s
+++ b/test/torture-s/memset-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
@@ -41,9 +41,9 @@ main:                                   # @main
 	i32.const	$push97=, 0
 	i32.call	$0=, memset@FUNCTION, $2, $pop97, $3
 	block   	
-	i32.eqz 	$push191=, $1
-	br_if   	0, $pop191      # 0: down to label3
-# BB#3:                                 # %for.body11.preheader
+	i32.eqz 	$push169=, $1
+	br_if   	0, $pop169      # 0: down to label3
+# %bb.3:                                # %for.body11.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	i32.const	$5=, 0
 .LBB0_4:                                # %for.body11
@@ -57,18 +57,17 @@ main:                                   # @main
 	i32.const	$push101=, 97
 	i32.ne  	$push2=, $pop1, $pop101
 	br_if   	4, $pop2        # 4: down to label0
-# BB#5:                                 # %for.inc16
+# %bb.5:                                # %for.inc16
                                         #   in Loop: Header=BB0_4 Depth=3
-	i32.const	$push105=, 1
-	i32.add 	$push104=, $5, $pop105
-	tee_local	$push103=, $5=, $pop104
-	i32.lt_u	$push3=, $pop103, $1
+	i32.const	$push103=, 1
+	i32.add 	$5=, $5, $pop103
+	i32.lt_u	$push3=, $5, $1
 	br_if   	0, $pop3        # 0: up to label4
-# BB#6:                                 # %for.body22.preheader.loopexit
+# %bb.6:                                # %for.body22.preheader.loopexit
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push106=, u
-	i32.add 	$4=, $5, $pop106
+	i32.const	$push104=, u
+	i32.add 	$4=, $5, $pop104
 .LBB0_7:                                # %for.body22.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label3:
@@ -81,88 +80,86 @@ main:                                   # @main
 	i32.add 	$push4=, $4, $5
 	i32.load8_u	$push5=, 0($pop4)
 	br_if   	3, $pop5        # 3: down to label0
-# BB#9:                                 # %for.inc28
+# %bb.9:                                # %for.inc28
                                         #   in Loop: Header=BB0_8 Depth=3
-	i32.const	$push109=, 1
-	i32.add 	$push108=, $5, $pop109
-	tee_local	$push107=, $5=, $pop108
-	i32.lt_u	$push6=, $pop107, $3
+	i32.const	$push105=, 1
+	i32.add 	$5=, $5, $pop105
+	i32.lt_u	$push6=, $5, $3
 	br_if   	0, $pop6        # 0: up to label5
-# BB#10:                                # %for.end31
+# %bb.10:                               # %for.end31
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	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
+	i32.add 	$5=, $4, $5
+	i32.load8_u	$push7=, 0($5)
+	i32.const	$push106=, 97
+	i32.ne  	$push8=, $pop7, $pop106
 	br_if   	2, $pop8        # 2: down to label0
-# BB#11:                                # %for.inc41
+# %bb.11:                               # %for.inc41
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push114=, 1
-	i32.add 	$push9=, $5, $pop114
+	i32.const	$push108=, 1
+	i32.add 	$push9=, $5, $pop108
 	i32.load8_u	$push10=, 0($pop9)
-	i32.const	$push113=, 97
-	i32.ne  	$push11=, $pop10, $pop113
+	i32.const	$push107=, 97
+	i32.ne  	$push11=, $pop10, $pop107
 	br_if   	2, $pop11       # 2: down to label0
-# BB#12:                                # %for.inc41.1
+# %bb.12:                               # %for.inc41.1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push116=, 2
-	i32.add 	$push12=, $5, $pop116
+	i32.const	$push110=, 2
+	i32.add 	$push12=, $5, $pop110
 	i32.load8_u	$push13=, 0($pop12)
-	i32.const	$push115=, 97
-	i32.ne  	$push14=, $pop13, $pop115
+	i32.const	$push109=, 97
+	i32.ne  	$push14=, $pop13, $pop109
 	br_if   	2, $pop14       # 2: down to label0
-# BB#13:                                # %for.inc41.2
+# %bb.13:                               # %for.inc41.2
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push118=, 3
-	i32.add 	$push15=, $5, $pop118
+	i32.const	$push112=, 3
+	i32.add 	$push15=, $5, $pop112
 	i32.load8_u	$push16=, 0($pop15)
-	i32.const	$push117=, 97
-	i32.ne  	$push17=, $pop16, $pop117
+	i32.const	$push111=, 97
+	i32.ne  	$push17=, $pop16, $pop111
 	br_if   	2, $pop17       # 2: down to label0
-# BB#14:                                # %for.inc41.3
+# %bb.14:                               # %for.inc41.3
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push120=, 4
-	i32.add 	$push18=, $5, $pop120
+	i32.const	$push114=, 4
+	i32.add 	$push18=, $5, $pop114
 	i32.load8_u	$push19=, 0($pop18)
-	i32.const	$push119=, 97
-	i32.ne  	$push20=, $pop19, $pop119
+	i32.const	$push113=, 97
+	i32.ne  	$push20=, $pop19, $pop113
 	br_if   	2, $pop20       # 2: down to label0
-# BB#15:                                # %for.inc41.4
+# %bb.15:                               # %for.inc41.4
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push122=, 5
-	i32.add 	$push21=, $5, $pop122
+	i32.const	$push116=, 5
+	i32.add 	$push21=, $5, $pop116
 	i32.load8_u	$push22=, 0($pop21)
-	i32.const	$push121=, 97
-	i32.ne  	$push23=, $pop22, $pop121
+	i32.const	$push115=, 97
+	i32.ne  	$push23=, $pop22, $pop115
 	br_if   	2, $pop23       # 2: down to label0
-# BB#16:                                # %for.inc41.5
+# %bb.16:                               # %for.inc41.5
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push124=, 6
-	i32.add 	$push24=, $5, $pop124
+	i32.const	$push118=, 6
+	i32.add 	$push24=, $5, $pop118
 	i32.load8_u	$push25=, 0($pop24)
-	i32.const	$push123=, 97
-	i32.ne  	$push26=, $pop25, $pop123
+	i32.const	$push117=, 97
+	i32.ne  	$push26=, $pop25, $pop117
 	br_if   	2, $pop26       # 2: down to label0
-# BB#17:                                # %for.inc41.6
+# %bb.17:                               # %for.inc41.6
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push126=, 7
-	i32.add 	$push27=, $5, $pop126
+	i32.const	$push120=, 7
+	i32.add 	$push27=, $5, $pop120
 	i32.load8_u	$push28=, 0($pop27)
-	i32.const	$push125=, 97
-	i32.ne  	$push29=, $pop28, $pop125
+	i32.const	$push119=, 97
+	i32.ne  	$push29=, $pop28, $pop119
 	br_if   	2, $pop29       # 2: down to label0
-# BB#18:                                # %for.inc41.7
+# %bb.18:                               # %for.inc41.7
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push127=, 0
-	i32.load8_u	$push30=, A($pop127)
+	i32.const	$push121=, 0
+	i32.load8_u	$push30=, A($pop121)
 	i32.call	$drop=, memset@FUNCTION, $0, $pop30, $3
 	block   	
 	block   	
-	i32.eqz 	$push192=, $1
-	br_if   	0, $pop192      # 0: down to label7
-# BB#19:                                # %for.body55.preheader
+	i32.eqz 	$push170=, $1
+	br_if   	0, $pop170      # 0: down to label7
+# %bb.19:                               # %for.body55.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	i32.const	$5=, 0
 .LBB0_20:                               # %for.body55
@@ -170,24 +167,23 @@ main:                                   # @main
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label8:
-	i32.const	$push129=, u
-	i32.add 	$push31=, $5, $pop129
+	i32.const	$push123=, u
+	i32.add 	$push31=, $5, $pop123
 	i32.load8_u	$push32=, 0($pop31)
-	i32.const	$push128=, 97
-	i32.ne  	$push33=, $pop32, $pop128
+	i32.const	$push122=, 97
+	i32.ne  	$push33=, $pop32, $pop122
 	br_if   	5, $pop33       # 5: down to label0
-# BB#21:                                # %for.inc61
+# %bb.21:                               # %for.inc61
                                         #   in Loop: Header=BB0_20 Depth=3
-	i32.const	$push132=, 1
-	i32.add 	$push131=, $5, $pop132
-	tee_local	$push130=, $5=, $pop131
-	i32.lt_u	$push34=, $pop130, $1
+	i32.const	$push124=, 1
+	i32.add 	$5=, $5, $pop124
+	i32.lt_u	$push34=, $5, $1
 	br_if   	0, $pop34       # 0: up to label8
-# BB#22:                                # %for.body68.preheader.loopexit
+# %bb.22:                               # %for.body68.preheader.loopexit
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push133=, u
-	i32.add 	$4=, $5, $pop133
+	i32.const	$push125=, u
+	i32.add 	$4=, $5, $pop125
 	br      	1               # 1: down to label6
 .LBB0_23:                               #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label7:
@@ -203,90 +199,88 @@ main:                                   # @main
 	loop    	                # label9:
 	i32.add 	$push35=, $4, $5
 	i32.load8_u	$push36=, 0($pop35)
-	i32.const	$push134=, 65
-	i32.ne  	$push37=, $pop36, $pop134
+	i32.const	$push126=, 65
+	i32.ne  	$push37=, $pop36, $pop126
 	br_if   	3, $pop37       # 3: down to label0
-# BB#26:                                # %for.inc74
+# %bb.26:                               # %for.inc74
                                         #   in Loop: Header=BB0_25 Depth=3
-	i32.const	$push137=, 1
-	i32.add 	$push136=, $5, $pop137
-	tee_local	$push135=, $5=, $pop136
-	i32.lt_u	$push38=, $pop135, $3
+	i32.const	$push127=, 1
+	i32.add 	$5=, $5, $pop127
+	i32.lt_u	$push38=, $5, $3
 	br_if   	0, $pop38       # 0: up to label9
-# BB#27:                                # %for.end77
+# %bb.27:                               # %for.end77
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	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
+	i32.add 	$5=, $4, $5
+	i32.load8_u	$push39=, 0($5)
+	i32.const	$push128=, 97
+	i32.ne  	$push40=, $pop39, $pop128
 	br_if   	2, $pop40       # 2: down to label0
-# BB#28:                                # %for.inc87
+# %bb.28:                               # %for.inc87
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push142=, 1
-	i32.add 	$push41=, $5, $pop142
+	i32.const	$push130=, 1
+	i32.add 	$push41=, $5, $pop130
 	i32.load8_u	$push42=, 0($pop41)
-	i32.const	$push141=, 97
-	i32.ne  	$push43=, $pop42, $pop141
+	i32.const	$push129=, 97
+	i32.ne  	$push43=, $pop42, $pop129
 	br_if   	2, $pop43       # 2: down to label0
-# BB#29:                                # %for.inc87.1
+# %bb.29:                               # %for.inc87.1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push144=, 2
-	i32.add 	$push44=, $5, $pop144
+	i32.const	$push132=, 2
+	i32.add 	$push44=, $5, $pop132
 	i32.load8_u	$push45=, 0($pop44)
-	i32.const	$push143=, 97
-	i32.ne  	$push46=, $pop45, $pop143
+	i32.const	$push131=, 97
+	i32.ne  	$push46=, $pop45, $pop131
 	br_if   	2, $pop46       # 2: down to label0
-# BB#30:                                # %for.inc87.2
+# %bb.30:                               # %for.inc87.2
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push146=, 3
-	i32.add 	$push47=, $5, $pop146
+	i32.const	$push134=, 3
+	i32.add 	$push47=, $5, $pop134
 	i32.load8_u	$push48=, 0($pop47)
-	i32.const	$push145=, 97
-	i32.ne  	$push49=, $pop48, $pop145
+	i32.const	$push133=, 97
+	i32.ne  	$push49=, $pop48, $pop133
 	br_if   	2, $pop49       # 2: down to label0
-# BB#31:                                # %for.inc87.3
+# %bb.31:                               # %for.inc87.3
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push148=, 4
-	i32.add 	$push50=, $5, $pop148
+	i32.const	$push136=, 4
+	i32.add 	$push50=, $5, $pop136
 	i32.load8_u	$push51=, 0($pop50)
-	i32.const	$push147=, 97
-	i32.ne  	$push52=, $pop51, $pop147
+	i32.const	$push135=, 97
+	i32.ne  	$push52=, $pop51, $pop135
 	br_if   	2, $pop52       # 2: down to label0
-# BB#32:                                # %for.inc87.4
+# %bb.32:                               # %for.inc87.4
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push150=, 5
-	i32.add 	$push53=, $5, $pop150
+	i32.const	$push138=, 5
+	i32.add 	$push53=, $5, $pop138
 	i32.load8_u	$push54=, 0($pop53)
-	i32.const	$push149=, 97
-	i32.ne  	$push55=, $pop54, $pop149
+	i32.const	$push137=, 97
+	i32.ne  	$push55=, $pop54, $pop137
 	br_if   	2, $pop55       # 2: down to label0
-# BB#33:                                # %for.inc87.5
+# %bb.33:                               # %for.inc87.5
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push152=, 6
-	i32.add 	$push56=, $5, $pop152
+	i32.const	$push140=, 6
+	i32.add 	$push56=, $5, $pop140
 	i32.load8_u	$push57=, 0($pop56)
-	i32.const	$push151=, 97
-	i32.ne  	$push58=, $pop57, $pop151
+	i32.const	$push139=, 97
+	i32.ne  	$push58=, $pop57, $pop139
 	br_if   	2, $pop58       # 2: down to label0
-# BB#34:                                # %for.inc87.6
+# %bb.34:                               # %for.inc87.6
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push154=, 7
-	i32.add 	$push59=, $5, $pop154
+	i32.const	$push142=, 7
+	i32.add 	$push59=, $5, $pop142
 	i32.load8_u	$push60=, 0($pop59)
-	i32.const	$push153=, 97
-	i32.ne  	$push61=, $pop60, $pop153
+	i32.const	$push141=, 97
+	i32.ne  	$push61=, $pop60, $pop141
 	br_if   	2, $pop61       # 2: down to label0
-# BB#35:                                # %for.inc87.7
+# %bb.35:                               # %for.inc87.7
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push155=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop155, $3
+	i32.const	$push143=, 66
+	i32.call	$drop=, memset@FUNCTION, $0, $pop143, $3
 	block   	
 	block   	
-	i32.eqz 	$push193=, $1
-	br_if   	0, $pop193      # 0: down to label11
-# BB#36:                                # %for.body100.preheader
+	i32.eqz 	$push171=, $1
+	br_if   	0, $pop171      # 0: down to label11
+# %bb.36:                               # %for.body100.preheader
                                         #   in Loop: Header=BB0_2 Depth=2
 	i32.const	$5=, 0
 .LBB0_37:                               # %for.body100
@@ -294,24 +288,23 @@ main:                                   # @main
                                         #     Parent Loop BB0_2 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	loop    	                # label12:
-	i32.const	$push157=, u
-	i32.add 	$push62=, $5, $pop157
+	i32.const	$push145=, u
+	i32.add 	$push62=, $5, $pop145
 	i32.load8_u	$push63=, 0($pop62)
-	i32.const	$push156=, 97
-	i32.ne  	$push64=, $pop63, $pop156
+	i32.const	$push144=, 97
+	i32.ne  	$push64=, $pop63, $pop144
 	br_if   	5, $pop64       # 5: down to label0
-# BB#38:                                # %for.inc106
+# %bb.38:                               # %for.inc106
                                         #   in Loop: Header=BB0_37 Depth=3
-	i32.const	$push160=, 1
-	i32.add 	$push159=, $5, $pop160
-	tee_local	$push158=, $5=, $pop159
-	i32.lt_u	$push65=, $pop158, $1
+	i32.const	$push146=, 1
+	i32.add 	$5=, $5, $pop146
+	i32.lt_u	$push65=, $5, $1
 	br_if   	0, $pop65       # 0: up to label12
-# BB#39:                                # %for.body113.preheader.loopexit
+# %bb.39:                               # %for.body113.preheader.loopexit
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push161=, u
-	i32.add 	$4=, $5, $pop161
+	i32.const	$push147=, u
+	i32.add 	$4=, $5, $pop147
 	br      	1               # 1: down to label10
 .LBB0_40:                               #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label11:
@@ -327,99 +320,95 @@ main:                                   # @main
 	loop    	                # label13:
 	i32.add 	$push66=, $4, $5
 	i32.load8_u	$push67=, 0($pop66)
-	i32.const	$push162=, 66
-	i32.ne  	$push68=, $pop67, $pop162
+	i32.const	$push148=, 66
+	i32.ne  	$push68=, $pop67, $pop148
 	br_if   	3, $pop68       # 3: down to label0
-# BB#43:                                # %for.inc119
+# %bb.43:                               # %for.inc119
                                         #   in Loop: Header=BB0_42 Depth=3
-	i32.const	$push165=, 1
-	i32.add 	$push164=, $5, $pop165
-	tee_local	$push163=, $5=, $pop164
-	i32.lt_u	$push69=, $pop163, $3
+	i32.const	$push149=, 1
+	i32.add 	$5=, $5, $pop149
+	i32.lt_u	$push69=, $5, $3
 	br_if   	0, $pop69       # 0: up to label13
-# BB#44:                                # %for.end122
+# %bb.44:                               # %for.end122
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	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
+	i32.add 	$5=, $4, $5
+	i32.load8_u	$push70=, 0($5)
+	i32.const	$push150=, 97
+	i32.ne  	$push71=, $pop70, $pop150
 	br_if   	2, $pop71       # 2: down to label0
-# BB#45:                                # %for.inc132
+# %bb.45:                               # %for.inc132
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push170=, 1
-	i32.add 	$push72=, $5, $pop170
+	i32.const	$push152=, 1
+	i32.add 	$push72=, $5, $pop152
 	i32.load8_u	$push73=, 0($pop72)
-	i32.const	$push169=, 97
-	i32.ne  	$push74=, $pop73, $pop169
+	i32.const	$push151=, 97
+	i32.ne  	$push74=, $pop73, $pop151
 	br_if   	2, $pop74       # 2: down to label0
-# BB#46:                                # %for.inc132.1
+# %bb.46:                               # %for.inc132.1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push172=, 2
-	i32.add 	$push75=, $5, $pop172
+	i32.const	$push154=, 2
+	i32.add 	$push75=, $5, $pop154
 	i32.load8_u	$push76=, 0($pop75)
-	i32.const	$push171=, 97
-	i32.ne  	$push77=, $pop76, $pop171
+	i32.const	$push153=, 97
+	i32.ne  	$push77=, $pop76, $pop153
 	br_if   	2, $pop77       # 2: down to label0
-# BB#47:                                # %for.inc132.2
+# %bb.47:                               # %for.inc132.2
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push174=, 3
-	i32.add 	$push78=, $5, $pop174
+	i32.const	$push156=, 3
+	i32.add 	$push78=, $5, $pop156
 	i32.load8_u	$push79=, 0($pop78)
-	i32.const	$push173=, 97
-	i32.ne  	$push80=, $pop79, $pop173
+	i32.const	$push155=, 97
+	i32.ne  	$push80=, $pop79, $pop155
 	br_if   	2, $pop80       # 2: down to label0
-# BB#48:                                # %for.inc132.3
+# %bb.48:                               # %for.inc132.3
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push176=, 4
-	i32.add 	$push81=, $5, $pop176
+	i32.const	$push158=, 4
+	i32.add 	$push81=, $5, $pop158
 	i32.load8_u	$push82=, 0($pop81)
-	i32.const	$push175=, 97
-	i32.ne  	$push83=, $pop82, $pop175
+	i32.const	$push157=, 97
+	i32.ne  	$push83=, $pop82, $pop157
 	br_if   	2, $pop83       # 2: down to label0
-# BB#49:                                # %for.inc132.4
+# %bb.49:                               # %for.inc132.4
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push178=, 5
-	i32.add 	$push84=, $5, $pop178
+	i32.const	$push160=, 5
+	i32.add 	$push84=, $5, $pop160
 	i32.load8_u	$push85=, 0($pop84)
-	i32.const	$push177=, 97
-	i32.ne  	$push86=, $pop85, $pop177
+	i32.const	$push159=, 97
+	i32.ne  	$push86=, $pop85, $pop159
 	br_if   	2, $pop86       # 2: down to label0
-# BB#50:                                # %for.inc132.5
+# %bb.50:                               # %for.inc132.5
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push180=, 6
-	i32.add 	$push87=, $5, $pop180
+	i32.const	$push162=, 6
+	i32.add 	$push87=, $5, $pop162
 	i32.load8_u	$push88=, 0($pop87)
-	i32.const	$push179=, 97
-	i32.ne  	$push89=, $pop88, $pop179
+	i32.const	$push161=, 97
+	i32.ne  	$push89=, $pop88, $pop161
 	br_if   	2, $pop89       # 2: down to label0
-# BB#51:                                # %for.inc132.6
+# %bb.51:                               # %for.inc132.6
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push182=, 7
-	i32.add 	$push90=, $5, $pop182
+	i32.const	$push164=, 7
+	i32.add 	$push90=, $5, $pop164
 	i32.load8_u	$push91=, 0($pop90)
-	i32.const	$push181=, 97
-	i32.ne  	$push92=, $pop91, $pop181
+	i32.const	$push163=, 97
+	i32.ne  	$push92=, $pop91, $pop163
 	br_if   	2, $pop92       # 2: down to label0
-# BB#52:                                # %for.inc132.7
+# %bb.52:                               # %for.inc132.7
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push186=, 1
-	i32.add 	$push185=, $3, $pop186
-	tee_local	$push184=, $3=, $pop185
-	i32.const	$push183=, 80
-	i32.lt_u	$push93=, $pop184, $pop183
+	i32.const	$push166=, 1
+	i32.add 	$3=, $3, $pop166
+	i32.const	$push165=, 80
+	i32.lt_u	$push93=, $3, $pop165
 	br_if   	0, $pop93       # 0: up to label2
-# BB#53:                                # %for.inc139
+# %bb.53:                               # %for.inc139
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push190=, 1
-	i32.add 	$push189=, $1, $pop190
-	tee_local	$push188=, $1=, $pop189
-	i32.const	$push187=, 8
-	i32.lt_u	$push94=, $pop188, $pop187
+	i32.const	$push168=, 1
+	i32.add 	$1=, $1, $pop168
+	i32.const	$push167=, 8
+	i32.lt_u	$push94=, $1, $pop167
 	br_if   	0, $pop94       # 0: up to label1
-# BB#54:                                # %for.end141
+# %bb.54:                               # %for.end141
 	end_loop
 	i32.const	$push95=, 0
 	call    	exit@FUNCTION, $pop95
@@ -448,6 +437,6 @@ u:
 	.size	u, 96
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0814883c2..3376d2583 100644
--- a/test/torture-s/memset-2.c.s
+++ b/test/torture-s/memset-2.c.s
@@ -5,7 +5,7 @@
 	.globl	reset
 	.type	reset,@function
 reset:                                  # @reset
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 7016996765293437281
 	i64.store	u+23($pop1):p2align=0, $pop0
@@ -30,7 +30,7 @@ reset:                                  # @reset
 check:                                  # @check
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -38,7 +38,7 @@ check:                                  # @check
 	i32.const	$push28=, 1
 	i32.lt_s	$push0=, $0, $pop28
 	br_if   	0, $pop0        # 0: down to label3
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 0
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -49,26 +49,25 @@ check:                                  # @check
 	i32.const	$push29=, 97
 	i32.ne  	$push3=, $pop2, $pop29
 	br_if   	4, $pop3        # 4: down to label0
-# BB#3:                                 # %for.inc
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $3, $pop33
-	tee_local	$push31=, $3=, $pop32
-	i32.lt_s	$push4=, $pop31, $0
+	i32.const	$push31=, 1
+	i32.add 	$3=, $3, $pop31
+	i32.lt_s	$push4=, $3, $0
 	br_if   	0, $pop4        # 0: up to label4
-# BB#4:                                 # %for.end.loopexit
+# %bb.4:                                # %for.end.loopexit
 	end_loop
 	i32.const	$push5=, u
 	i32.add 	$0=, $3, $pop5
-	i32.const	$push34=, 1
-	i32.ge_s	$push7=, $1, $pop34
+	i32.const	$push32=, 1
+	i32.ge_s	$push7=, $1, $pop32
 	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	$push6=, $1, $pop35
+	i32.const	$push33=, 1
+	i32.lt_s	$push6=, $1, $pop33
 	br_if   	1, $pop6        # 1: down to label1
 .LBB1_6:                                # %for.body6.preheader
 	end_block                       # label2:
@@ -80,58 +79,57 @@ check:                                  # @check
 	i32.load8_s	$push9=, 0($pop8)
 	i32.ne  	$push10=, $pop9, $2
 	br_if   	2, $pop10       # 2: down to label0
-# BB#8:                                 # %for.inc12
+# %bb.8:                                # %for.inc12
                                         #   in Loop: Header=BB1_7 Depth=1
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $3, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.lt_s	$push11=, $pop36, $1
+	i32.const	$push34=, 1
+	i32.add 	$3=, $3, $pop34
+	i32.lt_s	$push11=, $3, $1
 	br_if   	0, $pop11       # 0: up to label5
-# BB#9:                                 # %for.end15.loopexit
+# %bb.9:                                # %for.end15.loopexit
 	end_loop
 	i32.add 	$0=, $0, $3
 .LBB1_10:                               # %for.end15
 	end_block                       # label1:
 	i32.load8_u	$push12=, 0($0)
-	i32.const	$push39=, 97
-	i32.ne  	$push13=, $pop12, $pop39
+	i32.const	$push35=, 97
+	i32.ne  	$push13=, $pop12, $pop35
 	br_if   	0, $pop13       # 0: down to label0
-# BB#11:                                # %for.inc25
+# %bb.11:                               # %for.inc25
 	i32.load8_u	$push14=, 1($0)
-	i32.const	$push40=, 97
-	i32.ne  	$push15=, $pop14, $pop40
+	i32.const	$push36=, 97
+	i32.ne  	$push15=, $pop14, $pop36
 	br_if   	0, $pop15       # 0: down to label0
-# BB#12:                                # %for.inc25.1
+# %bb.12:                               # %for.inc25.1
 	i32.load8_u	$push16=, 2($0)
-	i32.const	$push41=, 97
-	i32.ne  	$push17=, $pop16, $pop41
+	i32.const	$push37=, 97
+	i32.ne  	$push17=, $pop16, $pop37
 	br_if   	0, $pop17       # 0: down to label0
-# BB#13:                                # %for.inc25.2
+# %bb.13:                               # %for.inc25.2
 	i32.load8_u	$push18=, 3($0)
-	i32.const	$push42=, 97
-	i32.ne  	$push19=, $pop18, $pop42
+	i32.const	$push38=, 97
+	i32.ne  	$push19=, $pop18, $pop38
 	br_if   	0, $pop19       # 0: down to label0
-# BB#14:                                # %for.inc25.3
+# %bb.14:                               # %for.inc25.3
 	i32.load8_u	$push20=, 4($0)
-	i32.const	$push43=, 97
-	i32.ne  	$push21=, $pop20, $pop43
+	i32.const	$push39=, 97
+	i32.ne  	$push21=, $pop20, $pop39
 	br_if   	0, $pop21       # 0: down to label0
-# BB#15:                                # %for.inc25.4
+# %bb.15:                               # %for.inc25.4
 	i32.load8_u	$push22=, 5($0)
-	i32.const	$push44=, 97
-	i32.ne  	$push23=, $pop22, $pop44
+	i32.const	$push40=, 97
+	i32.ne  	$push23=, $pop22, $pop40
 	br_if   	0, $pop23       # 0: down to label0
-# BB#16:                                # %for.inc25.5
+# %bb.16:                               # %for.inc25.5
 	i32.load8_u	$push24=, 6($0)
-	i32.const	$push45=, 97
-	i32.ne  	$push25=, $pop24, $pop45
+	i32.const	$push41=, 97
+	i32.ne  	$push25=, $pop24, $pop41
 	br_if   	0, $pop25       # 0: down to label0
-# BB#17:                                # %for.inc25.6
+# %bb.17:                               # %for.inc25.6
 	i32.load8_u	$push26=, 7($0)
-	i32.const	$push46=, 97
-	i32.ne  	$push27=, $pop26, $pop46
+	i32.const	$push42=, 97
+	i32.ne  	$push27=, $pop26, $pop42
 	br_if   	0, $pop27       # 0: down to label0
-# BB#18:                                # %for.inc25.7
+# %bb.18:                               # %for.inc25.7
 	return
 .LBB1_19:                               # %if.then
 	end_block                       # label0:
@@ -148,308 +146,392 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i64, i32
-# BB#0:                                 # %entry
+# %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
+	i64.store	u+23($pop63):p2align=0, $pop62
 	i32.const	$push61=, 0
 	i64.const	$push60=, 7016996765293437281
-	i64.store	u($pop61), $pop60
-	i32.const	$push59=, u
-	i32.add 	$push58=, $5, $pop59
-	tee_local	$push57=, $2=, $pop58
-	i32.const	$push56=, 0
-	i32.store8	0($pop57), $pop56
-	i32.const	$push55=, 1
+	i64.store	u+16($pop61), $pop60
+	i32.const	$push59=, 0
+	i64.const	$push58=, 7016996765293437281
+	i64.store	u+8($pop59), $pop58
+	i32.const	$push57=, 0
+	i64.const	$push56=, 7016996765293437281
+	i64.store	u($pop57), $pop56
+	i32.const	$push55=, u
+	i32.add 	$2=, $5, $pop55
 	i32.const	$push54=, 0
-	call    	check@FUNCTION, $5, $pop55, $pop54
-	i32.const	$push53=, 0
-	i32.load8_u	$push0=, A($pop53)
+	i32.store8	0($2), $pop54
+	i32.const	$push53=, 1
+	i32.const	$push52=, 0
+	call    	check@FUNCTION, $5, $pop53, $pop52
+	i32.const	$push51=, 0
+	i32.load8_u	$push0=, A($pop51)
 	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	$push50=, 1
+	i32.const	$push49=, 65
+	call    	check@FUNCTION, $5, $pop50, $pop49
 	i32.const	$push48=, 66
-	call    	check@FUNCTION, $5, $pop49, $pop48
+	i32.store8	0($2), $pop48
 	i32.const	$push47=, 1
-	i32.add 	$push46=, $5, $pop47
-	tee_local	$push45=, $5=, $pop46
+	i32.const	$push46=, 66
+	call    	check@FUNCTION, $5, $pop47, $pop46
+	i32.const	$push45=, 1
+	i32.add 	$5=, $5, $pop45
 	i32.const	$push44=, 8
-	i32.ne  	$push1=, $pop45, $pop44
+	i32.ne  	$push1=, $5, $pop44
 	br_if   	0, $pop1        # 0: up to label6
-# BB#2:                                 # %for.body18.preheader
+# %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	$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	$push84=, 0
+	i64.const	$push83=, 7016996765293437281
+	i64.store	u+23($pop84):p2align=0, $pop83
+	i32.const	$push82=, 0
+	i64.const	$push81=, 7016996765293437281
+	i64.store	u+16($pop82), $pop81
+	i32.const	$push80=, 0
+	i64.const	$push79=, 7016996765293437281
+	i64.store	u+8($pop80), $pop79
 	i32.const	$push78=, 0
-	i32.load8_u	$push2=, A($pop78)
-	i32.const	$push77=, 257
-	i32.mul 	$push3=, $pop2, $pop77
+	i64.const	$push77=, 7016996765293437281
+	i64.store	u($pop78), $pop77
+	i32.const	$push76=, u
+	i32.add 	$2=, $5, $pop76
+	i32.const	$push75=, 0
+	i32.store16	0($2):p2align=0, $pop75
+	i32.const	$push74=, 2
+	i32.const	$push73=, 0
+	call    	check@FUNCTION, $5, $pop74, $pop73
+	i32.const	$push72=, 0
+	i32.load8_u	$push2=, A($pop72)
+	i32.const	$push71=, 257
+	i32.mul 	$push3=, $pop2, $pop71
 	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
+	i32.const	$push70=, 2
+	i32.const	$push69=, 65
+	call    	check@FUNCTION, $5, $pop70, $pop69
+	i32.const	$push68=, 16962
+	i32.store16	0($2):p2align=0, $pop68
+	i32.const	$push67=, 2
+	i32.const	$push66=, 66
+	call    	check@FUNCTION, $5, $pop67, $pop66
+	i32.const	$push65=, 1
+	i32.add 	$5=, $5, $pop65
+	i32.const	$push64=, 8
+	i32.ne  	$push4=, $5, $pop64
 	br_if   	0, $pop4        # 0: up to label7
-# BB#4:                                 # %for.body44.preheader
+# %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	$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	$push108=, 0
+	i64.const	$push107=, 7016996765293437281
+	i64.store	u+23($pop108):p2align=0, $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
+	i64.const	$push105=, 7016996765293437281
+	i64.store	u+16($pop106), $pop105
+	i32.const	$push104=, 0
+	i64.const	$push103=, 7016996765293437281
+	i64.store	u+8($pop104), $pop103
+	i32.const	$push102=, 0
+	i64.const	$push101=, 7016996765293437281
+	i64.store	u($pop102), $pop101
+	i32.const	$push100=, u+2
+	i32.add 	$2=, $5, $pop100
+	i32.const	$push99=, 0
+	i32.store8	0($2), $pop99
+	i32.const	$push98=, u
+	i32.add 	$3=, $5, $pop98
+	i32.const	$push97=, 0
+	i32.store16	0($3):p2align=0, $pop97
+	i32.const	$push96=, 3
+	i32.const	$push95=, 0
+	call    	check@FUNCTION, $5, $pop96, $pop95
+	i32.const	$push94=, 0
+	i32.load8_u	$0=, A($pop94)
+	i32.store8	0($2), $0
+	i32.const	$push93=, 257
+	i32.mul 	$push5=, $0, $pop93
 	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
+	i32.const	$push92=, 3
+	i32.const	$push91=, 65
+	call    	check@FUNCTION, $5, $pop92, $pop91
+	i32.const	$push90=, 66
+	i32.store8	0($2), $pop90
+	i32.const	$push89=, 16962
+	i32.store16	0($3):p2align=0, $pop89
+	i32.const	$push88=, 3
+	i32.const	$push87=, 66
+	call    	check@FUNCTION, $5, $pop88, $pop87
+	i32.const	$push86=, 1
+	i32.add 	$5=, $5, $pop86
+	i32.const	$push85=, 8
+	i32.ne  	$push6=, $5, $pop85
 	br_if   	0, $pop6        # 0: up to label8
-# BB#6:                                 # %for.body70.preheader
+# %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	$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
-	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
-	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 	$push8=, $pop7, $pop134
+	i32.const	$push129=, 0
+	i64.const	$push128=, 7016996765293437281
+	i64.store	u+23($pop129):p2align=0, $pop128
+	i32.const	$push127=, 0
+	i64.const	$push126=, 7016996765293437281
+	i64.store	u+16($pop127), $pop126
+	i32.const	$push125=, 0
+	i64.const	$push124=, 7016996765293437281
+	i64.store	u+8($pop125), $pop124
+	i32.const	$push123=, 0
+	i64.const	$push122=, 7016996765293437281
+	i64.store	u($pop123), $pop122
+	i32.const	$push121=, u
+	i32.add 	$2=, $5, $pop121
+	i32.const	$push120=, 0
+	i32.store	0($2):p2align=0, $pop120
+	i32.const	$push119=, 4
+	i32.const	$push118=, 0
+	call    	check@FUNCTION, $5, $pop119, $pop118
+	i32.const	$push117=, 0
+	i32.load8_u	$push7=, A($pop117)
+	i32.const	$push116=, 16843009
+	i32.mul 	$push8=, $pop7, $pop116
 	i32.store	0($2):p2align=0, $pop8
-	i32.const	$push133=, 4
-	i32.const	$push132=, 65
-	call    	check@FUNCTION, $5, $pop133, $pop132
-	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
+	i32.const	$push115=, 4
+	i32.const	$push114=, 65
+	call    	check@FUNCTION, $5, $pop115, $pop114
+	i32.const	$push113=, 1111638594
+	i32.store	0($2):p2align=0, $pop113
+	i32.const	$push112=, 4
+	i32.const	$push111=, 66
+	call    	check@FUNCTION, $5, $pop112, $pop111
+	i32.const	$push110=, 1
+	i32.add 	$5=, $5, $pop110
+	i32.const	$push109=, 8
+	i32.ne  	$push9=, $5, $pop109
 	br_if   	0, $pop9        # 0: up to label9
-# BB#8:                                 # %for.body96.preheader
+# %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	$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=, $2=, $pop172
-	i32.const	$push170=, 0
-	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
-	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 	$push10=, $0, $pop160
+	i32.const	$push153=, 0
+	i64.const	$push152=, 7016996765293437281
+	i64.store	u+23($pop153):p2align=0, $pop152
+	i32.const	$push151=, 0
+	i64.const	$push150=, 7016996765293437281
+	i64.store	u+16($pop151), $pop150
+	i32.const	$push149=, 0
+	i64.const	$push148=, 7016996765293437281
+	i64.store	u+8($pop149), $pop148
+	i32.const	$push147=, 0
+	i64.const	$push146=, 7016996765293437281
+	i64.store	u($pop147), $pop146
+	i32.const	$push145=, u+4
+	i32.add 	$2=, $5, $pop145
+	i32.const	$push144=, 0
+	i32.store8	0($2), $pop144
+	i32.const	$push143=, u
+	i32.add 	$3=, $5, $pop143
+	i32.const	$push142=, 0
+	i32.store	0($3):p2align=0, $pop142
+	i32.const	$push141=, 5
+	i32.const	$push140=, 0
+	call    	check@FUNCTION, $5, $pop141, $pop140
+	i32.const	$push139=, 0
+	i32.load8_u	$0=, A($pop139)
+	i32.store8	0($2), $0
+	i32.const	$push138=, 16843009
+	i32.mul 	$push10=, $0, $pop138
 	i32.store	0($3):p2align=0, $pop10
-	i32.const	$push159=, 5
-	i32.const	$push158=, 65
-	call    	check@FUNCTION, $5, $pop159, $pop158
-	i32.const	$push157=, 66
-	i32.store8	0($2), $pop157
-	i32.const	$push156=, 1111638594
-	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  	$push11=, $pop151, $pop150
+	i32.const	$push137=, 5
+	i32.const	$push136=, 65
+	call    	check@FUNCTION, $5, $pop137, $pop136
+	i32.const	$push135=, 66
+	i32.store8	0($2), $pop135
+	i32.const	$push134=, 1111638594
+	i32.store	0($3):p2align=0, $pop134
+	i32.const	$push133=, 5
+	i32.const	$push132=, 66
+	call    	check@FUNCTION, $5, $pop133, $pop132
+	i32.const	$push131=, 1
+	i32.add 	$5=, $5, $pop131
+	i32.const	$push130=, 8
+	i32.ne  	$push11=, $5, $pop130
 	br_if   	0, $pop11       # 0: up to label10
-# BB#10:                                # %for.body122.preheader
+# %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.const	$push178=, 0
+	i64.const	$push177=, 7016996765293437281
+	i64.store	u+23($pop178):p2align=0, $pop177
+	i32.const	$push176=, 0
+	i64.const	$push175=, 7016996765293437281
+	i64.store	u+16($pop176), $pop175
+	i32.const	$push174=, 0
+	i64.const	$push173=, 7016996765293437281
+	i64.store	u+8($pop174), $pop173
+	i32.const	$push172=, 0
+	i64.const	$push171=, 7016996765293437281
+	i64.store	u($pop172), $pop171
+	i32.const	$push170=, u+4
+	i32.add 	$2=, $5, $pop170
+	i32.const	$push169=, 0
+	i32.store16	0($2):p2align=0, $pop169
+	i32.const	$push168=, u
+	i32.add 	$3=, $5, $pop168
+	i32.const	$push167=, 0
+	i32.store	0($3):p2align=0, $pop167
+	i32.const	$push166=, 6
+	i32.const	$push165=, 0
+	call    	check@FUNCTION, $5, $pop166, $pop165
+	i32.const	$push164=, 0
+	i32.load8_u	$0=, A($pop164)
+	i32.const	$push163=, 257
+	i32.mul 	$push12=, $0, $pop163
 	i32.store16	0($2):p2align=0, $pop12
-	i32.const	$push192=, 16843009
-	i32.mul 	$push13=, $0, $pop192
+	i32.const	$push162=, 16843009
+	i32.mul 	$push13=, $0, $pop162
 	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
+	i32.const	$push161=, 6
+	i32.const	$push160=, 65
+	call    	check@FUNCTION, $5, $pop161, $pop160
+	i32.const	$push159=, 16962
+	i32.store16	0($2):p2align=0, $pop159
+	i32.const	$push158=, 1111638594
+	i32.store	0($3):p2align=0, $pop158
+	i32.const	$push157=, 6
+	i32.const	$push156=, 66
+	call    	check@FUNCTION, $5, $pop157, $pop156
+	i32.const	$push155=, 1
+	i32.add 	$5=, $5, $pop155
+	i32.const	$push154=, 8
+	i32.ne  	$push14=, $5, $pop154
 	br_if   	0, $pop14       # 0: up to label11
-# BB#12:                                # %for.body148.preheader
+# %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	$push206=, 0
+	i64.const	$push205=, 7016996765293437281
+	i64.store	u+23($pop206):p2align=0, $pop205
+	i32.const	$push204=, 0
+	i64.const	$push203=, 7016996765293437281
+	i64.store	u+16($pop204), $pop203
+	i32.const	$push202=, 0
+	i64.const	$push201=, 7016996765293437281
+	i64.store	u+8($pop202), $pop201
+	i32.const	$push200=, 0
+	i64.const	$push199=, 7016996765293437281
+	i64.store	u($pop200), $pop199
+	i32.const	$push198=, u+6
+	i32.add 	$2=, $5, $pop198
+	i32.const	$push197=, 0
+	i32.store8	0($2), $pop197
+	i32.const	$push196=, u+4
+	i32.add 	$3=, $5, $pop196
+	i32.const	$push195=, 0
+	i32.store16	0($3):p2align=0, $pop195
+	i32.const	$push194=, u
+	i32.add 	$0=, $5, $pop194
+	i32.const	$push193=, 0
+	i32.store	0($0):p2align=0, $pop193
+	i32.const	$push192=, 7
+	i32.const	$push191=, 0
+	call    	check@FUNCTION, $5, $pop192, $pop191
+	i32.const	$push190=, 0
+	i32.load8_u	$1=, A($pop190)
+	i32.store8	0($2), $1
+	i32.const	$push189=, 257
+	i32.mul 	$push15=, $1, $pop189
+	i32.store16	0($3):p2align=0, $pop15
+	i32.const	$push188=, 16843009
+	i32.mul 	$push16=, $1, $pop188
+	i32.store	0($0):p2align=0, $pop16
+	i32.const	$push187=, 7
+	i32.const	$push186=, 65
+	call    	check@FUNCTION, $5, $pop187, $pop186
+	i32.const	$push185=, 66
+	i32.store8	0($2), $pop185
+	i32.const	$push184=, 16962
+	i32.store16	0($3):p2align=0, $pop184
+	i32.const	$push183=, 1111638594
+	i32.store	0($0):p2align=0, $pop183
+	i32.const	$push182=, 7
+	i32.const	$push181=, 66
+	call    	check@FUNCTION, $5, $pop182, $pop181
+	i32.const	$push180=, 1
+	i32.add 	$5=, $5, $pop180
+	i32.const	$push179=, 8
+	i32.ne  	$push17=, $5, $pop179
+	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	$push227=, 0
+	i64.const	$push226=, 7016996765293437281
+	i64.store	u+23($pop227):p2align=0, $pop226
+	i32.const	$push225=, 0
+	i64.const	$push224=, 7016996765293437281
+	i64.store	u+16($pop225), $pop224
+	i32.const	$push223=, 0
+	i64.const	$push222=, 7016996765293437281
+	i64.store	u+8($pop223), $pop222
+	i32.const	$push221=, 0
+	i64.const	$push220=, 7016996765293437281
+	i64.store	u($pop221), $pop220
+	i32.const	$push219=, u
+	i32.add 	$2=, $5, $pop219
+	i64.const	$push218=, 0
+	i64.store	0($2):p2align=0, $pop218
+	i32.const	$push217=, 8
+	i32.const	$push216=, 0
+	call    	check@FUNCTION, $5, $pop217, $pop216
+	i32.const	$push215=, 0
+	i64.load8_u	$push18=, A($pop215)
+	i64.const	$push214=, 72340172838076673
+	i64.mul 	$push19=, $pop18, $pop214
+	i64.store	0($2):p2align=0, $pop19
+	i32.const	$push213=, 8
+	i32.const	$push212=, 65
+	call    	check@FUNCTION, $5, $pop213, $pop212
+	i64.const	$push211=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop211
+	i32.const	$push210=, 8
+	i32.const	$push209=, 66
+	call    	check@FUNCTION, $5, $pop210, $pop209
+	i32.const	$push208=, 1
+	i32.add 	$5=, $5, $pop208
+	i32.const	$push207=, 8
+	i32.ne  	$push20=, $5, $pop207
+	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	$push252=, 0
 	i64.const	$push251=, 7016996765293437281
 	i64.store	u+23($pop252):p2align=0, $pop251
@@ -462,58 +544,47 @@ main:                                   # @main
 	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
+	i32.const	$push244=, u+8
+	i32.add 	$2=, $5, $pop244
+	i32.const	$push243=, 0
+	i32.store8	0($2), $pop243
+	i32.const	$push242=, u
+	i32.add 	$3=, $5, $pop242
+	i64.const	$push241=, 0
+	i64.store	0($3):p2align=0, $pop241
+	i32.const	$push240=, 9
+	i32.const	$push239=, 0
+	call    	check@FUNCTION, $5, $pop240, $pop239
+	i32.const	$push238=, 0
+	i32.load8_u	$0=, A($pop238)
+	i32.store8	0($2), $0
+	i64.extend_u/i32	$push21=, $0
+	i64.const	$push237=, 255
+	i64.and 	$push22=, $pop21, $pop237
+	i64.const	$push236=, 72340172838076673
+	i64.mul 	$push23=, $pop22, $pop236
+	i64.store	0($3):p2align=0, $pop23
+	i32.const	$push235=, 9
+	i32.const	$push234=, 65
+	call    	check@FUNCTION, $5, $pop235, $pop234
+	i32.const	$push233=, 66
+	i32.store8	0($2), $pop233
+	i64.const	$push232=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop232
+	i32.const	$push231=, 9
+	i32.const	$push230=, 66
+	call    	check@FUNCTION, $5, $pop231, $pop230
+	i32.const	$push229=, 1
+	i32.add 	$5=, $5, $pop229
+	i32.const	$push228=, 8
+	i32.ne  	$push24=, $5, $pop228
+	br_if   	0, $pop24       # 0: up to label14
+# %bb.18:                               # %for.body226.preheader
 	end_loop
 	i32.const	$5=, 0
-.LBB2_15:                               # %for.body174
+.LBB2_19:                               # %for.body226
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label13:
+	loop    	                # label15:
 	i32.const	$push277=, 0
 	i64.const	$push276=, 7016996765293437281
 	i64.store	u+23($pop277):p2align=0, $pop276
@@ -526,432 +597,305 @@ main:                                   # @main
 	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
+	i32.const	$push269=, u+8
+	i32.add 	$2=, $5, $pop269
+	i32.const	$push268=, 0
+	i32.store16	0($2):p2align=0, $pop268
+	i32.const	$push267=, u
+	i32.add 	$3=, $5, $pop267
 	i64.const	$push266=, 0
-	i64.store	0($pop267):p2align=0, $pop266
-	i32.const	$push265=, 8
+	i64.store	0($3):p2align=0, $pop266
+	i32.const	$push265=, 10
 	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	$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	$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.load8_u	$0=, A($pop263)
+	i32.const	$push262=, 257
+	i32.mul 	$push25=, $0, $pop262
 	i32.store16	0($2):p2align=0, $pop25
 	i64.extend_u/i32	$push26=, $0
-	i64.const	$push321=, 72340172838076673
-	i64.mul 	$push27=, $pop26, $pop321
+	i64.const	$push261=, 72340172838076673
+	i64.mul 	$push27=, $pop26, $pop261
 	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
+	i32.const	$push260=, 10
+	i32.const	$push259=, 65
+	call    	check@FUNCTION, $5, $pop260, $pop259
+	i32.const	$push258=, 16962
+	i32.store16	0($2):p2align=0, $pop258
+	i64.const	$push257=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop257
+	i32.const	$push256=, 10
+	i32.const	$push255=, 66
+	call    	check@FUNCTION, $5, $pop256, $pop255
+	i32.const	$push254=, 1
+	i32.add 	$5=, $5, $pop254
+	i32.const	$push253=, 8
+	i32.ne  	$push28=, $5, $pop253
 	br_if   	0, $pop28       # 0: up to label15
-# BB#20:                                # %for.body252.preheader
+# %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	$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.const	$push305=, 0
+	i64.const	$push304=, 7016996765293437281
+	i64.store	u+23($pop305):p2align=0, $pop304
+	i32.const	$push303=, 0
+	i64.const	$push302=, 7016996765293437281
+	i64.store	u+16($pop303), $pop302
+	i32.const	$push301=, 0
+	i64.const	$push300=, 7016996765293437281
+	i64.store	u+8($pop301), $pop300
+	i32.const	$push299=, 0
+	i64.const	$push298=, 7016996765293437281
+	i64.store	u($pop299), $pop298
+	i32.const	$push297=, u+10
+	i32.add 	$2=, $5, $pop297
+	i32.const	$push296=, 0
+	i32.store8	0($2), $pop296
+	i32.const	$push295=, u+8
+	i32.add 	$3=, $5, $pop295
+	i32.const	$push294=, 0
+	i32.store16	0($3):p2align=0, $pop294
+	i32.const	$push293=, u
+	i32.add 	$0=, $5, $pop293
+	i64.const	$push292=, 0
+	i64.store	0($0):p2align=0, $pop292
+	i32.const	$push291=, 11
+	i32.const	$push290=, 0
+	call    	check@FUNCTION, $5, $pop291, $pop290
+	i32.const	$push289=, 0
+	i32.load8_u	$1=, A($pop289)
+	i32.store8	0($2), $1
+	i32.const	$push288=, 257
+	i32.mul 	$push29=, $1, $pop288
 	i32.store16	0($3):p2align=0, $pop29
 	i64.extend_u/i32	$push30=, $1
-	i64.const	$push355=, 72340172838076673
-	i64.mul 	$push31=, $pop30, $pop355
+	i64.const	$push287=, 72340172838076673
+	i64.mul 	$push31=, $pop30, $pop287
 	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
+	i32.const	$push286=, 11
+	i32.const	$push285=, 65
+	call    	check@FUNCTION, $5, $pop286, $pop285
+	i32.const	$push284=, 66
+	i32.store8	0($2), $pop284
+	i32.const	$push283=, 16962
+	i32.store16	0($3):p2align=0, $pop283
+	i64.const	$push282=, 4774451407313060418
+	i64.store	0($0):p2align=0, $pop282
+	i32.const	$push281=, 11
+	i32.const	$push280=, 66
+	call    	check@FUNCTION, $5, $pop281, $pop280
+	i32.const	$push279=, 1
+	i32.add 	$5=, $5, $pop279
+	i32.const	$push278=, 8
+	i32.ne  	$push32=, $5, $pop278
 	br_if   	0, $pop32       # 0: up to label16
-# BB#22:                                # %for.body278.preheader
+# %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	$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.const	$push330=, 0
+	i64.const	$push329=, 7016996765293437281
+	i64.store	u+23($pop330):p2align=0, $pop329
+	i32.const	$push328=, 0
+	i64.const	$push327=, 7016996765293437281
+	i64.store	u+16($pop328), $pop327
+	i32.const	$push326=, 0
+	i64.const	$push325=, 7016996765293437281
+	i64.store	u+8($pop326), $pop325
+	i32.const	$push324=, 0
+	i64.const	$push323=, 7016996765293437281
+	i64.store	u($pop324), $pop323
+	i32.const	$push322=, u+8
+	i32.add 	$2=, $5, $pop322
+	i32.const	$push321=, 0
+	i32.store	0($2):p2align=0, $pop321
+	i32.const	$push320=, u
+	i32.add 	$3=, $5, $pop320
+	i64.const	$push319=, 0
+	i64.store	0($3):p2align=0, $pop319
+	i32.const	$push318=, 12
+	i32.const	$push317=, 0
+	call    	check@FUNCTION, $5, $pop318, $pop317
+	i32.const	$push316=, 0
+	i32.load8_u	$0=, A($pop316)
+	i32.const	$push315=, 16843009
+	i32.mul 	$push33=, $0, $pop315
 	i32.store	0($2):p2align=0, $pop33
 	i64.extend_u/i32	$push34=, $0
-	i64.const	$push392=, 72340172838076673
-	i64.mul 	$push35=, $pop34, $pop392
+	i64.const	$push314=, 72340172838076673
+	i64.mul 	$push35=, $pop34, $pop314
 	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
+	i32.const	$push313=, 12
+	i32.const	$push312=, 65
+	call    	check@FUNCTION, $5, $pop313, $pop312
+	i32.const	$push311=, 1111638594
+	i32.store	0($2):p2align=0, $pop311
+	i64.const	$push310=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop310
+	i32.const	$push309=, 12
+	i32.const	$push308=, 66
+	call    	check@FUNCTION, $5, $pop309, $pop308
+	i32.const	$push307=, 1
+	i32.add 	$5=, $5, $pop307
+	i32.const	$push306=, 8
+	i32.ne  	$push36=, $5, $pop306
 	br_if   	0, $pop36       # 0: up to label17
-# BB#24:                                # %for.body304.preheader
+# %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	$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
+	i32.const	$push354=, 0
+	i64.const	$push353=, 7016996765293437281
+	i64.store	u+23($pop354):p2align=0, $pop353
+	i32.const	$push352=, 0
+	i64.const	$push351=, 7016996765293437281
+	i64.store	u+16($pop352), $pop351
+	i32.const	$push350=, 0
+	i64.const	$push349=, 7016996765293437281
+	i64.store	u+8($pop350), $pop349
+	i32.const	$push348=, 0
+	i64.const	$push347=, 7016996765293437281
+	i64.store	u($pop348), $pop347
+	i32.const	$push346=, u+5
+	i32.add 	$2=, $5, $pop346
+	i64.const	$push345=, 0
+	i64.store	0($2):p2align=0, $pop345
+	i32.const	$push344=, u
+	i32.add 	$3=, $5, $pop344
+	i64.const	$push343=, 0
+	i64.store	0($3):p2align=0, $pop343
+	i32.const	$push342=, 13
+	i32.const	$push341=, 0
+	call    	check@FUNCTION, $5, $pop342, $pop341
+	i32.const	$push340=, 0
+	i64.load8_u	$push37=, A($pop340)
+	i64.const	$push339=, 72340172838076673
+	i64.mul 	$4=, $pop37, $pop339
+	i64.store	0($2):p2align=0, $4
 	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
+	i32.const	$push338=, 13
+	i32.const	$push337=, 65
+	call    	check@FUNCTION, $5, $pop338, $pop337
+	i64.const	$push336=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop336
+	i64.const	$push335=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop335
+	i32.const	$push334=, 13
+	i32.const	$push333=, 66
+	call    	check@FUNCTION, $5, $pop334, $pop333
+	i32.const	$push332=, 1
+	i32.add 	$5=, $5, $pop332
+	i32.const	$push331=, 8
+	i32.ne  	$push38=, $5, $pop331
 	br_if   	0, $pop38       # 0: up to label18
-# BB#26:                                # %for.body330.preheader
+# %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	$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
+	i32.const	$push378=, 0
+	i64.const	$push377=, 7016996765293437281
+	i64.store	u+23($pop378):p2align=0, $pop377
+	i32.const	$push376=, 0
+	i64.const	$push375=, 7016996765293437281
+	i64.store	u+16($pop376), $pop375
+	i32.const	$push374=, 0
+	i64.const	$push373=, 7016996765293437281
+	i64.store	u+8($pop374), $pop373
+	i32.const	$push372=, 0
+	i64.const	$push371=, 7016996765293437281
+	i64.store	u($pop372), $pop371
+	i32.const	$push370=, u+6
+	i32.add 	$2=, $5, $pop370
+	i64.const	$push369=, 0
+	i64.store	0($2):p2align=0, $pop369
+	i32.const	$push368=, u
+	i32.add 	$3=, $5, $pop368
+	i64.const	$push367=, 0
+	i64.store	0($3):p2align=0, $pop367
+	i32.const	$push366=, 14
+	i32.const	$push365=, 0
+	call    	check@FUNCTION, $5, $pop366, $pop365
+	i32.const	$push364=, 0
+	i64.load8_u	$push39=, A($pop364)
+	i64.const	$push363=, 72340172838076673
+	i64.mul 	$4=, $pop39, $pop363
+	i64.store	0($2):p2align=0, $4
 	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
+	i32.const	$push362=, 14
+	i32.const	$push361=, 65
+	call    	check@FUNCTION, $5, $pop362, $pop361
+	i64.const	$push360=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop360
+	i64.const	$push359=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop359
+	i32.const	$push358=, 14
+	i32.const	$push357=, 66
+	call    	check@FUNCTION, $5, $pop358, $pop357
+	i32.const	$push356=, 1
+	i32.add 	$5=, $5, $pop356
+	i32.const	$push355=, 8
+	i32.ne  	$push40=, $5, $pop355
 	br_if   	0, $pop40       # 0: up to label19
-# BB#28:                                # %for.body356.preheader
+# %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	$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
+	i32.const	$push402=, 0
+	i64.const	$push401=, 7016996765293437281
+	i64.store	u+23($pop402):p2align=0, $pop401
+	i32.const	$push400=, 0
+	i64.const	$push399=, 7016996765293437281
+	i64.store	u+16($pop400), $pop399
+	i32.const	$push398=, 0
+	i64.const	$push397=, 7016996765293437281
+	i64.store	u+8($pop398), $pop397
+	i32.const	$push396=, 0
+	i64.const	$push395=, 7016996765293437281
+	i64.store	u($pop396), $pop395
+	i32.const	$push394=, u+7
+	i32.add 	$2=, $5, $pop394
+	i64.const	$push393=, 0
+	i64.store	0($2):p2align=0, $pop393
+	i32.const	$push392=, u
+	i32.add 	$3=, $5, $pop392
+	i64.const	$push391=, 0
+	i64.store	0($3):p2align=0, $pop391
+	i32.const	$push390=, 15
+	i32.const	$push389=, 0
+	call    	check@FUNCTION, $5, $pop390, $pop389
+	i32.const	$push388=, 0
+	i64.load8_u	$push41=, A($pop388)
+	i64.const	$push387=, 72340172838076673
+	i64.mul 	$4=, $pop41, $pop387
+	i64.store	0($2):p2align=0, $4
 	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
+	i32.const	$push386=, 15
+	i32.const	$push385=, 65
+	call    	check@FUNCTION, $5, $pop386, $pop385
+	i64.const	$push384=, 4774451407313060418
+	i64.store	0($2):p2align=0, $pop384
+	i64.const	$push383=, 4774451407313060418
+	i64.store	0($3):p2align=0, $pop383
+	i32.const	$push382=, 15
+	i32.const	$push381=, 66
+	call    	check@FUNCTION, $5, $pop382, $pop381
+	i32.const	$push380=, 1
+	i32.add 	$5=, $5, $pop380
+	i32.const	$push379=, 8
+	i32.ne  	$push42=, $5, $pop379
 	br_if   	0, $pop42       # 0: up to label20
-# BB#30:                                # %for.end378
+# %bb.30:                               # %for.end378
 	end_loop
 	i32.const	$push43=, 0
 	call    	exit@FUNCTION, $pop43
@@ -976,6 +920,6 @@ u:
 	.size	u, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 57e8166af..472a79073 100644
--- a/test/torture-s/memset-3.c.s
+++ b/test/torture-s/memset-3.c.s
@@ -5,7 +5,7 @@
 	.globl	reset
 	.type	reset,@function
 reset:                                  # @reset
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 7016996765293437281
 	i64.store	u+23($pop1):p2align=0, $pop0
@@ -30,7 +30,7 @@ reset:                                  # @reset
 check:                                  # @check
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -38,7 +38,7 @@ check:                                  # @check
 	i32.const	$push28=, 1
 	i32.lt_s	$push0=, $0, $pop28
 	br_if   	0, $pop0        # 0: down to label3
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 0
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
@@ -49,26 +49,25 @@ check:                                  # @check
 	i32.const	$push29=, 97
 	i32.ne  	$push3=, $pop2, $pop29
 	br_if   	4, $pop3        # 4: down to label0
-# BB#3:                                 # %for.inc
+# %bb.3:                                # %for.inc
                                         #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $3, $pop33
-	tee_local	$push31=, $3=, $pop32
-	i32.lt_s	$push4=, $pop31, $0
+	i32.const	$push31=, 1
+	i32.add 	$3=, $3, $pop31
+	i32.lt_s	$push4=, $3, $0
 	br_if   	0, $pop4        # 0: up to label4
-# BB#4:                                 # %for.end.loopexit
+# %bb.4:                                # %for.end.loopexit
 	end_loop
 	i32.const	$push5=, u
 	i32.add 	$0=, $3, $pop5
-	i32.const	$push34=, 1
-	i32.ge_s	$push7=, $1, $pop34
+	i32.const	$push32=, 1
+	i32.ge_s	$push7=, $1, $pop32
 	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	$push6=, $1, $pop35
+	i32.const	$push33=, 1
+	i32.lt_s	$push6=, $1, $pop33
 	br_if   	1, $pop6        # 1: down to label1
 .LBB1_6:                                # %for.body6.preheader
 	end_block                       # label2:
@@ -80,58 +79,57 @@ check:                                  # @check
 	i32.load8_s	$push9=, 0($pop8)
 	i32.ne  	$push10=, $pop9, $2
 	br_if   	2, $pop10       # 2: down to label0
-# BB#8:                                 # %for.inc12
+# %bb.8:                                # %for.inc12
                                         #   in Loop: Header=BB1_7 Depth=1
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $3, $pop38
-	tee_local	$push36=, $3=, $pop37
-	i32.lt_s	$push11=, $pop36, $1
+	i32.const	$push34=, 1
+	i32.add 	$3=, $3, $pop34
+	i32.lt_s	$push11=, $3, $1
 	br_if   	0, $pop11       # 0: up to label5
-# BB#9:                                 # %for.end15.loopexit
+# %bb.9:                                # %for.end15.loopexit
 	end_loop
 	i32.add 	$0=, $0, $3
 .LBB1_10:                               # %for.end15
 	end_block                       # label1:
 	i32.load8_u	$push12=, 0($0)
-	i32.const	$push39=, 97
-	i32.ne  	$push13=, $pop12, $pop39
+	i32.const	$push35=, 97
+	i32.ne  	$push13=, $pop12, $pop35
 	br_if   	0, $pop13       # 0: down to label0
-# BB#11:                                # %for.inc25
+# %bb.11:                               # %for.inc25
 	i32.load8_u	$push14=, 1($0)
-	i32.const	$push40=, 97
-	i32.ne  	$push15=, $pop14, $pop40
+	i32.const	$push36=, 97
+	i32.ne  	$push15=, $pop14, $pop36
 	br_if   	0, $pop15       # 0: down to label0
-# BB#12:                                # %for.inc25.1
+# %bb.12:                               # %for.inc25.1
 	i32.load8_u	$push16=, 2($0)
-	i32.const	$push41=, 97
-	i32.ne  	$push17=, $pop16, $pop41
+	i32.const	$push37=, 97
+	i32.ne  	$push17=, $pop16, $pop37
 	br_if   	0, $pop17       # 0: down to label0
-# BB#13:                                # %for.inc25.2
+# %bb.13:                               # %for.inc25.2
 	i32.load8_u	$push18=, 3($0)
-	i32.const	$push42=, 97
-	i32.ne  	$push19=, $pop18, $pop42
+	i32.const	$push38=, 97
+	i32.ne  	$push19=, $pop18, $pop38
 	br_if   	0, $pop19       # 0: down to label0
-# BB#14:                                # %for.inc25.3
+# %bb.14:                               # %for.inc25.3
 	i32.load8_u	$push20=, 4($0)
-	i32.const	$push43=, 97
-	i32.ne  	$push21=, $pop20, $pop43
+	i32.const	$push39=, 97
+	i32.ne  	$push21=, $pop20, $pop39
 	br_if   	0, $pop21       # 0: down to label0
-# BB#15:                                # %for.inc25.4
+# %bb.15:                               # %for.inc25.4
 	i32.load8_u	$push22=, 5($0)
-	i32.const	$push44=, 97
-	i32.ne  	$push23=, $pop22, $pop44
+	i32.const	$push40=, 97
+	i32.ne  	$push23=, $pop22, $pop40
 	br_if   	0, $pop23       # 0: down to label0
-# BB#16:                                # %for.inc25.5
+# %bb.16:                               # %for.inc25.5
 	i32.load8_u	$push24=, 6($0)
-	i32.const	$push45=, 97
-	i32.ne  	$push25=, $pop24, $pop45
+	i32.const	$push41=, 97
+	i32.ne  	$push25=, $pop24, $pop41
 	br_if   	0, $pop25       # 0: down to label0
-# BB#17:                                # %for.inc25.6
+# %bb.17:                               # %for.inc25.6
 	i32.load8_u	$push26=, 7($0)
-	i32.const	$push46=, 97
-	i32.ne  	$push27=, $pop26, $pop46
+	i32.const	$push42=, 97
+	i32.ne  	$push27=, $pop26, $pop42
 	br_if   	0, $pop27       # 0: down to label0
-# BB#18:                                # %for.inc25.7
+# %bb.18:                               # %for.inc25.7
 	return
 .LBB1_19:                               # %if.then
 	end_block                       # label0:
@@ -148,8 +146,8 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$2=, 0
+# %bb.0:                                # %entry
+	i32.const	$1=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB2_3 Depth 2
@@ -171,540 +169,529 @@ main:                                   # @main
 	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
+	i32.call	$0=, memset@FUNCTION, $pop77, $pop76, $1
+	i32.const	$2=, u
 	block   	
-	i32.eqz 	$push281=, $2
-	br_if   	0, $pop281      # 0: down to label8
-# BB#2:                                 # %for.body6.i.preheader
+	i32.eqz 	$push261=, $1
+	br_if   	0, $pop261      # 0: down to label8
+# %bb.2:                                # %for.body6.i.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$1=, 0
+	i32.const	$2=, 0
 .LBB2_3:                                # %for.body6.i
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label9:
-	i32.add 	$push1=, $1, $0
-	i32.load8_u	$push2=, 0($pop1)
-	br_if   	3, $pop2        # 3: down to label6
-# BB#4:                                 # %for.inc12.i
+	i32.add 	$push0=, $2, $0
+	i32.load8_u	$push1=, 0($pop0)
+	br_if   	3, $pop1        # 3: down to label6
+# %bb.4:                                # %for.inc12.i
                                         #   in Loop: Header=BB2_3 Depth=2
-	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.end15.i.loopexit
+	i32.const	$push86=, 1
+	i32.add 	$2=, $2, $pop86
+	i32.lt_u	$push2=, $2, $1
+	br_if   	0, $pop2        # 0: up to label9
+# %bb.5:                                # %for.end15.i.loopexit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.add 	$1=, $1, $0
+	i32.add 	$2=, $2, $0
 .LBB2_6:                                # %for.end15.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label8:
-	i32.load8_u	$push4=, 0($1)
+	i32.load8_u	$push3=, 0($2)
+	i32.const	$push87=, 97
+	i32.ne  	$push4=, $pop3, $pop87
+	br_if   	1, $pop4        # 1: down to label6
+# %bb.7:                                # %for.inc25.i
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push5=, 1($2)
+	i32.const	$push88=, 97
+	i32.ne  	$push6=, $pop5, $pop88
+	br_if   	1, $pop6        # 1: down to label6
+# %bb.8:                                # %for.inc25.1.i
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push7=, 2($2)
 	i32.const	$push89=, 97
-	i32.ne  	$push5=, $pop4, $pop89
-	br_if   	1, $pop5        # 1: down to label6
-# BB#7:                                 # %for.inc25.i
+	i32.ne  	$push8=, $pop7, $pop89
+	br_if   	1, $pop8        # 1: down to label6
+# %bb.9:                                # %for.inc25.2.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push6=, 1($1)
+	i32.load8_u	$push9=, 3($2)
 	i32.const	$push90=, 97
-	i32.ne  	$push7=, $pop6, $pop90
-	br_if   	1, $pop7        # 1: down to label6
-# BB#8:                                 # %for.inc25.1.i
+	i32.ne  	$push10=, $pop9, $pop90
+	br_if   	1, $pop10       # 1: down to label6
+# %bb.10:                               # %for.inc25.3.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push8=, 2($1)
+	i32.load8_u	$push11=, 4($2)
 	i32.const	$push91=, 97
-	i32.ne  	$push9=, $pop8, $pop91
-	br_if   	1, $pop9        # 1: down to label6
-# BB#9:                                 # %for.inc25.2.i
+	i32.ne  	$push12=, $pop11, $pop91
+	br_if   	1, $pop12       # 1: down to label6
+# %bb.11:                               # %for.inc25.4.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push10=, 3($1)
+	i32.load8_u	$push13=, 5($2)
 	i32.const	$push92=, 97
-	i32.ne  	$push11=, $pop10, $pop92
-	br_if   	1, $pop11       # 1: down to label6
-# BB#10:                                # %for.inc25.3.i
+	i32.ne  	$push14=, $pop13, $pop92
+	br_if   	1, $pop14       # 1: down to label6
+# %bb.12:                               # %for.inc25.5.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push12=, 4($1)
+	i32.load8_u	$push15=, 6($2)
 	i32.const	$push93=, 97
-	i32.ne  	$push13=, $pop12, $pop93
-	br_if   	1, $pop13       # 1: down to label6
-# BB#11:                                # %for.inc25.4.i
+	i32.ne  	$push16=, $pop15, $pop93
+	br_if   	1, $pop16       # 1: down to label6
+# %bb.13:                               # %for.inc25.6.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push14=, 5($1)
+	i32.load8_u	$push17=, 7($2)
 	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($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($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	$1=, u
-	i32.const	$push98=, u
-	i32.const	$push97=, 0
-	i32.load8_u	$push20=, A($pop97)
-	i32.call	$drop=, memset@FUNCTION, $pop98, $pop20, $2
+	i32.ne  	$push18=, $pop17, $pop94
+	br_if   	1, $pop18       # 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	$push19=, A($pop95)
+	i32.call	$drop=, memset@FUNCTION, $pop96, $pop19, $1
 	block   	
-	i32.eqz 	$push282=, $2
-	br_if   	0, $pop282      # 0: down to label10
-# BB#15:                                # %for.body6.i242.preheader
+	i32.eqz 	$push262=, $1
+	br_if   	0, $pop262      # 0: down to label10
+# %bb.15:                               # %for.body6.i242.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$1=, 0
+	i32.const	$2=, 0
 .LBB2_16:                               # %for.body6.i242
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label11:
-	i32.add 	$push21=, $1, $0
-	i32.load8_u	$push22=, 0($pop21)
-	i32.const	$push99=, 65
-	i32.ne  	$push23=, $pop22, $pop99
-	br_if   	3, $pop23       # 3: down to label6
-# BB#17:                                # %for.inc12.i247
+	i32.add 	$push20=, $2, $0
+	i32.load8_u	$push21=, 0($pop20)
+	i32.const	$push97=, 65
+	i32.ne  	$push22=, $pop21, $pop97
+	br_if   	3, $pop22       # 3: down to label6
+# %bb.17:                               # %for.inc12.i247
                                         #   in Loop: Header=BB2_16 Depth=2
-	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.end15.i250.loopexit
+	i32.const	$push98=, 1
+	i32.add 	$2=, $2, $pop98
+	i32.lt_u	$push23=, $2, $1
+	br_if   	0, $pop23       # 0: up to label11
+# %bb.18:                               # %for.end15.i250.loopexit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.add 	$1=, $1, $0
+	i32.add 	$2=, $2, $0
 .LBB2_19:                               # %for.end15.i250
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label10:
-	i32.load8_u	$push25=, 0($1)
+	i32.load8_u	$push24=, 0($2)
+	i32.const	$push99=, 97
+	i32.ne  	$push25=, $pop24, $pop99
+	br_if   	1, $pop25       # 1: down to label6
+# %bb.20:                               # %for.inc25.i254
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push26=, 1($2)
+	i32.const	$push100=, 97
+	i32.ne  	$push27=, $pop26, $pop100
+	br_if   	1, $pop27       # 1: down to label6
+# %bb.21:                               # %for.inc25.1.i257
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push28=, 2($2)
+	i32.const	$push101=, 97
+	i32.ne  	$push29=, $pop28, $pop101
+	br_if   	1, $pop29       # 1: down to label6
+# %bb.22:                               # %for.inc25.2.i260
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push30=, 3($2)
+	i32.const	$push102=, 97
+	i32.ne  	$push31=, $pop30, $pop102
+	br_if   	1, $pop31       # 1: down to label6
+# %bb.23:                               # %for.inc25.3.i263
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push32=, 4($2)
 	i32.const	$push103=, 97
-	i32.ne  	$push26=, $pop25, $pop103
-	br_if   	1, $pop26       # 1: down to label6
-# BB#20:                                # %for.inc25.i254
+	i32.ne  	$push33=, $pop32, $pop103
+	br_if   	1, $pop33       # 1: down to label6
+# %bb.24:                               # %for.inc25.4.i266
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push27=, 1($1)
+	i32.load8_u	$push34=, 5($2)
 	i32.const	$push104=, 97
-	i32.ne  	$push28=, $pop27, $pop104
-	br_if   	1, $pop28       # 1: down to label6
-# BB#21:                                # %for.inc25.1.i257
+	i32.ne  	$push35=, $pop34, $pop104
+	br_if   	1, $pop35       # 1: down to label6
+# %bb.25:                               # %for.inc25.5.i269
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push29=, 2($1)
+	i32.load8_u	$push36=, 6($2)
 	i32.const	$push105=, 97
-	i32.ne  	$push30=, $pop29, $pop105
-	br_if   	1, $pop30       # 1: down to label6
-# BB#22:                                # %for.inc25.2.i260
+	i32.ne  	$push37=, $pop36, $pop105
+	br_if   	1, $pop37       # 1: down to label6
+# %bb.26:                               # %for.inc25.6.i272
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push31=, 3($1)
+	i32.load8_u	$push38=, 7($2)
 	i32.const	$push106=, 97
-	i32.ne  	$push32=, $pop31, $pop106
-	br_if   	1, $pop32       # 1: down to label6
-# BB#23:                                # %for.inc25.3.i263
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i266
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i269
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i272
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.exit273
-                                        #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$1=, u
-	i32.const	$push112=, u
-	i32.const	$push111=, 66
-	i32.call	$drop=, memset@FUNCTION, $pop112, $pop111, $2
+	i32.ne  	$push39=, $pop38, $pop106
+	br_if   	1, $pop39       # 1: down to label6
+# %bb.27:                               # %check.exit273
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$2=, u
+	i32.const	$push108=, u
+	i32.const	$push107=, 66
+	i32.call	$drop=, memset@FUNCTION, $pop108, $pop107, $1
 	block   	
-	i32.eqz 	$push283=, $2
-	br_if   	0, $pop283      # 0: down to label12
-# BB#28:                                # %for.body6.i280.preheader
+	i32.eqz 	$push263=, $1
+	br_if   	0, $pop263      # 0: down to label12
+# %bb.28:                               # %for.body6.i280.preheader
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$1=, 0
+	i32.const	$2=, 0
 .LBB2_29:                               # %for.body6.i280
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label13:
-	i32.add 	$push41=, $1, $0
-	i32.load8_u	$push42=, 0($pop41)
-	i32.const	$push113=, 66
-	i32.ne  	$push43=, $pop42, $pop113
-	br_if   	3, $pop43       # 3: down to label6
-# BB#30:                                # %for.inc12.i285
+	i32.add 	$push40=, $2, $0
+	i32.load8_u	$push41=, 0($pop40)
+	i32.const	$push109=, 66
+	i32.ne  	$push42=, $pop41, $pop109
+	br_if   	3, $pop42       # 3: down to label6
+# %bb.30:                               # %for.inc12.i285
                                         #   in Loop: Header=BB2_29 Depth=2
-	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.end15.i288.loopexit
+	i32.const	$push110=, 1
+	i32.add 	$2=, $2, $pop110
+	i32.lt_u	$push43=, $2, $1
+	br_if   	0, $pop43       # 0: up to label13
+# %bb.31:                               # %for.end15.i288.loopexit
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
-	i32.add 	$1=, $1, $0
+	i32.add 	$2=, $2, $0
 .LBB2_32:                               # %for.end15.i288
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label12:
-	i32.load8_u	$push45=, 0($1)
+	i32.load8_u	$push44=, 0($2)
+	i32.const	$push111=, 97
+	i32.ne  	$push45=, $pop44, $pop111
+	br_if   	1, $pop45       # 1: down to label6
+# %bb.33:                               # %for.inc25.i292
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push46=, 1($2)
+	i32.const	$push112=, 97
+	i32.ne  	$push47=, $pop46, $pop112
+	br_if   	1, $pop47       # 1: down to label6
+# %bb.34:                               # %for.inc25.1.i295
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push48=, 2($2)
+	i32.const	$push113=, 97
+	i32.ne  	$push49=, $pop48, $pop113
+	br_if   	1, $pop49       # 1: down to label6
+# %bb.35:                               # %for.inc25.2.i298
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push50=, 3($2)
+	i32.const	$push114=, 97
+	i32.ne  	$push51=, $pop50, $pop114
+	br_if   	1, $pop51       # 1: down to label6
+# %bb.36:                               # %for.inc25.3.i301
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push52=, 4($2)
+	i32.const	$push115=, 97
+	i32.ne  	$push53=, $pop52, $pop115
+	br_if   	1, $pop53       # 1: down to label6
+# %bb.37:                               # %for.inc25.4.i304
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push54=, 5($2)
+	i32.const	$push116=, 97
+	i32.ne  	$push55=, $pop54, $pop116
+	br_if   	1, $pop55       # 1: down to label6
+# %bb.38:                               # %for.inc25.5.i307
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_u	$push56=, 6($2)
 	i32.const	$push117=, 97
-	i32.ne  	$push46=, $pop45, $pop117
-	br_if   	1, $pop46       # 1: down to label6
-# BB#33:                                # %for.inc25.i292
+	i32.ne  	$push57=, $pop56, $pop117
+	br_if   	1, $pop57       # 1: down to label6
+# %bb.39:                               # %for.inc25.6.i310
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.load8_u	$push47=, 1($1)
+	i32.load8_u	$push58=, 7($2)
 	i32.const	$push118=, 97
-	i32.ne  	$push48=, $pop47, $pop118
-	br_if   	1, $pop48       # 1: down to label6
-# BB#34:                                # %for.inc25.1.i295
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i298
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i301
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i304
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i307
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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.i310
-                                        #   in Loop: Header=BB2_1 Depth=1
-	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=, 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
+	i32.ne  	$push59=, $pop58, $pop118
+	br_if   	1, $pop59       # 1: down to label6
+# %bb.40:                               # %for.cond
+                                        #   in Loop: Header=BB2_1 Depth=1
+	i32.const	$push120=, 1
+	i32.add 	$1=, $1, $pop120
+	i32.const	$push119=, 15
+	i32.lt_u	$push60=, $1, $pop119
+	br_if   	0, $pop60       # 0: up to label7
+# %bb.41:                               # %for.body13.preheader
 	end_loop
 	i32.const	$2=, 0
 .LBB2_42:                               # %for.body13
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label14:
-	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, $2
-	i32.const	$push138=, 1
-	i32.const	$push137=, 0
-	call    	check@FUNCTION, $pop138, $2, $pop137
+	i32.const	$push140=, 0
+	i64.const	$push139=, 7016996765293437281
+	i64.store	u+23($pop140):p2align=0, $pop139
+	i32.const	$push138=, 0
+	i64.const	$push137=, 7016996765293437281
+	i64.store	u+16($pop138), $pop137
 	i32.const	$push136=, 0
-	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, $2, $pop134
-	i32.const	$push133=, 66
-	i32.call	$drop=, memset@FUNCTION, $0, $pop133, $2
-	i32.const	$push132=, 1
-	i32.const	$push131=, 66
-	call    	check@FUNCTION, $pop132, $2, $pop131
+	i64.const	$push135=, 7016996765293437281
+	i64.store	u+8($pop136), $pop135
+	i32.const	$push134=, 0
+	i64.const	$push133=, 7016996765293437281
+	i64.store	u($pop134), $pop133
+	i32.const	$push132=, u+1
+	i32.const	$push131=, 0
+	i32.call	$1=, memset@FUNCTION, $pop132, $pop131, $2
 	i32.const	$push130=, 1
-	i32.add 	$push129=, $2, $pop130
-	tee_local	$push128=, $2=, $pop129
-	i32.const	$push127=, 15
-	i32.ne  	$push62=, $pop128, $pop127
+	i32.const	$push129=, 0
+	call    	check@FUNCTION, $pop130, $2, $pop129
+	i32.const	$push128=, 0
+	i32.load8_u	$push61=, A($pop128)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop61, $2
+	i32.const	$push127=, 1
+	i32.const	$push126=, 65
+	call    	check@FUNCTION, $pop127, $2, $pop126
+	i32.const	$push125=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop125, $2
+	i32.const	$push124=, 1
+	i32.const	$push123=, 66
+	call    	check@FUNCTION, $pop124, $2, $pop123
+	i32.const	$push122=, 1
+	i32.add 	$2=, $2, $pop122
+	i32.const	$push121=, 15
+	i32.ne  	$push62=, $2, $pop121
 	br_if   	0, $pop62       # 0: up to label14
-# BB#43:                                # %for.body33.preheader
+# %bb.43:                               # %for.body33.preheader
 	end_loop
 	i32.const	$2=, 0
 .LBB2_44:                               # %for.body33
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # 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	$push160=, 0
+	i64.const	$push159=, 7016996765293437281
+	i64.store	u+23($pop160):p2align=0, $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
+	i64.const	$push157=, 7016996765293437281
+	i64.store	u+16($pop158), $pop157
+	i32.const	$push156=, 0
+	i64.const	$push155=, 7016996765293437281
+	i64.store	u+8($pop156), $pop155
+	i32.const	$push154=, 0
+	i64.const	$push153=, 7016996765293437281
+	i64.store	u($pop154), $pop153
+	i32.const	$push152=, u+2
+	i32.const	$push151=, 0
+	i32.call	$1=, memset@FUNCTION, $pop152, $pop151, $2
+	i32.const	$push150=, 2
+	i32.const	$push149=, 0
+	call    	check@FUNCTION, $pop150, $2, $pop149
+	i32.const	$push148=, 0
+	i32.load8_u	$push63=, A($pop148)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop63, $2
+	i32.const	$push147=, 2
+	i32.const	$push146=, 65
+	call    	check@FUNCTION, $pop147, $2, $pop146
+	i32.const	$push145=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop145, $2
+	i32.const	$push144=, 2
+	i32.const	$push143=, 66
+	call    	check@FUNCTION, $pop144, $2, $pop143
+	i32.const	$push142=, 1
+	i32.add 	$2=, $2, $pop142
+	i32.const	$push141=, 15
+	i32.ne  	$push64=, $2, $pop141
 	br_if   	0, $pop64       # 0: up to label15
-# BB#45:                                # %for.body53.preheader
+# %bb.45:                               # %for.body53.preheader
 	end_loop
 	i32.const	$2=, 0
 .LBB2_46:                               # %for.body53
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # 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
+	i64.const	$push179=, 7016996765293437281
+	i64.store	u+23($pop180):p2align=0, $pop179
+	i32.const	$push178=, 0
+	i64.const	$push177=, 7016996765293437281
+	i64.store	u+16($pop178), $pop177
+	i32.const	$push176=, 0
+	i64.const	$push175=, 7016996765293437281
+	i64.store	u+8($pop176), $pop175
+	i32.const	$push174=, 0
+	i64.const	$push173=, 7016996765293437281
+	i64.store	u($pop174), $pop173
+	i32.const	$push172=, u+3
+	i32.const	$push171=, 0
+	i32.call	$1=, memset@FUNCTION, $pop172, $pop171, $2
+	i32.const	$push170=, 3
+	i32.const	$push169=, 0
+	call    	check@FUNCTION, $pop170, $2, $pop169
+	i32.const	$push168=, 0
+	i32.load8_u	$push65=, A($pop168)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop65, $2
+	i32.const	$push167=, 3
+	i32.const	$push166=, 65
+	call    	check@FUNCTION, $pop167, $2, $pop166
+	i32.const	$push165=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop165, $2
+	i32.const	$push164=, 3
+	i32.const	$push163=, 66
+	call    	check@FUNCTION, $pop164, $2, $pop163
+	i32.const	$push162=, 1
+	i32.add 	$2=, $2, $pop162
+	i32.const	$push161=, 15
+	i32.ne  	$push66=, $2, $pop161
 	br_if   	0, $pop66       # 0: up to label16
-# BB#47:                                # %for.body73.preheader
+# %bb.47:                               # %for.body73.preheader
 	end_loop
 	i32.const	$2=, 0
 .LBB2_48:                               # %for.body73
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label17:
+	i32.const	$push200=, 0
+	i64.const	$push199=, 7016996765293437281
+	i64.store	u+23($pop200):p2align=0, $pop199
+	i32.const	$push198=, 0
+	i64.const	$push197=, 7016996765293437281
+	i64.store	u+16($pop198), $pop197
+	i32.const	$push196=, 0
+	i64.const	$push195=, 7016996765293437281
+	i64.store	u+8($pop196), $pop195
+	i32.const	$push194=, 0
+	i64.const	$push193=, 7016996765293437281
+	i64.store	u($pop194), $pop193
+	i32.const	$push192=, u+4
+	i32.const	$push191=, 0
+	i32.call	$1=, memset@FUNCTION, $pop192, $pop191, $2
+	i32.const	$push190=, 4
+	i32.const	$push189=, 0
+	call    	check@FUNCTION, $pop190, $2, $pop189
+	i32.const	$push188=, 0
+	i32.load8_u	$push67=, A($pop188)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop67, $2
+	i32.const	$push187=, 4
+	i32.const	$push186=, 65
+	call    	check@FUNCTION, $pop187, $2, $pop186
+	i32.const	$push185=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop185, $2
+	i32.const	$push184=, 4
+	i32.const	$push183=, 66
+	call    	check@FUNCTION, $pop184, $2, $pop183
+	i32.const	$push182=, 1
+	i32.add 	$2=, $2, $pop182
+	i32.const	$push181=, 15
+	i32.ne  	$push68=, $2, $pop181
+	br_if   	0, $pop68       # 0: up to label17
+# %bb.49:                               # %for.body93.preheader
+	end_loop
+	i32.const	$2=, 0
+.LBB2_50:                               # %for.body93
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label18:
+	i32.const	$push220=, 0
+	i64.const	$push219=, 7016996765293437281
+	i64.store	u+23($pop220):p2align=0, $pop219
+	i32.const	$push218=, 0
+	i64.const	$push217=, 7016996765293437281
+	i64.store	u+16($pop218), $pop217
+	i32.const	$push216=, 0
+	i64.const	$push215=, 7016996765293437281
+	i64.store	u+8($pop216), $pop215
 	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
+	i64.store	u($pop214), $pop213
+	i32.const	$push212=, u+5
+	i32.const	$push211=, 0
+	i32.call	$1=, memset@FUNCTION, $pop212, $pop211, $2
+	i32.const	$push210=, 5
+	i32.const	$push209=, 0
+	call    	check@FUNCTION, $pop210, $2, $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
+	i32.load8_u	$push69=, A($pop208)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop69, $2
+	i32.const	$push207=, 5
+	i32.const	$push206=, 65
+	call    	check@FUNCTION, $pop207, $2, $pop206
+	i32.const	$push205=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop205, $2
+	i32.const	$push204=, 5
+	i32.const	$push203=, 66
 	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
+	i32.const	$push202=, 1
+	i32.add 	$2=, $2, $pop202
+	i32.const	$push201=, 15
+	i32.ne  	$push70=, $2, $pop201
+	br_if   	0, $pop70       # 0: up to label18
+# %bb.51:                               # %for.body113.preheader
 	end_loop
 	i32.const	$2=, 0
-.LBB2_50:                               # %for.body93
+.LBB2_52:                               # %for.body113
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label18:
+	loop    	                # label19:
+	i32.const	$push240=, 0
+	i64.const	$push239=, 7016996765293437281
+	i64.store	u+23($pop240):p2align=0, $pop239
+	i32.const	$push238=, 0
+	i64.const	$push237=, 7016996765293437281
+	i64.store	u+16($pop238), $pop237
 	i32.const	$push236=, 0
 	i64.const	$push235=, 7016996765293437281
-	i64.store	u+23($pop236):p2align=0, $pop235
+	i64.store	u+8($pop236), $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
+	i64.store	u($pop234), $pop233
+	i32.const	$push232=, u+6
+	i32.const	$push231=, 0
+	i32.call	$1=, memset@FUNCTION, $pop232, $pop231, $2
+	i32.const	$push230=, 6
+	i32.const	$push229=, 0
+	call    	check@FUNCTION, $pop230, $2, $pop229
+	i32.const	$push228=, 0
+	i32.load8_u	$push71=, A($pop228)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop71, $2
+	i32.const	$push227=, 6
+	i32.const	$push226=, 65
+	call    	check@FUNCTION, $pop227, $2, $pop226
+	i32.const	$push225=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop225, $2
+	i32.const	$push224=, 6
+	i32.const	$push223=, 66
+	call    	check@FUNCTION, $pop224, $2, $pop223
+	i32.const	$push222=, 1
+	i32.add 	$2=, $2, $pop222
+	i32.const	$push221=, 15
+	i32.ne  	$push72=, $2, $pop221
+	br_if   	0, $pop72       # 0: up to label19
+# %bb.53:                               # %for.body133.preheader
 	end_loop
 	i32.const	$2=, 0
-.LBB2_52:                               # %for.body113
+.LBB2_54:                               # %for.body133
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label19:
+	loop    	                # label20:
+	i32.const	$push260=, 0
+	i64.const	$push259=, 7016996765293437281
+	i64.store	u+23($pop260):p2align=0, $pop259
 	i32.const	$push258=, 0
 	i64.const	$push257=, 7016996765293437281
-	i64.store	u+23($pop258):p2align=0, $pop257
+	i64.store	u+16($pop258), $pop257
 	i32.const	$push256=, 0
 	i64.const	$push255=, 7016996765293437281
-	i64.store	u+16($pop256), $pop255
+	i64.store	u+8($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
+	i64.store	u($pop254), $pop253
+	i32.const	$push252=, u+7
+	i32.const	$push251=, 0
+	i32.call	$1=, memset@FUNCTION, $pop252, $pop251, $2
+	i32.const	$push250=, 7
 	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
+	call    	check@FUNCTION, $pop250, $2, $pop249
+	i32.const	$push248=, 0
+	i32.load8_u	$push73=, A($pop248)
+	i32.call	$drop=, memset@FUNCTION, $1, $pop73, $2
+	i32.const	$push247=, 7
+	i32.const	$push246=, 65
+	call    	check@FUNCTION, $pop247, $2, $pop246
+	i32.const	$push245=, 66
+	i32.call	$drop=, memset@FUNCTION, $1, $pop245, $2
+	i32.const	$push244=, 7
 	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	$2=, 0
-.LBB2_54:                               # %for.body133
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # 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
+	call    	check@FUNCTION, $pop244, $2, $pop243
+	i32.const	$push242=, 1
+	i32.add 	$2=, $2, $pop242
+	i32.const	$push241=, 15
+	i32.ne  	$push74=, $2, $pop241
 	br_if   	0, $pop74       # 0: up to label20
-# BB#55:                                # %for.end149
+# %bb.55:                               # %for.end149
 	end_loop
 	i32.const	$push75=, 0
 	call    	exit@FUNCTION, $pop75
@@ -733,6 +720,6 @@ u:
 	.size	u, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4af150eed..4ad84fc5a 100644
--- a/test/torture-s/mod-1.c.s
+++ b/test/torture-s/mod-1.c.s
@@ -7,11 +7,11 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.rem_s	$push0=, $0, $1
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -36,6 +36,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f965ca4ef..b21a85d5f 100644
--- a/test/torture-s/mode-dependent-address.c.s
+++ b/test/torture-s/mode-dependent-address.c.s
@@ -7,47 +7,45 @@
 f883b:                                  # @f883b
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$6=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
+	i32.load16_s	$5=, 0($1)
 	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
-	i32.const	$push26=, 1
-	i32.lt_s	$push0=, $5, $pop26
-	i32.select	$push1=, $pop28, $pop27, $pop0
+	i32.const	$push25=, 1
+	i32.const	$push24=, 1
+	i32.lt_s	$push0=, $5, $pop24
+	i32.select	$push1=, $5, $pop25, $pop0
 	i32.load	$push2=, 0($2)
-	i32.const	$push25=, 31
-	i32.and 	$push3=, $pop2, $pop25
+	i32.const	$push23=, 31
+	i32.and 	$push3=, $pop2, $pop23
 	i32.shr_s	$push4=, $pop1, $pop3
-	i32.const	$push24=, 1
-	i32.xor 	$push5=, $pop4, $pop24
-	i32.const	$push23=, 32
-	i32.add 	$push6=, $pop5, $pop23
-	i32.const	$push22=, 7
-	i32.shr_u	$push7=, $pop6, $pop22
-	i32.const	$push21=, 251
-	i32.or  	$push8=, $pop7, $pop21
+	i32.const	$push22=, 1
+	i32.xor 	$push5=, $pop4, $pop22
+	i32.const	$push21=, 32
+	i32.add 	$push6=, $pop5, $pop21
+	i32.const	$push20=, 7
+	i32.shr_u	$push7=, $pop6, $pop20
+	i32.const	$push19=, 251
+	i32.or  	$push8=, $pop7, $pop19
 	i64.extend_u/i32	$push9=, $pop8
 	i64.and 	$push11=, $pop10, $pop9
 	i64.store8	0($pop12), $pop11
-	i32.const	$push20=, 8
-	i32.add 	$3=, $3, $pop20
-	i32.const	$push19=, 4
-	i32.add 	$2=, $2, $pop19
-	i32.const	$push18=, 2
-	i32.add 	$1=, $1, $pop18
-	i32.const	$push17=, 1
-	i32.add 	$push16=, $6, $pop17
-	tee_local	$push15=, $6=, $pop16
+	i32.const	$push18=, 8
+	i32.add 	$3=, $3, $pop18
+	i32.const	$push17=, 4
+	i32.add 	$2=, $2, $pop17
+	i32.const	$push16=, 2
+	i32.add 	$1=, $1, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$6=, $6, $pop15
 	i32.const	$push14=, 96
-	i32.ne  	$push13=, $pop15, $pop14
+	i32.ne  	$push13=, $6, $pop14
 	br_if   	0, $pop13       # 0: up to label0
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -61,7 +59,7 @@ f883b:                                  # @f883b
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$4=, 0
 	i32.const	$3=, arg1
 	i32.const	$2=, arg2
@@ -69,98 +67,93 @@ main:                                   # @main
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push34=, arg4
-	i32.add 	$push0=, $4, $pop34
+	i32.const	$push30=, arg4
+	i32.add 	$push0=, $4, $pop30
 	i32.store8	0($pop0), $4
-	i32.const	$push33=, 255
-	i32.and 	$push32=, $4, $pop33
-	tee_local	$push31=, $0=, $pop32
-	i32.store	0($2), $pop31
+	i32.const	$push29=, 255
+	i32.and 	$0=, $4, $pop29
+	i32.store	0($2), $0
 	i32.store16	0($3), $0
 	i64.extend_u/i32	$push1=, $4
-	i64.const	$push30=, 255
-	i64.and 	$push2=, $pop1, $pop30
+	i64.const	$push28=, 255
+	i64.and 	$push2=, $pop1, $pop28
 	i64.store	0($1), $pop2
-	i32.const	$push29=, 8
-	i32.add 	$1=, $1, $pop29
-	i32.const	$push28=, 4
-	i32.add 	$2=, $2, $pop28
-	i32.const	$push27=, 2
-	i32.add 	$3=, $3, $pop27
-	i32.const	$push26=, 1
-	i32.add 	$push25=, $4, $pop26
-	tee_local	$push24=, $4=, $pop25
+	i32.const	$push27=, 8
+	i32.add 	$1=, $1, $pop27
+	i32.const	$push26=, 4
+	i32.add 	$2=, $2, $pop26
+	i32.const	$push25=, 2
+	i32.add 	$3=, $3, $pop25
+	i32.const	$push24=, 1
+	i32.add 	$4=, $4, $pop24
 	i32.const	$push23=, 96
-	i32.ne  	$push3=, $pop24, $pop23
+	i32.ne  	$push3=, $4, $pop23
 	br_if   	0, $pop3        # 0: up to label1
-# BB#2:                                 # %for.body.i.preheader
+# %bb.2:                                # %for.body.i.preheader
 	end_loop
-	i32.const	$4=, result
-	i32.const	$3=, arg3
-	i32.const	$2=, arg2
-	i32.const	$1=, -192
+	i32.const	$3=, result
+	i32.const	$2=, arg3
+	i32.const	$1=, arg2
+	i32.const	$4=, -192
 .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)
-	tee_local	$push48=, $0=, $pop49
-	i32.const	$push47=, 1
-	i32.const	$push46=, 1
-	i32.lt_s	$push5=, $0, $pop46
-	i32.select	$push6=, $pop48, $pop47, $pop5
-	i32.load	$push7=, 0($2)
-	i32.const	$push45=, 31
-	i32.and 	$push8=, $pop7, $pop45
+	i32.const	$push42=, arg1+192
+	i32.add 	$push4=, $4, $pop42
+	i32.load16_s	$0=, 0($pop4)
+	i64.load	$push15=, 0($2)
+	i32.const	$push41=, 1
+	i32.const	$push40=, 1
+	i32.lt_s	$push5=, $0, $pop40
+	i32.select	$push6=, $0, $pop41, $pop5
+	i32.load	$push7=, 0($1)
+	i32.const	$push39=, 31
+	i32.and 	$push8=, $pop7, $pop39
 	i32.shr_s	$push9=, $pop6, $pop8
-	i32.const	$push44=, 1
-	i32.xor 	$push10=, $pop9, $pop44
-	i32.const	$push43=, 32
-	i32.add 	$push11=, $pop10, $pop43
-	i32.const	$push42=, 7
-	i32.shr_u	$push12=, $pop11, $pop42
-	i32.const	$push41=, 251
-	i32.or  	$push13=, $pop12, $pop41
+	i32.const	$push38=, 1
+	i32.xor 	$push10=, $pop9, $pop38
+	i32.const	$push37=, 32
+	i32.add 	$push11=, $pop10, $pop37
+	i32.const	$push36=, 7
+	i32.shr_u	$push12=, $pop11, $pop36
+	i32.const	$push35=, 251
+	i32.or  	$push13=, $pop12, $pop35
 	i64.extend_u/i32	$push14=, $pop13
 	i64.and 	$push16=, $pop15, $pop14
-	i64.store8	0($4), $pop16
-	i32.const	$push40=, 4
-	i32.add 	$2=, $2, $pop40
-	i32.const	$push39=, 8
-	i32.add 	$3=, $3, $pop39
-	i32.const	$push38=, 1
-	i32.add 	$4=, $4, $pop38
-	i32.const	$push37=, 2
-	i32.add 	$push36=, $1, $pop37
-	tee_local	$push35=, $1=, $pop36
-	br_if   	0, $pop35       # 0: up to label2
-# BB#4:                                 # %for.body10.preheader
+	i64.store8	0($3), $pop16
+	i32.const	$push34=, 2
+	i32.add 	$4=, $4, $pop34
+	i32.const	$push33=, 4
+	i32.add 	$1=, $1, $pop33
+	i32.const	$push32=, 8
+	i32.add 	$2=, $2, $pop32
+	i32.const	$push31=, 1
+	i32.add 	$3=, $3, $pop31
+	br_if   	0, $4           # 0: up to label2
+# %bb.4:                                # %for.body10.preheader
 	end_loop
-	i32.const	$4=, -1
+	i32.const	$4=, 0
 	i32.const	$3=, .Lmain.correct
 .LBB1_5:                                # %for.body10
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
 	i32.load	$push19=, 0($3)
-	i32.const	$push51=, result+1
-	i32.add 	$push17=, $4, $pop51
+	i32.const	$push43=, result
+	i32.add 	$push17=, $4, $pop43
 	i32.load8_s	$push18=, 0($pop17)
 	i32.ne  	$push20=, $pop19, $pop18
 	br_if   	1, $pop20       # 1: down to label3
-# BB#6:                                 # %for.cond7
+# %bb.6:                                # %for.cond7
                                         #   in Loop: Header=BB1_5 Depth=1
-	i32.const	$push56=, 4
-	i32.add 	$3=, $3, $pop56
-	i32.const	$push55=, 1
-	i32.add 	$push54=, $4, $pop55
-	tee_local	$push53=, $4=, $pop54
-	i32.const	$push52=, 94
-	i32.le_u	$push21=, $pop53, $pop52
+	i32.const	$push46=, 1
+	i32.add 	$4=, $4, $pop46
+	i32.const	$push45=, 4
+	i32.add 	$3=, $3, $pop45
+	i32.const	$push44=, 95
+	i32.le_u	$push21=, $4, $pop44
 	br_if   	0, $pop21       # 0: up to label4
-# BB#7:                                 # %for.end18
+# %bb.7:                                # %for.end18
 	end_loop
 	i32.const	$push22=, 0
 	return  	$pop22
@@ -320,5 +313,5 @@ result:
 	.size	result, 96
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/multdi-1.c.s b/test/torture-s/multdi-1.c.s
index a4d5970e3..0c8dfcfb8 100644
--- a/test/torture-s/multdi-1.c.s
+++ b/test/torture-s/multdi-1.c.s
@@ -7,7 +7,7 @@
 mpy:                                    # @mpy
 	.param  	i32, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.extend_s/i32	$push1=, $1
 	i64.extend_s/i32	$push0=, $0
 	i64.mul 	$push2=, $pop1, $pop0
@@ -22,7 +22,7 @@ mpy:                                    # @mpy
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, -1
 	i64.store	mpy_res($pop1), $pop0
@@ -42,4 +42,4 @@ mpy_res:
 	.size	mpy_res, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/multi-ix.c.s b/test/torture-s/multi-ix.c.s
index a71003332..c6c06ed9d 100644
--- a/test/torture-s/multi-ix.c.s
+++ b/test/torture-s/multi-ix.c.s
@@ -7,271 +7,270 @@
 f:                                      # @f
 	.param  	i32
 	.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
+# %bb.0:                                # %entry
 	i32.const	$push191=, 0
 	i32.load	$push190=, __stack_pointer($pop191)
 	i32.const	$push192=, 80480
-	i32.sub 	$push666=, $pop190, $pop192
-	tee_local	$push665=, $41=, $pop666
-	i32.store	__stack_pointer($pop193), $pop665
+	i32.sub 	$41=, $pop190, $pop192
+	i32.const	$push193=, 0
+	i32.store	__stack_pointer($pop193), $41
 	block   	
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.const	$push197=, 320
 	i32.add 	$push198=, $41, $pop197
-	i32.const	$push820=, 156
-	i32.add 	$push2=, $pop198, $pop820
+	i32.const	$push816=, 156
+	i32.add 	$push2=, $pop198, $pop816
 	i32.const	$push199=, 480
 	i32.add 	$push200=, $41, $pop199
 	i32.store	0($pop2), $pop200
 	i32.const	$push201=, 320
 	i32.add 	$push202=, $41, $pop201
-	i32.const	$push819=, 152
-	i32.add 	$push3=, $pop202, $pop819
+	i32.const	$push815=, 152
+	i32.add 	$push3=, $pop202, $pop815
 	i32.const	$push203=, 2480
 	i32.add 	$push204=, $41, $pop203
 	i32.store	0($pop3), $pop204
 	i32.const	$push205=, 320
 	i32.add 	$push206=, $41, $pop205
-	i32.const	$push818=, 148
-	i32.add 	$push4=, $pop206, $pop818
+	i32.const	$push814=, 148
+	i32.add 	$push4=, $pop206, $pop814
 	i32.const	$push207=, 4480
 	i32.add 	$push208=, $41, $pop207
 	i32.store	0($pop4), $pop208
 	i32.const	$push209=, 320
 	i32.add 	$push210=, $41, $pop209
-	i32.const	$push817=, 144
-	i32.add 	$push5=, $pop210, $pop817
+	i32.const	$push813=, 144
+	i32.add 	$push5=, $pop210, $pop813
 	i32.const	$push211=, 6480
 	i32.add 	$push212=, $41, $pop211
 	i32.store	0($pop5), $pop212
 	i32.const	$push213=, 320
 	i32.add 	$push214=, $41, $pop213
-	i32.const	$push816=, 140
-	i32.add 	$push6=, $pop214, $pop816
+	i32.const	$push812=, 140
+	i32.add 	$push6=, $pop214, $pop812
 	i32.const	$push215=, 8480
 	i32.add 	$push216=, $41, $pop215
 	i32.store	0($pop6), $pop216
 	i32.const	$push217=, 320
 	i32.add 	$push218=, $41, $pop217
-	i32.const	$push815=, 136
-	i32.add 	$push7=, $pop218, $pop815
+	i32.const	$push811=, 136
+	i32.add 	$push7=, $pop218, $pop811
 	i32.const	$push219=, 10480
 	i32.add 	$push220=, $41, $pop219
 	i32.store	0($pop7), $pop220
 	i32.const	$push221=, 320
 	i32.add 	$push222=, $41, $pop221
-	i32.const	$push814=, 132
-	i32.add 	$push8=, $pop222, $pop814
+	i32.const	$push810=, 132
+	i32.add 	$push8=, $pop222, $pop810
 	i32.const	$push223=, 12480
 	i32.add 	$push224=, $41, $pop223
 	i32.store	0($pop8), $pop224
 	i32.const	$push225=, 320
 	i32.add 	$push226=, $41, $pop225
-	i32.const	$push813=, 128
-	i32.add 	$push9=, $pop226, $pop813
+	i32.const	$push809=, 128
+	i32.add 	$push9=, $pop226, $pop809
 	i32.const	$push227=, 14480
 	i32.add 	$push228=, $41, $pop227
 	i32.store	0($pop9), $pop228
 	i32.const	$push229=, 320
 	i32.add 	$push230=, $41, $pop229
-	i32.const	$push812=, 124
-	i32.add 	$push10=, $pop230, $pop812
+	i32.const	$push808=, 124
+	i32.add 	$push10=, $pop230, $pop808
 	i32.const	$push231=, 16480
 	i32.add 	$push232=, $41, $pop231
 	i32.store	0($pop10), $pop232
 	i32.const	$push233=, 320
 	i32.add 	$push234=, $41, $pop233
-	i32.const	$push811=, 120
-	i32.add 	$push11=, $pop234, $pop811
+	i32.const	$push807=, 120
+	i32.add 	$push11=, $pop234, $pop807
 	i32.const	$push235=, 18480
 	i32.add 	$push236=, $41, $pop235
 	i32.store	0($pop11), $pop236
 	i32.const	$push237=, 320
 	i32.add 	$push238=, $41, $pop237
-	i32.const	$push810=, 116
-	i32.add 	$push12=, $pop238, $pop810
+	i32.const	$push806=, 116
+	i32.add 	$push12=, $pop238, $pop806
 	i32.const	$push239=, 20480
 	i32.add 	$push240=, $41, $pop239
 	i32.store	0($pop12), $pop240
 	i32.const	$push241=, 320
 	i32.add 	$push242=, $41, $pop241
-	i32.const	$push809=, 112
-	i32.add 	$push13=, $pop242, $pop809
+	i32.const	$push805=, 112
+	i32.add 	$push13=, $pop242, $pop805
 	i32.const	$push243=, 22480
 	i32.add 	$push244=, $41, $pop243
 	i32.store	0($pop13), $pop244
 	i32.const	$push245=, 320
 	i32.add 	$push246=, $41, $pop245
-	i32.const	$push808=, 108
-	i32.add 	$push14=, $pop246, $pop808
+	i32.const	$push804=, 108
+	i32.add 	$push14=, $pop246, $pop804
 	i32.const	$push247=, 24480
 	i32.add 	$push248=, $41, $pop247
 	i32.store	0($pop14), $pop248
 	i32.const	$push249=, 320
 	i32.add 	$push250=, $41, $pop249
-	i32.const	$push807=, 104
-	i32.add 	$push15=, $pop250, $pop807
+	i32.const	$push803=, 104
+	i32.add 	$push15=, $pop250, $pop803
 	i32.const	$push251=, 26480
 	i32.add 	$push252=, $41, $pop251
 	i32.store	0($pop15), $pop252
 	i32.const	$push253=, 320
 	i32.add 	$push254=, $41, $pop253
-	i32.const	$push806=, 100
-	i32.add 	$push16=, $pop254, $pop806
+	i32.const	$push802=, 100
+	i32.add 	$push16=, $pop254, $pop802
 	i32.const	$push255=, 28480
 	i32.add 	$push256=, $41, $pop255
 	i32.store	0($pop16), $pop256
 	i32.const	$push257=, 320
 	i32.add 	$push258=, $41, $pop257
-	i32.const	$push805=, 96
-	i32.add 	$push17=, $pop258, $pop805
+	i32.const	$push801=, 96
+	i32.add 	$push17=, $pop258, $pop801
 	i32.const	$push259=, 30480
 	i32.add 	$push260=, $41, $pop259
 	i32.store	0($pop17), $pop260
 	i32.const	$push261=, 320
 	i32.add 	$push262=, $41, $pop261
-	i32.const	$push804=, 92
-	i32.add 	$push18=, $pop262, $pop804
+	i32.const	$push800=, 92
+	i32.add 	$push18=, $pop262, $pop800
 	i32.const	$push263=, 32480
 	i32.add 	$push264=, $41, $pop263
 	i32.store	0($pop18), $pop264
 	i32.const	$push265=, 320
 	i32.add 	$push266=, $41, $pop265
-	i32.const	$push803=, 88
-	i32.add 	$push19=, $pop266, $pop803
+	i32.const	$push799=, 88
+	i32.add 	$push19=, $pop266, $pop799
 	i32.const	$push267=, 34480
 	i32.add 	$push268=, $41, $pop267
 	i32.store	0($pop19), $pop268
 	i32.const	$push269=, 320
 	i32.add 	$push270=, $41, $pop269
-	i32.const	$push802=, 84
-	i32.add 	$push20=, $pop270, $pop802
+	i32.const	$push798=, 84
+	i32.add 	$push20=, $pop270, $pop798
 	i32.const	$push271=, 36480
 	i32.add 	$push272=, $41, $pop271
 	i32.store	0($pop20), $pop272
 	i32.const	$push273=, 320
 	i32.add 	$push274=, $41, $pop273
-	i32.const	$push801=, 80
-	i32.add 	$push21=, $pop274, $pop801
+	i32.const	$push797=, 80
+	i32.add 	$push21=, $pop274, $pop797
 	i32.const	$push275=, 38480
 	i32.add 	$push276=, $41, $pop275
 	i32.store	0($pop21), $pop276
 	i32.const	$push277=, 320
 	i32.add 	$push278=, $41, $pop277
-	i32.const	$push800=, 76
-	i32.add 	$push22=, $pop278, $pop800
+	i32.const	$push796=, 76
+	i32.add 	$push22=, $pop278, $pop796
 	i32.const	$push279=, 40480
 	i32.add 	$push280=, $41, $pop279
 	i32.store	0($pop22), $pop280
 	i32.const	$push281=, 320
 	i32.add 	$push282=, $41, $pop281
-	i32.const	$push799=, 72
-	i32.add 	$push23=, $pop282, $pop799
+	i32.const	$push795=, 72
+	i32.add 	$push23=, $pop282, $pop795
 	i32.const	$push283=, 42480
 	i32.add 	$push284=, $41, $pop283
 	i32.store	0($pop23), $pop284
 	i32.const	$push285=, 320
 	i32.add 	$push286=, $41, $pop285
-	i32.const	$push798=, 68
-	i32.add 	$push24=, $pop286, $pop798
+	i32.const	$push794=, 68
+	i32.add 	$push24=, $pop286, $pop794
 	i32.const	$push287=, 44480
 	i32.add 	$push288=, $41, $pop287
 	i32.store	0($pop24), $pop288
 	i32.const	$push289=, 320
 	i32.add 	$push290=, $41, $pop289
-	i32.const	$push797=, 64
-	i32.add 	$push25=, $pop290, $pop797
+	i32.const	$push793=, 64
+	i32.add 	$push25=, $pop290, $pop793
 	i32.const	$push291=, 46480
 	i32.add 	$push292=, $41, $pop291
 	i32.store	0($pop25), $pop292
 	i32.const	$push293=, 320
 	i32.add 	$push294=, $41, $pop293
-	i32.const	$push796=, 60
-	i32.add 	$push26=, $pop294, $pop796
+	i32.const	$push792=, 60
+	i32.add 	$push26=, $pop294, $pop792
 	i32.const	$push295=, 48480
 	i32.add 	$push296=, $41, $pop295
 	i32.store	0($pop26), $pop296
 	i32.const	$push297=, 320
 	i32.add 	$push298=, $41, $pop297
-	i32.const	$push795=, 56
-	i32.add 	$push27=, $pop298, $pop795
+	i32.const	$push791=, 56
+	i32.add 	$push27=, $pop298, $pop791
 	i32.const	$push299=, 50480
 	i32.add 	$push300=, $41, $pop299
 	i32.store	0($pop27), $pop300
 	i32.const	$push301=, 320
 	i32.add 	$push302=, $41, $pop301
-	i32.const	$push794=, 52
-	i32.add 	$push28=, $pop302, $pop794
+	i32.const	$push790=, 52
+	i32.add 	$push28=, $pop302, $pop790
 	i32.const	$push303=, 52480
 	i32.add 	$push304=, $41, $pop303
 	i32.store	0($pop28), $pop304
 	i32.const	$push305=, 320
 	i32.add 	$push306=, $41, $pop305
-	i32.const	$push793=, 48
-	i32.add 	$push29=, $pop306, $pop793
+	i32.const	$push789=, 48
+	i32.add 	$push29=, $pop306, $pop789
 	i32.const	$push307=, 54480
 	i32.add 	$push308=, $41, $pop307
 	i32.store	0($pop29), $pop308
 	i32.const	$push309=, 320
 	i32.add 	$push310=, $41, $pop309
-	i32.const	$push792=, 44
-	i32.add 	$push30=, $pop310, $pop792
+	i32.const	$push788=, 44
+	i32.add 	$push30=, $pop310, $pop788
 	i32.const	$push311=, 56480
 	i32.add 	$push312=, $41, $pop311
 	i32.store	0($pop30), $pop312
 	i32.const	$push313=, 320
 	i32.add 	$push314=, $41, $pop313
-	i32.const	$push791=, 40
-	i32.add 	$push31=, $pop314, $pop791
+	i32.const	$push787=, 40
+	i32.add 	$push31=, $pop314, $pop787
 	i32.const	$push315=, 58480
 	i32.add 	$push316=, $41, $pop315
 	i32.store	0($pop31), $pop316
 	i32.const	$push317=, 320
 	i32.add 	$push318=, $41, $pop317
-	i32.const	$push790=, 36
-	i32.add 	$push32=, $pop318, $pop790
+	i32.const	$push786=, 36
+	i32.add 	$push32=, $pop318, $pop786
 	i32.const	$push319=, 60480
 	i32.add 	$push320=, $41, $pop319
 	i32.store	0($pop32), $pop320
 	i32.const	$push321=, 320
 	i32.add 	$push322=, $41, $pop321
-	i32.const	$push789=, 32
-	i32.add 	$push33=, $pop322, $pop789
+	i32.const	$push785=, 32
+	i32.add 	$push33=, $pop322, $pop785
 	i32.const	$push323=, 62480
 	i32.add 	$push324=, $41, $pop323
 	i32.store	0($pop33), $pop324
 	i32.const	$push325=, 320
 	i32.add 	$push326=, $41, $pop325
-	i32.const	$push788=, 28
-	i32.add 	$push34=, $pop326, $pop788
+	i32.const	$push784=, 28
+	i32.add 	$push34=, $pop326, $pop784
 	i32.const	$push327=, 64480
 	i32.add 	$push328=, $41, $pop327
 	i32.store	0($pop34), $pop328
 	i32.const	$push329=, 320
 	i32.add 	$push330=, $41, $pop329
-	i32.const	$push787=, 24
-	i32.add 	$push35=, $pop330, $pop787
+	i32.const	$push783=, 24
+	i32.add 	$push35=, $pop330, $pop783
 	i32.const	$push331=, 66480
 	i32.add 	$push332=, $41, $pop331
 	i32.store	0($pop35), $pop332
 	i32.const	$push333=, 320
 	i32.add 	$push334=, $41, $pop333
-	i32.const	$push786=, 20
-	i32.add 	$push36=, $pop334, $pop786
+	i32.const	$push782=, 20
+	i32.add 	$push36=, $pop334, $pop782
 	i32.const	$push335=, 68480
 	i32.add 	$push336=, $41, $pop335
 	i32.store	0($pop36), $pop336
 	i32.const	$push337=, 320
 	i32.add 	$push338=, $41, $pop337
-	i32.const	$push785=, 16
-	i32.add 	$push37=, $pop338, $pop785
+	i32.const	$push781=, 16
+	i32.add 	$push37=, $pop338, $pop781
 	i32.const	$push339=, 70480
 	i32.add 	$push340=, $41, $pop339
 	i32.store	0($pop37), $pop340
@@ -287,10 +286,10 @@ f:                                      # @f
 	i32.const	$push347=, 78480
 	i32.add 	$push348=, $41, $pop347
 	i32.store	320($41), $pop348
-	i32.const	$push784=, 40
+	i32.const	$push780=, 40
 	i32.const	$push349=, 320
 	i32.add 	$push350=, $41, $pop349
-	call    	s@FUNCTION, $pop784, $pop350
+	call    	s@FUNCTION, $pop780, $pop350
 	i32.load	$1=, 2480($41)
 	i32.load	$2=, 480($41)
 	i32.load	$3=, 4480($41)
@@ -333,253 +332,253 @@ f:                                      # @f
 	i32.load	$40=, 76480($41)
 	i32.const	$push351=, 160
 	i32.add 	$push352=, $41, $pop351
-	i32.const	$push783=, 156
-	i32.add 	$push38=, $pop352, $pop783
+	i32.const	$push779=, 156
+	i32.add 	$push38=, $pop352, $pop779
 	i32.const	$push353=, 480
 	i32.add 	$push354=, $41, $pop353
 	i32.store	0($pop38), $pop354
 	i32.const	$push355=, 160
 	i32.add 	$push356=, $41, $pop355
-	i32.const	$push782=, 152
-	i32.add 	$push39=, $pop356, $pop782
+	i32.const	$push778=, 152
+	i32.add 	$push39=, $pop356, $pop778
 	i32.const	$push357=, 2480
 	i32.add 	$push358=, $41, $pop357
 	i32.store	0($pop39), $pop358
 	i32.const	$push359=, 160
 	i32.add 	$push360=, $41, $pop359
-	i32.const	$push781=, 148
-	i32.add 	$push40=, $pop360, $pop781
+	i32.const	$push777=, 148
+	i32.add 	$push40=, $pop360, $pop777
 	i32.const	$push361=, 4480
 	i32.add 	$push362=, $41, $pop361
 	i32.store	0($pop40), $pop362
 	i32.const	$push363=, 160
 	i32.add 	$push364=, $41, $pop363
-	i32.const	$push780=, 144
-	i32.add 	$push41=, $pop364, $pop780
+	i32.const	$push776=, 144
+	i32.add 	$push41=, $pop364, $pop776
 	i32.const	$push365=, 6480
 	i32.add 	$push366=, $41, $pop365
 	i32.store	0($pop41), $pop366
 	i32.const	$push367=, 160
 	i32.add 	$push368=, $41, $pop367
-	i32.const	$push779=, 140
-	i32.add 	$push42=, $pop368, $pop779
+	i32.const	$push775=, 140
+	i32.add 	$push42=, $pop368, $pop775
 	i32.const	$push369=, 8480
 	i32.add 	$push370=, $41, $pop369
 	i32.store	0($pop42), $pop370
 	i32.const	$push371=, 160
 	i32.add 	$push372=, $41, $pop371
-	i32.const	$push778=, 136
-	i32.add 	$push43=, $pop372, $pop778
+	i32.const	$push774=, 136
+	i32.add 	$push43=, $pop372, $pop774
 	i32.const	$push373=, 10480
 	i32.add 	$push374=, $41, $pop373
 	i32.store	0($pop43), $pop374
 	i32.const	$push375=, 160
 	i32.add 	$push376=, $41, $pop375
-	i32.const	$push777=, 132
-	i32.add 	$push44=, $pop376, $pop777
+	i32.const	$push773=, 132
+	i32.add 	$push44=, $pop376, $pop773
 	i32.const	$push377=, 12480
 	i32.add 	$push378=, $41, $pop377
 	i32.store	0($pop44), $pop378
 	i32.const	$push379=, 160
 	i32.add 	$push380=, $41, $pop379
-	i32.const	$push776=, 128
-	i32.add 	$push45=, $pop380, $pop776
+	i32.const	$push772=, 128
+	i32.add 	$push45=, $pop380, $pop772
 	i32.const	$push381=, 14480
 	i32.add 	$push382=, $41, $pop381
 	i32.store	0($pop45), $pop382
 	i32.const	$push383=, 160
 	i32.add 	$push384=, $41, $pop383
-	i32.const	$push775=, 124
-	i32.add 	$push46=, $pop384, $pop775
+	i32.const	$push771=, 124
+	i32.add 	$push46=, $pop384, $pop771
 	i32.const	$push385=, 16480
 	i32.add 	$push386=, $41, $pop385
 	i32.store	0($pop46), $pop386
 	i32.const	$push387=, 160
 	i32.add 	$push388=, $41, $pop387
-	i32.const	$push774=, 120
-	i32.add 	$push47=, $pop388, $pop774
+	i32.const	$push770=, 120
+	i32.add 	$push47=, $pop388, $pop770
 	i32.const	$push389=, 18480
 	i32.add 	$push390=, $41, $pop389
 	i32.store	0($pop47), $pop390
 	i32.const	$push391=, 160
 	i32.add 	$push392=, $41, $pop391
-	i32.const	$push773=, 116
-	i32.add 	$push48=, $pop392, $pop773
+	i32.const	$push769=, 116
+	i32.add 	$push48=, $pop392, $pop769
 	i32.const	$push393=, 20480
 	i32.add 	$push394=, $41, $pop393
 	i32.store	0($pop48), $pop394
 	i32.const	$push395=, 160
 	i32.add 	$push396=, $41, $pop395
-	i32.const	$push772=, 112
-	i32.add 	$push49=, $pop396, $pop772
+	i32.const	$push768=, 112
+	i32.add 	$push49=, $pop396, $pop768
 	i32.const	$push397=, 22480
 	i32.add 	$push398=, $41, $pop397
 	i32.store	0($pop49), $pop398
 	i32.const	$push399=, 160
 	i32.add 	$push400=, $41, $pop399
-	i32.const	$push771=, 108
-	i32.add 	$push50=, $pop400, $pop771
+	i32.const	$push767=, 108
+	i32.add 	$push50=, $pop400, $pop767
 	i32.const	$push401=, 24480
 	i32.add 	$push402=, $41, $pop401
 	i32.store	0($pop50), $pop402
 	i32.const	$push403=, 160
 	i32.add 	$push404=, $41, $pop403
-	i32.const	$push770=, 104
-	i32.add 	$push51=, $pop404, $pop770
+	i32.const	$push766=, 104
+	i32.add 	$push51=, $pop404, $pop766
 	i32.const	$push405=, 26480
 	i32.add 	$push406=, $41, $pop405
 	i32.store	0($pop51), $pop406
 	i32.const	$push407=, 160
 	i32.add 	$push408=, $41, $pop407
-	i32.const	$push769=, 100
-	i32.add 	$push52=, $pop408, $pop769
+	i32.const	$push765=, 100
+	i32.add 	$push52=, $pop408, $pop765
 	i32.const	$push409=, 28480
 	i32.add 	$push410=, $41, $pop409
 	i32.store	0($pop52), $pop410
 	i32.const	$push411=, 160
 	i32.add 	$push412=, $41, $pop411
-	i32.const	$push768=, 96
-	i32.add 	$push53=, $pop412, $pop768
+	i32.const	$push764=, 96
+	i32.add 	$push53=, $pop412, $pop764
 	i32.const	$push413=, 30480
 	i32.add 	$push414=, $41, $pop413
 	i32.store	0($pop53), $pop414
 	i32.const	$push415=, 160
 	i32.add 	$push416=, $41, $pop415
-	i32.const	$push767=, 92
-	i32.add 	$push54=, $pop416, $pop767
+	i32.const	$push763=, 92
+	i32.add 	$push54=, $pop416, $pop763
 	i32.const	$push417=, 32480
 	i32.add 	$push418=, $41, $pop417
 	i32.store	0($pop54), $pop418
 	i32.const	$push419=, 160
 	i32.add 	$push420=, $41, $pop419
-	i32.const	$push766=, 88
-	i32.add 	$push55=, $pop420, $pop766
+	i32.const	$push762=, 88
+	i32.add 	$push55=, $pop420, $pop762
 	i32.const	$push421=, 34480
 	i32.add 	$push422=, $41, $pop421
 	i32.store	0($pop55), $pop422
 	i32.const	$push423=, 160
 	i32.add 	$push424=, $41, $pop423
-	i32.const	$push765=, 84
-	i32.add 	$push56=, $pop424, $pop765
+	i32.const	$push761=, 84
+	i32.add 	$push56=, $pop424, $pop761
 	i32.const	$push425=, 36480
 	i32.add 	$push426=, $41, $pop425
 	i32.store	0($pop56), $pop426
 	i32.const	$push427=, 160
 	i32.add 	$push428=, $41, $pop427
-	i32.const	$push764=, 80
-	i32.add 	$push57=, $pop428, $pop764
+	i32.const	$push760=, 80
+	i32.add 	$push57=, $pop428, $pop760
 	i32.const	$push429=, 38480
 	i32.add 	$push430=, $41, $pop429
 	i32.store	0($pop57), $pop430
 	i32.const	$push431=, 160
 	i32.add 	$push432=, $41, $pop431
-	i32.const	$push763=, 76
-	i32.add 	$push58=, $pop432, $pop763
+	i32.const	$push759=, 76
+	i32.add 	$push58=, $pop432, $pop759
 	i32.const	$push433=, 40480
 	i32.add 	$push434=, $41, $pop433
 	i32.store	0($pop58), $pop434
 	i32.const	$push435=, 160
 	i32.add 	$push436=, $41, $pop435
-	i32.const	$push762=, 72
-	i32.add 	$push59=, $pop436, $pop762
+	i32.const	$push758=, 72
+	i32.add 	$push59=, $pop436, $pop758
 	i32.const	$push437=, 42480
 	i32.add 	$push438=, $41, $pop437
 	i32.store	0($pop59), $pop438
 	i32.const	$push439=, 160
 	i32.add 	$push440=, $41, $pop439
-	i32.const	$push761=, 68
-	i32.add 	$push60=, $pop440, $pop761
+	i32.const	$push757=, 68
+	i32.add 	$push60=, $pop440, $pop757
 	i32.const	$push441=, 44480
 	i32.add 	$push442=, $41, $pop441
 	i32.store	0($pop60), $pop442
 	i32.const	$push443=, 160
 	i32.add 	$push444=, $41, $pop443
-	i32.const	$push760=, 64
-	i32.add 	$push61=, $pop444, $pop760
+	i32.const	$push756=, 64
+	i32.add 	$push61=, $pop444, $pop756
 	i32.const	$push445=, 46480
 	i32.add 	$push446=, $41, $pop445
 	i32.store	0($pop61), $pop446
 	i32.const	$push447=, 160
 	i32.add 	$push448=, $41, $pop447
-	i32.const	$push759=, 60
-	i32.add 	$push62=, $pop448, $pop759
+	i32.const	$push755=, 60
+	i32.add 	$push62=, $pop448, $pop755
 	i32.const	$push449=, 48480
 	i32.add 	$push450=, $41, $pop449
 	i32.store	0($pop62), $pop450
 	i32.const	$push451=, 160
 	i32.add 	$push452=, $41, $pop451
-	i32.const	$push758=, 56
-	i32.add 	$push63=, $pop452, $pop758
+	i32.const	$push754=, 56
+	i32.add 	$push63=, $pop452, $pop754
 	i32.const	$push453=, 50480
 	i32.add 	$push454=, $41, $pop453
 	i32.store	0($pop63), $pop454
 	i32.const	$push455=, 160
 	i32.add 	$push456=, $41, $pop455
-	i32.const	$push757=, 52
-	i32.add 	$push64=, $pop456, $pop757
+	i32.const	$push753=, 52
+	i32.add 	$push64=, $pop456, $pop753
 	i32.const	$push457=, 52480
 	i32.add 	$push458=, $41, $pop457
 	i32.store	0($pop64), $pop458
 	i32.const	$push459=, 160
 	i32.add 	$push460=, $41, $pop459
-	i32.const	$push756=, 48
-	i32.add 	$push65=, $pop460, $pop756
+	i32.const	$push752=, 48
+	i32.add 	$push65=, $pop460, $pop752
 	i32.const	$push461=, 54480
 	i32.add 	$push462=, $41, $pop461
 	i32.store	0($pop65), $pop462
 	i32.const	$push463=, 160
 	i32.add 	$push464=, $41, $pop463
-	i32.const	$push755=, 44
-	i32.add 	$push66=, $pop464, $pop755
+	i32.const	$push751=, 44
+	i32.add 	$push66=, $pop464, $pop751
 	i32.const	$push465=, 56480
 	i32.add 	$push466=, $41, $pop465
 	i32.store	0($pop66), $pop466
 	i32.const	$push467=, 160
 	i32.add 	$push468=, $41, $pop467
-	i32.const	$push754=, 40
-	i32.add 	$push67=, $pop468, $pop754
+	i32.const	$push750=, 40
+	i32.add 	$push67=, $pop468, $pop750
 	i32.const	$push469=, 58480
 	i32.add 	$push470=, $41, $pop469
 	i32.store	0($pop67), $pop470
 	i32.const	$push471=, 160
 	i32.add 	$push472=, $41, $pop471
-	i32.const	$push753=, 36
-	i32.add 	$push68=, $pop472, $pop753
+	i32.const	$push749=, 36
+	i32.add 	$push68=, $pop472, $pop749
 	i32.const	$push473=, 60480
 	i32.add 	$push474=, $41, $pop473
 	i32.store	0($pop68), $pop474
 	i32.const	$push475=, 160
 	i32.add 	$push476=, $41, $pop475
-	i32.const	$push752=, 32
-	i32.add 	$push69=, $pop476, $pop752
+	i32.const	$push748=, 32
+	i32.add 	$push69=, $pop476, $pop748
 	i32.const	$push477=, 62480
 	i32.add 	$push478=, $41, $pop477
 	i32.store	0($pop69), $pop478
 	i32.const	$push479=, 160
 	i32.add 	$push480=, $41, $pop479
-	i32.const	$push751=, 28
-	i32.add 	$push70=, $pop480, $pop751
+	i32.const	$push747=, 28
+	i32.add 	$push70=, $pop480, $pop747
 	i32.const	$push481=, 64480
 	i32.add 	$push482=, $41, $pop481
 	i32.store	0($pop70), $pop482
 	i32.const	$push483=, 160
 	i32.add 	$push484=, $41, $pop483
-	i32.const	$push750=, 24
-	i32.add 	$push71=, $pop484, $pop750
+	i32.const	$push746=, 24
+	i32.add 	$push71=, $pop484, $pop746
 	i32.const	$push485=, 66480
 	i32.add 	$push486=, $41, $pop485
 	i32.store	0($pop71), $pop486
 	i32.const	$push487=, 160
 	i32.add 	$push488=, $41, $pop487
-	i32.const	$push749=, 20
-	i32.add 	$push72=, $pop488, $pop749
+	i32.const	$push745=, 20
+	i32.add 	$push72=, $pop488, $pop745
 	i32.const	$push489=, 68480
 	i32.add 	$push490=, $41, $pop489
 	i32.store	0($pop72), $pop490
 	i32.const	$push491=, 160
 	i32.add 	$push492=, $41, $pop491
-	i32.const	$push748=, 16
-	i32.add 	$push73=, $pop492, $pop748
+	i32.const	$push744=, 16
+	i32.add 	$push73=, $pop492, $pop744
 	i32.const	$push493=, 70480
 	i32.add 	$push494=, $41, $pop493
 	i32.store	0($pop73), $pop494
@@ -595,427 +594,427 @@ f:                                      # @f
 	i32.const	$push501=, 78480
 	i32.add 	$push502=, $41, $pop501
 	i32.store	160($41), $pop502
-	i32.const	$push747=, 40
+	i32.const	$push743=, 40
 	i32.const	$push503=, 160
 	i32.add 	$push504=, $41, $pop503
-	call    	z@FUNCTION, $pop747, $pop504
+	call    	z@FUNCTION, $pop743, $pop504
 	i32.const	$push505=, 76480
 	i32.add 	$push506=, $41, $pop505
-	i32.const	$push746=, 2
-	i32.shl 	$push74=, $40, $pop746
+	i32.const	$push742=, 2
+	i32.shl 	$push74=, $40, $pop742
 	i32.add 	$push75=, $pop506, $pop74
 	i32.store	0($pop75), $40
 	i32.const	$push507=, 78480
 	i32.add 	$push508=, $41, $pop507
-	i32.const	$push745=, 2
-	i32.shl 	$push76=, $39, $pop745
+	i32.const	$push741=, 2
+	i32.shl 	$push76=, $39, $pop741
 	i32.add 	$push77=, $pop508, $pop76
 	i32.store	0($pop77), $39
 	i32.const	$push509=, 74480
 	i32.add 	$push510=, $41, $pop509
-	i32.const	$push744=, 2
-	i32.shl 	$push78=, $38, $pop744
+	i32.const	$push740=, 2
+	i32.shl 	$push78=, $38, $pop740
 	i32.add 	$push79=, $pop510, $pop78
 	i32.store	0($pop79), $38
 	i32.const	$push511=, 72480
 	i32.add 	$push512=, $41, $pop511
-	i32.const	$push743=, 2
-	i32.shl 	$push80=, $37, $pop743
+	i32.const	$push739=, 2
+	i32.shl 	$push80=, $37, $pop739
 	i32.add 	$push81=, $pop512, $pop80
 	i32.store	0($pop81), $37
 	i32.const	$push513=, 70480
 	i32.add 	$push514=, $41, $pop513
-	i32.const	$push742=, 2
-	i32.shl 	$push82=, $36, $pop742
+	i32.const	$push738=, 2
+	i32.shl 	$push82=, $36, $pop738
 	i32.add 	$push83=, $pop514, $pop82
 	i32.store	0($pop83), $36
 	i32.const	$push515=, 68480
 	i32.add 	$push516=, $41, $pop515
-	i32.const	$push741=, 2
-	i32.shl 	$push84=, $35, $pop741
+	i32.const	$push737=, 2
+	i32.shl 	$push84=, $35, $pop737
 	i32.add 	$push85=, $pop516, $pop84
 	i32.store	0($pop85), $35
 	i32.const	$push517=, 66480
 	i32.add 	$push518=, $41, $pop517
-	i32.const	$push740=, 2
-	i32.shl 	$push86=, $34, $pop740
+	i32.const	$push736=, 2
+	i32.shl 	$push86=, $34, $pop736
 	i32.add 	$push87=, $pop518, $pop86
 	i32.store	0($pop87), $34
 	i32.const	$push519=, 64480
 	i32.add 	$push520=, $41, $pop519
-	i32.const	$push739=, 2
-	i32.shl 	$push88=, $33, $pop739
+	i32.const	$push735=, 2
+	i32.shl 	$push88=, $33, $pop735
 	i32.add 	$push89=, $pop520, $pop88
 	i32.store	0($pop89), $33
 	i32.const	$push521=, 62480
 	i32.add 	$push522=, $41, $pop521
-	i32.const	$push738=, 2
-	i32.shl 	$push90=, $32, $pop738
+	i32.const	$push734=, 2
+	i32.shl 	$push90=, $32, $pop734
 	i32.add 	$push91=, $pop522, $pop90
 	i32.store	0($pop91), $32
 	i32.const	$push523=, 60480
 	i32.add 	$push524=, $41, $pop523
-	i32.const	$push737=, 2
-	i32.shl 	$push92=, $31, $pop737
+	i32.const	$push733=, 2
+	i32.shl 	$push92=, $31, $pop733
 	i32.add 	$push93=, $pop524, $pop92
 	i32.store	0($pop93), $31
 	i32.const	$push525=, 58480
 	i32.add 	$push526=, $41, $pop525
-	i32.const	$push736=, 2
-	i32.shl 	$push94=, $30, $pop736
+	i32.const	$push732=, 2
+	i32.shl 	$push94=, $30, $pop732
 	i32.add 	$push95=, $pop526, $pop94
 	i32.store	0($pop95), $30
 	i32.const	$push527=, 56480
 	i32.add 	$push528=, $41, $pop527
-	i32.const	$push735=, 2
-	i32.shl 	$push96=, $29, $pop735
+	i32.const	$push731=, 2
+	i32.shl 	$push96=, $29, $pop731
 	i32.add 	$push97=, $pop528, $pop96
 	i32.store	0($pop97), $29
 	i32.const	$push529=, 54480
 	i32.add 	$push530=, $41, $pop529
-	i32.const	$push734=, 2
-	i32.shl 	$push98=, $28, $pop734
+	i32.const	$push730=, 2
+	i32.shl 	$push98=, $28, $pop730
 	i32.add 	$push99=, $pop530, $pop98
 	i32.store	0($pop99), $28
 	i32.const	$push531=, 52480
 	i32.add 	$push532=, $41, $pop531
-	i32.const	$push733=, 2
-	i32.shl 	$push100=, $27, $pop733
+	i32.const	$push729=, 2
+	i32.shl 	$push100=, $27, $pop729
 	i32.add 	$push101=, $pop532, $pop100
 	i32.store	0($pop101), $27
 	i32.const	$push533=, 50480
 	i32.add 	$push534=, $41, $pop533
-	i32.const	$push732=, 2
-	i32.shl 	$push102=, $26, $pop732
+	i32.const	$push728=, 2
+	i32.shl 	$push102=, $26, $pop728
 	i32.add 	$push103=, $pop534, $pop102
 	i32.store	0($pop103), $26
 	i32.const	$push535=, 48480
 	i32.add 	$push536=, $41, $pop535
-	i32.const	$push731=, 2
-	i32.shl 	$push104=, $25, $pop731
+	i32.const	$push727=, 2
+	i32.shl 	$push104=, $25, $pop727
 	i32.add 	$push105=, $pop536, $pop104
 	i32.store	0($pop105), $25
 	i32.const	$push537=, 46480
 	i32.add 	$push538=, $41, $pop537
-	i32.const	$push730=, 2
-	i32.shl 	$push106=, $24, $pop730
+	i32.const	$push726=, 2
+	i32.shl 	$push106=, $24, $pop726
 	i32.add 	$push107=, $pop538, $pop106
 	i32.store	0($pop107), $24
 	i32.const	$push539=, 44480
 	i32.add 	$push540=, $41, $pop539
-	i32.const	$push729=, 2
-	i32.shl 	$push108=, $23, $pop729
+	i32.const	$push725=, 2
+	i32.shl 	$push108=, $23, $pop725
 	i32.add 	$push109=, $pop540, $pop108
 	i32.store	0($pop109), $23
 	i32.const	$push541=, 42480
 	i32.add 	$push542=, $41, $pop541
-	i32.const	$push728=, 2
-	i32.shl 	$push110=, $22, $pop728
+	i32.const	$push724=, 2
+	i32.shl 	$push110=, $22, $pop724
 	i32.add 	$push111=, $pop542, $pop110
 	i32.store	0($pop111), $22
 	i32.const	$push543=, 38480
 	i32.add 	$push544=, $41, $pop543
-	i32.const	$push727=, 2
-	i32.shl 	$push112=, $21, $pop727
+	i32.const	$push723=, 2
+	i32.shl 	$push112=, $21, $pop723
 	i32.add 	$push113=, $pop544, $pop112
 	i32.store	0($pop113), $21
 	i32.const	$push545=, 40480
 	i32.add 	$push546=, $41, $pop545
-	i32.const	$push726=, 2
-	i32.shl 	$push114=, $20, $pop726
+	i32.const	$push722=, 2
+	i32.shl 	$push114=, $20, $pop722
 	i32.add 	$push115=, $pop546, $pop114
 	i32.store	0($pop115), $20
 	i32.const	$push547=, 36480
 	i32.add 	$push548=, $41, $pop547
-	i32.const	$push725=, 2
-	i32.shl 	$push116=, $19, $pop725
+	i32.const	$push721=, 2
+	i32.shl 	$push116=, $19, $pop721
 	i32.add 	$push117=, $pop548, $pop116
 	i32.store	0($pop117), $19
 	i32.const	$push549=, 34480
 	i32.add 	$push550=, $41, $pop549
-	i32.const	$push724=, 2
-	i32.shl 	$push118=, $18, $pop724
+	i32.const	$push720=, 2
+	i32.shl 	$push118=, $18, $pop720
 	i32.add 	$push119=, $pop550, $pop118
 	i32.store	0($pop119), $18
 	i32.const	$push551=, 32480
 	i32.add 	$push552=, $41, $pop551
-	i32.const	$push723=, 2
-	i32.shl 	$push120=, $17, $pop723
+	i32.const	$push719=, 2
+	i32.shl 	$push120=, $17, $pop719
 	i32.add 	$push121=, $pop552, $pop120
 	i32.store	0($pop121), $17
 	i32.const	$push553=, 30480
 	i32.add 	$push554=, $41, $pop553
-	i32.const	$push722=, 2
-	i32.shl 	$push122=, $16, $pop722
+	i32.const	$push718=, 2
+	i32.shl 	$push122=, $16, $pop718
 	i32.add 	$push123=, $pop554, $pop122
 	i32.store	0($pop123), $16
 	i32.const	$push555=, 28480
 	i32.add 	$push556=, $41, $pop555
-	i32.const	$push721=, 2
-	i32.shl 	$push124=, $15, $pop721
+	i32.const	$push717=, 2
+	i32.shl 	$push124=, $15, $pop717
 	i32.add 	$push125=, $pop556, $pop124
 	i32.store	0($pop125), $15
 	i32.const	$push557=, 26480
 	i32.add 	$push558=, $41, $pop557
-	i32.const	$push720=, 2
-	i32.shl 	$push126=, $14, $pop720
+	i32.const	$push716=, 2
+	i32.shl 	$push126=, $14, $pop716
 	i32.add 	$push127=, $pop558, $pop126
 	i32.store	0($pop127), $14
 	i32.const	$push559=, 24480
 	i32.add 	$push560=, $41, $pop559
-	i32.const	$push719=, 2
-	i32.shl 	$push128=, $13, $pop719
+	i32.const	$push715=, 2
+	i32.shl 	$push128=, $13, $pop715
 	i32.add 	$push129=, $pop560, $pop128
 	i32.store	0($pop129), $13
 	i32.const	$push561=, 22480
 	i32.add 	$push562=, $41, $pop561
-	i32.const	$push718=, 2
-	i32.shl 	$push130=, $12, $pop718
+	i32.const	$push714=, 2
+	i32.shl 	$push130=, $12, $pop714
 	i32.add 	$push131=, $pop562, $pop130
 	i32.store	0($pop131), $12
 	i32.const	$push563=, 20480
 	i32.add 	$push564=, $41, $pop563
-	i32.const	$push717=, 2
-	i32.shl 	$push132=, $11, $pop717
+	i32.const	$push713=, 2
+	i32.shl 	$push132=, $11, $pop713
 	i32.add 	$push133=, $pop564, $pop132
 	i32.store	0($pop133), $11
 	i32.const	$push565=, 18480
 	i32.add 	$push566=, $41, $pop565
-	i32.const	$push716=, 2
-	i32.shl 	$push134=, $10, $pop716
+	i32.const	$push712=, 2
+	i32.shl 	$push134=, $10, $pop712
 	i32.add 	$push135=, $pop566, $pop134
 	i32.store	0($pop135), $10
 	i32.const	$push567=, 16480
 	i32.add 	$push568=, $41, $pop567
-	i32.const	$push715=, 2
-	i32.shl 	$push136=, $9, $pop715
+	i32.const	$push711=, 2
+	i32.shl 	$push136=, $9, $pop711
 	i32.add 	$push137=, $pop568, $pop136
 	i32.store	0($pop137), $9
 	i32.const	$push569=, 14480
 	i32.add 	$push570=, $41, $pop569
-	i32.const	$push714=, 2
-	i32.shl 	$push138=, $8, $pop714
+	i32.const	$push710=, 2
+	i32.shl 	$push138=, $8, $pop710
 	i32.add 	$push139=, $pop570, $pop138
 	i32.store	0($pop139), $8
 	i32.const	$push571=, 12480
 	i32.add 	$push572=, $41, $pop571
-	i32.const	$push713=, 2
-	i32.shl 	$push140=, $7, $pop713
+	i32.const	$push709=, 2
+	i32.shl 	$push140=, $7, $pop709
 	i32.add 	$push141=, $pop572, $pop140
 	i32.store	0($pop141), $7
 	i32.const	$push573=, 10480
 	i32.add 	$push574=, $41, $pop573
-	i32.const	$push712=, 2
-	i32.shl 	$push142=, $6, $pop712
+	i32.const	$push708=, 2
+	i32.shl 	$push142=, $6, $pop708
 	i32.add 	$push143=, $pop574, $pop142
 	i32.store	0($pop143), $6
 	i32.const	$push575=, 8480
 	i32.add 	$push576=, $41, $pop575
-	i32.const	$push711=, 2
-	i32.shl 	$push144=, $5, $pop711
+	i32.const	$push707=, 2
+	i32.shl 	$push144=, $5, $pop707
 	i32.add 	$push145=, $pop576, $pop144
 	i32.store	0($pop145), $5
 	i32.const	$push577=, 6480
 	i32.add 	$push578=, $41, $pop577
-	i32.const	$push710=, 2
-	i32.shl 	$push146=, $4, $pop710
+	i32.const	$push706=, 2
+	i32.shl 	$push146=, $4, $pop706
 	i32.add 	$push147=, $pop578, $pop146
 	i32.store	0($pop147), $4
 	i32.const	$push579=, 4480
 	i32.add 	$push580=, $41, $pop579
-	i32.const	$push709=, 2
-	i32.shl 	$push148=, $3, $pop709
+	i32.const	$push705=, 2
+	i32.shl 	$push148=, $3, $pop705
 	i32.add 	$push149=, $pop580, $pop148
 	i32.store	0($pop149), $3
 	i32.const	$push581=, 480
 	i32.add 	$push582=, $41, $pop581
-	i32.const	$push708=, 2
-	i32.shl 	$push150=, $2, $pop708
+	i32.const	$push704=, 2
+	i32.shl 	$push150=, $2, $pop704
 	i32.add 	$push151=, $pop582, $pop150
 	i32.store	0($pop151), $2
 	i32.const	$push583=, 2480
 	i32.add 	$push584=, $41, $pop583
-	i32.const	$push707=, 2
-	i32.shl 	$push152=, $1, $pop707
+	i32.const	$push703=, 2
+	i32.shl 	$push152=, $1, $pop703
 	i32.add 	$push153=, $pop584, $pop152
 	i32.store	0($pop153), $1
-	i32.const	$push706=, 156
-	i32.add 	$push154=, $41, $pop706
+	i32.const	$push702=, 156
+	i32.add 	$push154=, $41, $pop702
 	i32.const	$push585=, 480
 	i32.add 	$push586=, $41, $pop585
 	i32.store	0($pop154), $pop586
-	i32.const	$push705=, 152
-	i32.add 	$push155=, $41, $pop705
+	i32.const	$push701=, 152
+	i32.add 	$push155=, $41, $pop701
 	i32.const	$push587=, 2480
 	i32.add 	$push588=, $41, $pop587
 	i32.store	0($pop155), $pop588
-	i32.const	$push704=, 148
-	i32.add 	$push156=, $41, $pop704
+	i32.const	$push700=, 148
+	i32.add 	$push156=, $41, $pop700
 	i32.const	$push589=, 4480
 	i32.add 	$push590=, $41, $pop589
 	i32.store	0($pop156), $pop590
-	i32.const	$push703=, 144
-	i32.add 	$push157=, $41, $pop703
+	i32.const	$push699=, 144
+	i32.add 	$push157=, $41, $pop699
 	i32.const	$push591=, 6480
 	i32.add 	$push592=, $41, $pop591
 	i32.store	0($pop157), $pop592
-	i32.const	$push702=, 140
-	i32.add 	$push158=, $41, $pop702
+	i32.const	$push698=, 140
+	i32.add 	$push158=, $41, $pop698
 	i32.const	$push593=, 8480
 	i32.add 	$push594=, $41, $pop593
 	i32.store	0($pop158), $pop594
-	i32.const	$push701=, 136
-	i32.add 	$push159=, $41, $pop701
+	i32.const	$push697=, 136
+	i32.add 	$push159=, $41, $pop697
 	i32.const	$push595=, 10480
 	i32.add 	$push596=, $41, $pop595
 	i32.store	0($pop159), $pop596
-	i32.const	$push700=, 132
-	i32.add 	$push160=, $41, $pop700
+	i32.const	$push696=, 132
+	i32.add 	$push160=, $41, $pop696
 	i32.const	$push597=, 12480
 	i32.add 	$push598=, $41, $pop597
 	i32.store	0($pop160), $pop598
-	i32.const	$push699=, 128
-	i32.add 	$push161=, $41, $pop699
+	i32.const	$push695=, 128
+	i32.add 	$push161=, $41, $pop695
 	i32.const	$push599=, 14480
 	i32.add 	$push600=, $41, $pop599
 	i32.store	0($pop161), $pop600
-	i32.const	$push698=, 124
-	i32.add 	$push162=, $41, $pop698
+	i32.const	$push694=, 124
+	i32.add 	$push162=, $41, $pop694
 	i32.const	$push601=, 16480
 	i32.add 	$push602=, $41, $pop601
 	i32.store	0($pop162), $pop602
-	i32.const	$push697=, 120
-	i32.add 	$push163=, $41, $pop697
+	i32.const	$push693=, 120
+	i32.add 	$push163=, $41, $pop693
 	i32.const	$push603=, 18480
 	i32.add 	$push604=, $41, $pop603
 	i32.store	0($pop163), $pop604
-	i32.const	$push696=, 116
-	i32.add 	$push164=, $41, $pop696
+	i32.const	$push692=, 116
+	i32.add 	$push164=, $41, $pop692
 	i32.const	$push605=, 20480
 	i32.add 	$push606=, $41, $pop605
 	i32.store	0($pop164), $pop606
-	i32.const	$push695=, 112
-	i32.add 	$push165=, $41, $pop695
+	i32.const	$push691=, 112
+	i32.add 	$push165=, $41, $pop691
 	i32.const	$push607=, 22480
 	i32.add 	$push608=, $41, $pop607
 	i32.store	0($pop165), $pop608
-	i32.const	$push694=, 108
-	i32.add 	$push166=, $41, $pop694
+	i32.const	$push690=, 108
+	i32.add 	$push166=, $41, $pop690
 	i32.const	$push609=, 24480
 	i32.add 	$push610=, $41, $pop609
 	i32.store	0($pop166), $pop610
-	i32.const	$push693=, 104
-	i32.add 	$push167=, $41, $pop693
+	i32.const	$push689=, 104
+	i32.add 	$push167=, $41, $pop689
 	i32.const	$push611=, 26480
 	i32.add 	$push612=, $41, $pop611
 	i32.store	0($pop167), $pop612
-	i32.const	$push692=, 100
-	i32.add 	$push168=, $41, $pop692
+	i32.const	$push688=, 100
+	i32.add 	$push168=, $41, $pop688
 	i32.const	$push613=, 28480
 	i32.add 	$push614=, $41, $pop613
 	i32.store	0($pop168), $pop614
-	i32.const	$push691=, 96
-	i32.add 	$push169=, $41, $pop691
+	i32.const	$push687=, 96
+	i32.add 	$push169=, $41, $pop687
 	i32.const	$push615=, 30480
 	i32.add 	$push616=, $41, $pop615
 	i32.store	0($pop169), $pop616
-	i32.const	$push690=, 92
-	i32.add 	$push170=, $41, $pop690
+	i32.const	$push686=, 92
+	i32.add 	$push170=, $41, $pop686
 	i32.const	$push617=, 32480
 	i32.add 	$push618=, $41, $pop617
 	i32.store	0($pop170), $pop618
-	i32.const	$push689=, 88
-	i32.add 	$push171=, $41, $pop689
+	i32.const	$push685=, 88
+	i32.add 	$push171=, $41, $pop685
 	i32.const	$push619=, 34480
 	i32.add 	$push620=, $41, $pop619
 	i32.store	0($pop171), $pop620
-	i32.const	$push688=, 84
-	i32.add 	$push172=, $41, $pop688
+	i32.const	$push684=, 84
+	i32.add 	$push172=, $41, $pop684
 	i32.const	$push621=, 36480
 	i32.add 	$push622=, $41, $pop621
 	i32.store	0($pop172), $pop622
-	i32.const	$push687=, 80
-	i32.add 	$push173=, $41, $pop687
+	i32.const	$push683=, 80
+	i32.add 	$push173=, $41, $pop683
 	i32.const	$push623=, 38480
 	i32.add 	$push624=, $41, $pop623
 	i32.store	0($pop173), $pop624
-	i32.const	$push686=, 76
-	i32.add 	$push174=, $41, $pop686
+	i32.const	$push682=, 76
+	i32.add 	$push174=, $41, $pop682
 	i32.const	$push625=, 40480
 	i32.add 	$push626=, $41, $pop625
 	i32.store	0($pop174), $pop626
-	i32.const	$push685=, 72
-	i32.add 	$push175=, $41, $pop685
+	i32.const	$push681=, 72
+	i32.add 	$push175=, $41, $pop681
 	i32.const	$push627=, 42480
 	i32.add 	$push628=, $41, $pop627
 	i32.store	0($pop175), $pop628
-	i32.const	$push684=, 68
-	i32.add 	$push176=, $41, $pop684
+	i32.const	$push680=, 68
+	i32.add 	$push176=, $41, $pop680
 	i32.const	$push629=, 44480
 	i32.add 	$push630=, $41, $pop629
 	i32.store	0($pop176), $pop630
-	i32.const	$push683=, 64
-	i32.add 	$push177=, $41, $pop683
+	i32.const	$push679=, 64
+	i32.add 	$push177=, $41, $pop679
 	i32.const	$push631=, 46480
 	i32.add 	$push632=, $41, $pop631
 	i32.store	0($pop177), $pop632
-	i32.const	$push682=, 60
-	i32.add 	$push178=, $41, $pop682
+	i32.const	$push678=, 60
+	i32.add 	$push178=, $41, $pop678
 	i32.const	$push633=, 48480
 	i32.add 	$push634=, $41, $pop633
 	i32.store	0($pop178), $pop634
-	i32.const	$push681=, 56
-	i32.add 	$push179=, $41, $pop681
+	i32.const	$push677=, 56
+	i32.add 	$push179=, $41, $pop677
 	i32.const	$push635=, 50480
 	i32.add 	$push636=, $41, $pop635
 	i32.store	0($pop179), $pop636
-	i32.const	$push680=, 52
-	i32.add 	$push180=, $41, $pop680
+	i32.const	$push676=, 52
+	i32.add 	$push180=, $41, $pop676
 	i32.const	$push637=, 52480
 	i32.add 	$push638=, $41, $pop637
 	i32.store	0($pop180), $pop638
-	i32.const	$push679=, 48
-	i32.add 	$push181=, $41, $pop679
+	i32.const	$push675=, 48
+	i32.add 	$push181=, $41, $pop675
 	i32.const	$push639=, 54480
 	i32.add 	$push640=, $41, $pop639
 	i32.store	0($pop181), $pop640
-	i32.const	$push678=, 44
-	i32.add 	$push182=, $41, $pop678
+	i32.const	$push674=, 44
+	i32.add 	$push182=, $41, $pop674
 	i32.const	$push641=, 56480
 	i32.add 	$push642=, $41, $pop641
 	i32.store	0($pop182), $pop642
-	i32.const	$push677=, 40
-	i32.add 	$push183=, $41, $pop677
+	i32.const	$push673=, 40
+	i32.add 	$push183=, $41, $pop673
 	i32.const	$push643=, 58480
 	i32.add 	$push644=, $41, $pop643
 	i32.store	0($pop183), $pop644
-	i32.const	$push676=, 36
-	i32.add 	$push184=, $41, $pop676
+	i32.const	$push672=, 36
+	i32.add 	$push184=, $41, $pop672
 	i32.const	$push645=, 60480
 	i32.add 	$push646=, $41, $pop645
 	i32.store	0($pop184), $pop646
-	i32.const	$push675=, 32
-	i32.add 	$push185=, $41, $pop675
+	i32.const	$push671=, 32
+	i32.add 	$push185=, $41, $pop671
 	i32.const	$push647=, 62480
 	i32.add 	$push648=, $41, $pop647
 	i32.store	0($pop185), $pop648
-	i32.const	$push674=, 28
-	i32.add 	$push186=, $41, $pop674
+	i32.const	$push670=, 28
+	i32.add 	$push186=, $41, $pop670
 	i32.const	$push649=, 64480
 	i32.add 	$push650=, $41, $pop649
 	i32.store	0($pop186), $pop650
-	i32.const	$push673=, 24
-	i32.add 	$push187=, $41, $pop673
+	i32.const	$push669=, 24
+	i32.add 	$push187=, $41, $pop669
 	i32.const	$push651=, 66480
 	i32.add 	$push652=, $41, $pop651
 	i32.store	0($pop187), $pop652
-	i32.const	$push672=, 20
-	i32.add 	$push188=, $41, $pop672
+	i32.const	$push668=, 20
+	i32.add 	$push188=, $41, $pop668
 	i32.const	$push653=, 68480
 	i32.add 	$push654=, $41, $pop653
 	i32.store	0($pop188), $pop654
-	i32.const	$push671=, 16
-	i32.add 	$push189=, $41, $pop671
+	i32.const	$push667=, 16
+	i32.add 	$push189=, $41, $pop667
 	i32.const	$push655=, 70480
 	i32.add 	$push656=, $41, $pop655
 	i32.store	0($pop189), $pop656
@@ -1031,12 +1030,11 @@ f:                                      # @f
 	i32.const	$push663=, 78480
 	i32.add 	$push664=, $41, $pop663
 	i32.store	0($41), $pop664
-	i32.const	$push670=, 40
-	call    	c@FUNCTION, $pop670, $41
-	i32.const	$push669=, -1
-	i32.add 	$push668=, $0, $pop669
-	tee_local	$push667=, $0=, $pop668
-	br_if   	0, $pop667      # 0: up to label1
+	i32.const	$push666=, 40
+	call    	c@FUNCTION, $pop666, $41
+	i32.const	$push665=, -1
+	i32.add 	$0=, $0, $pop665
+	br_if   	0, $0           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
@@ -1056,34 +1054,31 @@ f:                                      # @f
 s:                                      # @s
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push7=, $pop3, $pop5
-	tee_local	$push6=, $2=, $pop7
-	i32.store	12($pop6), $1
+	i32.sub 	$2=, $pop3, $pop5
+	i32.store	12($2), $1
 	block   	
-	i32.eqz 	$push16=, $0
-	br_if   	0, $pop16       # 0: down to label2
-# BB#1:                                 # %while.body.preheader
-	i32.const	$push8=, -1
-	i32.add 	$0=, $0, $pop8
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label2
+# %bb.1:                                # %while.body.preheader
+	i32.const	$push6=, -1
+	i32.add 	$0=, $0, $pop6
 .LBB1_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.load	$push15=, 12($2)
-	tee_local	$push14=, $1=, $pop15
-	i32.const	$push13=, 4
-	i32.add 	$push0=, $pop14, $pop13
+	i32.load	$1=, 12($2)
+	i32.const	$push9=, 4
+	i32.add 	$push0=, $1, $pop9
 	i32.store	12($2), $pop0
 	i32.load	$push1=, 0($1)
 	i32.store	0($pop1), $0
-	i32.const	$push12=, -1
-	i32.add 	$push11=, $0, $pop12
-	tee_local	$push10=, $0=, $pop11
-	i32.const	$push9=, -1
-	i32.ne  	$push2=, $pop10, $pop9
+	i32.const	$push8=, -1
+	i32.add 	$0=, $0, $pop8
+	i32.const	$push7=, -1
+	i32.ne  	$push2=, $0, $pop7
 	br_if   	0, $pop2        # 0: up to label3
 .LBB1_3:                                # %while.end
 	end_loop
@@ -1100,36 +1095,33 @@ s:                                      # @s
 z:                                      # @z
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $3=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$3=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $3
 	i32.store	12($3), $1
 	block   	
-	i32.eqz 	$push18=, $0
-	br_if   	0, $pop18       # 0: down to label4
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push12=, $0
+	br_if   	0, $pop12       # 0: down to label4
+# %bb.1:                                # %while.body.lr.ph
 	i32.load	$1=, 12($3)
 .LBB2_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.const	$push17=, 4
-	i32.add 	$push16=, $1, $pop17
-	tee_local	$push15=, $2=, $pop16
-	i32.store	12($3), $pop15
+	i32.const	$push11=, 4
+	i32.add 	$2=, $1, $pop11
+	i32.store	12($3), $2
 	i32.load	$push0=, 0($1)
-	i32.const	$push14=, 0
-	i32.const	$push13=, 2000
-	i32.call	$drop=, memset@FUNCTION, $pop0, $pop14, $pop13
+	i32.const	$push10=, 0
+	i32.const	$push9=, 2000
+	i32.call	$drop=, memset@FUNCTION, $pop0, $pop10, $pop9
+	i32.const	$push8=, -1
+	i32.add 	$0=, $0, $pop8
 	copy_local	$1=, $2
-	i32.const	$push12=, -1
-	i32.add 	$push11=, $0, $pop12
-	tee_local	$push10=, $0=, $pop11
-	br_if   	0, $pop10       # 0: up to label5
+	br_if   	0, $0           # 0: up to label5
 .LBB2_3:                                # %while.end
 	end_loop
 	end_block                       # label4:
@@ -1149,49 +1141,46 @@ z:                                      # @z
 c:                                      # @c
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop7, $pop9
-	tee_local	$push14=, $4=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.sub 	$4=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $4
 	i32.store	12($4), $1
 	block   	
 	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.eqz 	$push20=, $0
+	br_if   	0, $pop20       # 0: down to label7
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push15=, -1
+	i32.add 	$1=, $0, $pop15
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
-	i32.const	$push16=, -4
-	i32.add 	$0=, $pop1, $pop16
+	i32.const	$push14=, -4
+	i32.add 	$0=, $pop1, $pop14
 	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.const	$push16=, 4
+	i32.add 	$2=, $3, $pop16
+	i32.store	12($4), $2
 	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
+# %bb.3:                                # %while.cond
                                         #   in Loop: Header=BB3_2 Depth=1
-	i32.const	$push25=, -4
-	i32.add 	$0=, $0, $pop25
+	i32.const	$push19=, -4
+	i32.add 	$0=, $0, $pop19
+	i32.const	$push18=, -1
+	i32.add 	$1=, $1, $pop18
 	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
+	i32.const	$push17=, -1
+	i32.ne  	$push6=, $1, $pop17
 	br_if   	0, $pop6        # 0: up to label8
 .LBB3_4:                                # %while.end
 	end_loop
@@ -1215,7 +1204,7 @@ c:                                      # @c
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	call    	f@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -1226,6 +1215,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2e1b2ce37..01736f64d 100644
--- a/test/torture-s/nestfunc-4.c.s
+++ b/test/torture-s/nestfunc-4.c.s
@@ -7,18 +7,17 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, level($pop10)
-	tee_local	$push8=, $0=, $pop9
-	i32.const	$push1=, 2040
-	i32.const	$push7=, 2040
+	i32.load	$0=, level($pop0)
+	i32.const	$push8=, 0
+	i32.const	$push1=, 1024
+	i32.const	$push7=, 1024
 	i32.gt_s	$push2=, $0, $pop7
-	i32.select	$push3=, $pop8, $pop1, $pop2
+	i32.select	$push3=, $0, $pop1, $pop2
 	i32.const	$push4=, 1
 	i32.add 	$push5=, $pop3, $pop4
-	i32.store	level($pop0), $pop5
+	i32.store	level($pop8), $pop5
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
 	unreachable
@@ -33,18 +32,17 @@ main:                                   # @main
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, level($pop10)
-	tee_local	$push8=, $0=, $pop9
-	i32.const	$push1=, 2040
-	i32.const	$push7=, 2040
+	i32.load	$0=, level($pop0)
+	i32.const	$push8=, 0
+	i32.const	$push1=, 1024
+	i32.const	$push7=, 1024
 	i32.gt_s	$push2=, $0, $pop7
-	i32.select	$push3=, $pop8, $pop1, $pop2
+	i32.select	$push3=, $0, $pop1, $pop2
 	i32.const	$push4=, 1
 	i32.add 	$push5=, $pop3, $pop4
-	i32.store	level($pop0), $pop5
+	i32.store	level($pop8), $pop5
 	i32.const	$push6=, -42
                                         # fallthrough-return: $pop6
 	.endfunc
@@ -58,16 +56,15 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push0=, 0
+	i32.load	$0=, level($pop0)
 	i32.const	$1=, -42
 	block   	
-	i32.const	$push0=, 0
-	i32.load	$push5=, level($pop0)
-	tee_local	$push4=, $0=, $pop5
-	i32.const	$push1=, 2040
-	i32.gt_s	$push2=, $pop4, $pop1
+	i32.const	$push1=, 1024
+	i32.gt_s	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %cond.false
+# %bb.1:                                # %cond.false
 	i32.call	$1=, foo@FUNCTION
 .LBB2_2:                                # %cond.end
 	end_block                       # label0:
@@ -87,5 +84,5 @@ level:
 	.size	level, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/p18298.c.s b/test/torture-s/p18298.c.s
index b451802e0..3a0a2c9c9 100644
--- a/test/torture-s/p18298.c.s
+++ b/test/torture-s/p18298.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, s
 	i32.call	$push1=, strcmp@FUNCTION, $pop0, $0
 	i32.eqz 	$push2=, $pop1
@@ -22,13 +22,13 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load8_u	$push0=, s($pop1)
 	i32.eqz 	$push5=, $pop0
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %while.cond
+# %bb.1:                                # %while.cond
 	i32.const	$push3=, 0
 	i32.const	$push2=, 0
 	i32.store8	s($pop3), $pop2
@@ -50,5 +50,5 @@ s:
 	.size	s, 2048
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/packed-1.c.s b/test/torture-s/packed-1.c.s
index 89877790a..3b19f41bb 100644
--- a/test/torture-s/packed-1.c.s
+++ b/test/torture-s/packed-1.c.s
@@ -7,17 +7,16 @@
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load16_u	$push4=, x1($pop5)
-	tee_local	$push3=, $0=, $pop4
-	i32.store16	t($pop0), $pop3
+	i32.load16_u	$0=, x1($pop0)
+	i32.const	$push3=, 0
+	i32.store16	t($pop3), $0
 	block   	
 	i32.const	$push1=, 17
 	i32.ne  	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -33,7 +32,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -61,6 +60,6 @@ t:
 	.size	t, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0376f2fdd..373b0e7fb 100644
--- a/test/torture-s/packed-2.c.s
+++ b/test/torture-s/packed-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	t+2($pop0):p2align=1, $pop2
@@ -26,4 +26,4 @@ t:
 	.size	t, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pending-4.c.s b/test/torture-s/pending-4.c.s
index 0215f0e58..e4dbdb23e 100644
--- a/test/torture-s/pending-4.c.s
+++ b/test/torture-s/pending-4.c.s
@@ -6,7 +6,7 @@
 	.type	dummy,@function
 dummy:                                  # @dummy
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -20,7 +20,7 @@ main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$4=, 8
 	i32.const	$2=, 0
 	i32.const	$3=, 0
@@ -30,7 +30,7 @@ main:                                   # @main
 	i32.const	$push8=, 1
 	i32.ne  	$push1=, $pop9, $pop8
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:
+# %bb.1:
 	i32.const	$5=, 2
 	br      	1               # 1: down to label0
 .LBB1_2:
@@ -61,36 +61,34 @@ main:                                   # @main
 .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	$push12=, 1
+	i32.add 	$3=, $3, $pop12
+	i32.const	$push11=, -1
+	i32.add 	$4=, $4, $pop11
 	i32.const	$push10=, 1
-	i32.ne  	$push2=, $pop11, $pop10
+	i32.ne  	$push2=, $4, $pop10
 	br_if   	8, $pop2        # 8: down to label5
-# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
+# %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
+	i32.add 	$2=, $2, $pop15
+	i32.const	$push14=, -1
+	i32.add 	$4=, $4, $pop14
+	i32.const	$push13=, 1
+	i32.eq  	$push0=, $4, $pop13
 	br_if   	6, $pop0        # 6: down to label6
-# BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
+# %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
+# %bb.9:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 3
 	br      	9               # 9: up to label2
 .LBB1_10:                               # %for.end
@@ -99,7 +97,7 @@ main:                                   # @main
 	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
+# %bb.11:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 4
 	br      	8               # 8: up to label2
 .LBB1_12:                               # %for.end
@@ -108,7 +106,7 @@ main:                                   # @main
 	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
+# %bb.13:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 5
 	br      	7               # 7: up to label2
 .LBB1_14:                               # %if.end7
@@ -147,6 +145,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1e7cc5972..8fa4adead 100644
--- a/test/torture-s/postmod-1.c.s
+++ b/test/torture-s/postmod-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32, i32, f32, f32, f32, f32, f32, f32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$2=, $0, $pop0
 	i32.const	$push1=, 3
@@ -18,70 +18,62 @@ foo:                                    # @foo
 .LBB0_1:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push293=, 0
-	i32.add 	$push292=, $2, $13
-	tee_local	$push291=, $0=, $pop292
-	i32.const	$push290=, array0
-	i32.add 	$push3=, $pop291, $pop290
+	i32.add 	$0=, $2, $13
+	i32.const	$push277=, array0
+	i32.add 	$push3=, $0, $pop277
 	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
+	i32.const	$push276=, 0
+	f32.load	$push5=, counter0($pop276)
+	f32.add 	$3=, $pop4, $pop5
+	i32.const	$push275=, 0
+	f32.store	counter0($pop275), $3
+	i32.const	$push274=, array1
+	i32.add 	$push6=, $0, $pop274
 	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
+	i32.const	$push273=, 0
+	f32.load	$push8=, counter1($pop273)
+	f32.add 	$4=, $pop7, $pop8
+	i32.const	$push272=, 0
+	f32.store	counter1($pop272), $4
+	i32.const	$push271=, array2
+	i32.add 	$push9=, $0, $pop271
 	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	$push270=, 0
+	f32.load	$push11=, counter2($pop270)
+	f32.add 	$5=, $pop10, $pop11
 	i32.const	$push269=, 0
-	f32.load	$push17=, counter4($pop269)
-	f32.add 	$push268=, $pop16, $pop17
-	tee_local	$push267=, $7=, $pop268
-	f32.store	counter4($pop271), $pop267
+	f32.store	counter2($pop269), $5
+	i32.const	$push268=, array3
+	i32.add 	$push12=, $0, $pop268
+	f32.load	$push13=, 0($pop12)
+	i32.const	$push267=, 0
+	f32.load	$push14=, counter3($pop267)
+	f32.add 	$6=, $pop13, $pop14
 	i32.const	$push266=, 0
-	i32.const	$push265=, array5
-	i32.add 	$push18=, $0, $pop265
-	f32.load	$push19=, 0($pop18)
+	f32.store	counter3($pop266), $6
+	i32.const	$push265=, array4
+	i32.add 	$push15=, $0, $pop265
+	f32.load	$push16=, 0($pop15)
 	i32.const	$push264=, 0
-	f32.load	$push20=, counter5($pop264)
-	f32.add 	$push263=, $pop19, $pop20
-	tee_local	$push262=, $8=, $pop263
-	f32.store	counter5($pop266), $pop262
+	f32.load	$push17=, counter4($pop264)
+	f32.add 	$7=, $pop16, $pop17
+	i32.const	$push263=, 0
+	f32.store	counter4($pop263), $7
+	i32.const	$push262=, array5
+	i32.add 	$push18=, $0, $pop262
+	f32.load	$push19=, 0($pop18)
 	i32.const	$push261=, 0
-	i32.add 	$push260=, $1, $13
-	tee_local	$push259=, $0=, $pop260
+	f32.load	$push20=, counter5($pop261)
+	f32.add 	$8=, $pop19, $pop20
+	i32.const	$push260=, 0
+	f32.store	counter5($pop260), $8
+	i32.add 	$0=, $1, $13
+	i32.const	$push259=, 0
 	i32.const	$push258=, array0
-	i32.add 	$push21=, $pop259, $pop258
+	i32.add 	$push21=, $0, $pop258
 	f32.load	$push22=, 0($pop21)
 	f32.add 	$push23=, $3, $pop22
-	f32.store	counter0($pop261), $pop23
+	f32.store	counter0($pop259), $pop23
 	i32.const	$push257=, 0
 	i32.const	$push256=, array1
 	i32.add 	$push24=, $0, $pop256
@@ -376,9 +368,9 @@ foo:                                    # @foo
 	i32.add 	$13=, $13, $pop142
 	i32.const	$push141=, 0
 	i32.load	$push139=, stop($pop141)
-	i32.eqz 	$push294=, $pop139
-	br_if   	0, $pop294      # 0: up to label0
-# BB#2:                                 # %do.end
+	i32.eqz 	$push278=, $pop139
+	br_if   	0, $pop278      # 0: up to label0
+# %bb.2:                                # %do.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -391,7 +383,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1073741824
 	i32.store	array0+20($pop1), $pop0
@@ -591,4 +583,4 @@ vol:
 	.size	vol, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr15262-1.c.s b/test/torture-s/pr15262-1.c.s
index 94b85726a..212a86f1f 100644
--- a/test/torture-s/pr15262-1.c.s
+++ b/test/torture-s/pr15262-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr15262-2.c.s b/test/torture-s/pr15262-2.c.s
index 67614715b..ae357fa5c 100644
--- a/test/torture-s/pr15262-2.c.s
+++ b/test/torture-s/pr15262-2.c.s
@@ -7,11 +7,10 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.load	$push9=, 0($0)
-	tee_local	$push8=, $0=, $pop9
+# %bb.0:                                # %entry
+	i32.load	$0=, 0($0)
 	i32.const	$push0=, 3
-	i32.store	0($pop8), $pop0
+	i32.store	0($0), $pop0
 	i32.const	$push1=, 2
 	i32.store	0($1), $pop1
 	i32.const	$push2=, 0
@@ -33,13 +32,12 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	f32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	f32.load	$push4=, X($pop5)
-	tee_local	$push3=, $0=, $pop4
-	f32.add 	$push1=, $pop3, $0
-	f32.store	X($pop0), $pop1
+	f32.load	$0=, X($pop0)
+	i32.const	$push3=, 0
+	f32.add 	$push1=, $0, $0
+	f32.store	X($pop3), $pop1
 	i32.const	$push2=, 0
                                         # fallthrough-return: $pop2
 	.endfunc
@@ -56,4 +54,4 @@ X:
 	.size	X, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr15262.c.s b/test/torture-s/pr15262.c.s
index a80b3982a..dfb0137a1 100644
--- a/test/torture-s/pr15262.c.s
+++ b/test/torture-s/pr15262.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1084647014
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -22,23 +22,22 @@ foo:                                    # @foo
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push3=, 0
-	i32.load	$3=, __stack_pointer($pop3)
+# %bb.0:                                # %entry
+	i32.const	$push4=, 0
+	i32.load	$push3=, __stack_pointer($pop4)
+	i32.const	$push5=, 16
+	i32.sub 	$3=, $pop3, $pop5
 	i32.const	$push0=, 1
 	i32.store	4($0), $pop0
-	i32.const	$push4=, 16
-	i32.sub 	$push11=, $3, $pop4
-	tee_local	$push10=, $0=, $pop11
-	i32.const	$push5=, 8
-	i32.add 	$push6=, $pop10, $pop5
-	i32.const	$push7=, 12
-	i32.add 	$push8=, $0, $pop7
-	i32.select	$push1=, $pop6, $pop8, $1
+	i32.const	$push6=, 8
+	i32.add 	$push7=, $3, $pop6
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $3, $pop8
+	i32.select	$push1=, $pop7, $pop9, $1
 	i32.const	$push2=, 1084647014
 	i32.store	0($pop1), $pop2
-	i32.const	$push9=, 1
-                                        # fallthrough-return: $pop9
+	i32.const	$push10=, 1
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -49,7 +48,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -57,4 +56,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr15296.c.s b/test/torture-s/pr15296.c.s
index b0a1f07f7..1e60f580b 100644
--- a/test/torture-s/pr15296.c.s
+++ b/test/torture-s/pr15296.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ge_s	$push1=, $3, $4
 	br_if   	0, $pop1        # 0: down to label0
@@ -20,45 +20,41 @@ f:                                      # @f
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push16=, $3
-	br_if   	0, $pop16       # 0: down to label4
-# BB#3:                                 # %if.end3
+	i32.eqz 	$push10=, $3
+	br_if   	0, $pop10       # 0: down to label4
+# %bb.3:                                # %if.end3
 	br_if   	1, $5           # 1: down to label3
-# BB#4:                                 # %if.end6
+# %bb.4:                                # %if.end6
+	i32.load	$push0=, 0($1)
+	i32.load	$5=, 0($pop0)
 	i32.const	$push2=, 4
 	i32.add 	$push3=, $1, $pop2
-	i32.load	$push0=, 0($1)
-	i32.load	$push13=, 0($pop0)
-	tee_local	$push12=, $5=, $pop13
-	i32.store	0($pop3), $pop12
+	i32.store	0($pop3), $5
 	br_if   	2, $5           # 2: down to label2
-# BB#5:
-	i32.const	$push10=, 12
-	i32.const	$push11=, -1
-	i32.store	0($pop10), $pop11
+# %bb.5:                                # %if.end12
+	i32.const	$push5=, 0
+	i32.const	$push4=, -1
+	i32.store	12($pop5), $pop4
 	return
 .LBB0_6:
 	end_block                       # label4:
 	i32.const	$5=, 0
 .LBB0_7:                                # %l3
 	end_block                       # label3:
-	i32.const	$push4=, 4
-	i32.add 	$push5=, $1, $pop4
-	i32.store	0($pop5), $5
-	block   	
-	block   	
-	i32.const	$push6=, 8
+	i32.const	$push6=, 4
 	i32.add 	$push7=, $1, $pop6
-	i32.load	$push15=, 0($pop7)
-	tee_local	$push14=, $3=, $pop15
-	br_if   	0, $pop14       # 0: down to label6
-# BB#8:                                 # %if.end19
-	i32.eqz 	$push17=, $5
-	br_if   	1, $pop17       # 1: down to label5
-# BB#9:                                 # %if.end24
+	i32.store	0($pop7), $5
 	i32.const	$push8=, 8
-	i32.add 	$push9=, $5, $pop8
-	i32.store	0($pop9), $3
+	i32.add 	$push9=, $1, $pop8
+	i32.load	$3=, 0($pop9)
+	block   	
+	block   	
+	br_if   	0, $3           # 0: down to label6
+# %bb.8:                                # %if.end19
+	i32.eqz 	$push11=, $5
+	br_if   	1, $pop11       # 1: down to label5
+# %bb.9:                                # %if.end24
+	i32.store	8($5), $3
 	return
 .LBB0_10:                               # %if.then18
 	end_block                       # label6:
@@ -82,7 +78,7 @@ f:                                      # @f
 	.type	g,@function
 g:                                      # @g
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -96,31 +92,29 @@ g:                                      # @g
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push38=, 0
+# %bb.0:                                # %entry
 	i32.const	$push36=, 0
 	i32.load	$push35=, __stack_pointer($pop36)
 	i32.const	$push37=, 48
-	i32.sub 	$push53=, $pop35, $pop37
-	tee_local	$push52=, $1=, $pop53
-	i32.store	__stack_pointer($pop38), $pop52
+	i32.sub 	$1=, $pop35, $pop37
+	i32.const	$push38=, 0
+	i32.store	__stack_pointer($pop38), $1
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.uv+8($pop0)
 	i64.store	40($1), $pop1
-	i32.const	$push51=, 0
-	i64.load	$push2=, .Lmain.uv($pop51)
+	i32.const	$push49=, 0
+	i64.load	$push2=, .Lmain.uv($pop49)
 	i64.store	32($1), $pop2
 	i32.const	$push3=, 24
 	i32.add 	$push4=, $1, $pop3
-	i32.const	$push50=, 0
-	i32.load	$push5=, .Lmain.s+16($pop50)
+	i32.const	$push48=, 0
+	i32.load	$push5=, .Lmain.s+16($pop48)
 	i32.store	0($pop4), $pop5
 	i32.const	$push6=, 16
-	i32.add 	$push49=, $1, $pop6
-	tee_local	$push48=, $0=, $pop49
+	i32.add 	$0=, $1, $pop6
 	i32.const	$push47=, 0
 	i64.load	$push7=, .Lmain.s+8($pop47):p2align=2
-	i64.store	0($pop48), $pop7
+	i64.store	0($0), $pop7
 	i32.const	$push46=, 0
 	i64.load	$push8=, .Lmain.s($pop46):p2align=2
 	i64.store	8($1), $pop8
@@ -138,42 +132,42 @@ main:                                   # @main
 	i32.add 	$push44=, $1, $pop43
 	i32.ne  	$push12=, $pop11, $pop44
 	br_if   	0, $pop12       # 0: down to label7
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push13=, 0($0)
 	br_if   	0, $pop13       # 0: down to label7
-# BB#2:                                 # %lor.lhs.false6
+# %bb.2:                                # %lor.lhs.false6
 	i32.const	$push14=, 20
 	i32.add 	$push15=, $1, $pop14
 	i32.load	$push16=, 0($pop15)
 	i32.const	$push17=, 999
 	i32.ne  	$push18=, $pop16, $pop17
 	br_if   	0, $pop18       # 0: down to label7
-# BB#3:                                 # %lor.lhs.false11
+# %bb.3:                                # %lor.lhs.false11
 	i32.const	$push19=, 24
 	i32.add 	$push20=, $1, $pop19
 	i32.load	$push21=, 0($pop20)
 	i32.const	$push22=, 777
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label7
-# BB#4:                                 # %lor.lhs.false16
+# %bb.4:                                # %lor.lhs.false16
 	i32.load	$push25=, 32($1)
 	i32.const	$push24=, 111
 	i32.ne  	$push26=, $pop25, $pop24
 	br_if   	0, $pop26       # 0: down to label7
-# BB#5:                                 # %lor.lhs.false20
+# %bb.5:                                # %lor.lhs.false20
 	i32.load	$push28=, 36($1)
 	i32.const	$push27=, 222
 	i32.ne  	$push29=, $pop28, $pop27
 	br_if   	0, $pop29       # 0: down to label7
-# BB#6:                                 # %lor.lhs.false24
+# %bb.6:                                # %lor.lhs.false24
 	i32.load	$push30=, 40($1)
 	br_if   	0, $pop30       # 0: down to label7
-# BB#7:                                 # %lor.lhs.false28
+# %bb.7:                                # %lor.lhs.false28
 	i32.load	$push32=, 44($1)
 	i32.const	$push31=, 444
 	i32.ne  	$push33=, $pop32, $pop31
 	br_if   	0, $pop33       # 0: down to label7
-# BB#8:                                 # %if.end
+# %bb.8:                                # %if.end
 	i32.const	$push34=, 0
 	call    	exit@FUNCTION, $pop34
 	unreachable
@@ -207,6 +201,6 @@ main:                                   # @main
 	.size	.Lmain.s, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d12aefd2c..818c2895a 100644
--- a/test/torture-s/pr16790-1.c.s
+++ b/test/torture-s/pr16790-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr17078-1.c.s b/test/torture-s/pr17078-1.c.s
index 0ac3292cf..b66a9694e 100644
--- a/test/torture-s/pr17078-1.c.s
+++ b/test/torture-s/pr17078-1.c.s
@@ -6,7 +6,7 @@
 	.type	test,@function
 test:                                   # @test
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -20,7 +20,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -28,4 +28,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr17133.c.s b/test/torture-s/pr17133.c.s
index 3578744ce..eeff50dd3 100644
--- a/test/torture-s/pr17133.c.s
+++ b/test/torture-s/pr17133.c.s
@@ -7,37 +7,34 @@
 pure_alloc:                             # @pure_alloc
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push15=, 0
-	i32.load	$push14=, foo($pop15)
-	tee_local	$push13=, $3=, $pop14
-	i32.const	$push12=, 2
-	i32.add 	$push11=, $pop13, $pop12
-	tee_local	$push10=, $2=, $pop11
-	i32.store	foo($pop0), $pop10
-	i32.const	$push9=, 0
-	i32.load	$0=, bar($pop9)
-	block   	
+	i32.load	$3=, foo($pop0)
+	i32.const	$push9=, 2
+	i32.add 	$2=, $3, $pop9
 	i32.const	$push8=, 0
-	i32.load	$push7=, baz($pop8)
-	tee_local	$push6=, $1=, $pop7
-	i32.lt_u	$push1=, $2, $pop6
+	i32.store	foo($pop8), $2
+	i32.const	$push7=, 0
+	i32.load	$1=, baz($pop7)
+	i32.const	$push6=, 0
+	i32.load	$0=, bar($pop6)
+	block   	
+	i32.lt_u	$push1=, $2, $1
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:
-	i32.const	$push16=, 2
-	i32.gt_u	$3=, $1, $pop16
+# %bb.1:
+	i32.const	$push10=, 2
+	i32.gt_u	$3=, $1, $pop10
 .LBB0_2:                                # %if.end
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.eqz 	$push18=, $3
-	br_if   	0, $pop18       # 0: up to label1
-# BB#3:                                 # %while.cond.if.then_crit_edge
+	i32.eqz 	$push12=, $3
+	br_if   	0, $pop12       # 0: up to label1
+# %bb.3:                                # %while.cond.if.then_crit_edge
 	end_loop
 	i32.const	$3=, 0
-	i32.const	$push17=, 0
+	i32.const	$push11=, 0
 	i32.const	$push2=, 2
-	i32.store	foo($pop17), $pop2
+	i32.store	foo($pop11), $pop2
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
 	i32.add 	$push3=, $0, $3
@@ -55,34 +52,32 @@ pure_alloc:                             # @pure_alloc
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	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
+	i32.load	$push1=, foo($pop0)
+	i32.const	$push10=, 2
+	i32.add 	$0=, $pop1, $pop10
+	i32.const	$push9=, 0
+	i32.store	foo($pop9), $0
+	i32.const	$push8=, 0
+	i32.load	$1=, baz($pop8)
 	block   	
 	block   	
-	i32.const	$push10=, 0
-	i32.load	$push9=, baz($pop10)
-	tee_local	$push8=, $1=, $pop9
-	i32.ge_u	$push2=, $0, $pop8
+	i32.ge_u	$push2=, $0, $1
 	br_if   	0, $pop2        # 0: down to label3
-# BB#1:                                 # %pure_alloc.exit
-	i32.eqz 	$push16=, $0
-	br_if   	1, $pop16       # 1: down to label2
-# BB#2:                                 # %if.end
+# %bb.1:                                # %pure_alloc.exit
+	i32.eqz 	$push12=, $0
+	br_if   	1, $pop12       # 1: down to label2
+# %bb.2:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB1_3:                                # %if.end.lr.ph.i
 	end_block                       # label3:
 	block   	
-	i32.const	$push15=, 2
-	i32.le_u	$push3=, $1, $pop15
+	i32.const	$push11=, 2
+	i32.le_u	$push3=, $1, $pop11
 	br_if   	0, $pop3        # 0: down to label4
-# BB#4:                                 # %pure_alloc.exit.thread.split
+# %bb.4:                                # %pure_alloc.exit.thread.split
 	i32.const	$push5=, 0
 	i32.const	$push4=, 2
 	i32.store	foo($pop5), $pop4
@@ -130,5 +125,5 @@ baz:
 	.size	baz, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr17252.c.s b/test/torture-s/pr17252.c.s
index 614de5751..996d5f520 100644
--- a/test/torture-s/pr17252.c.s
+++ b/test/torture-s/pr17252.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.const	$push0=, a
 	i32.store	a($pop7), $pop0
@@ -19,7 +19,7 @@ main:                                   # @main
 	i32.const	$push4=, a
 	i32.eq  	$push3=, $pop2, $pop4
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB0_2:                                # %if.then
@@ -40,5 +40,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr19005.c.s b/test/torture-s/pr19005.c.s
index 5f8a6a6ce..1d45f2fea 100644
--- a/test/torture-s/pr19005.c.s
+++ b/test/torture-s/pr19005.c.s
@@ -7,28 +7,26 @@
 bar:                                    # @bar
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push20=, v($pop0)
-	tee_local	$push19=, $2=, $pop20
-	i32.const	$push18=, 255
-	i32.and 	$4=, $pop19, $pop18
+	i32.load	$2=, v($pop0)
+	i32.const	$push16=, 255
+	i32.and 	$4=, $2, $pop16
+	i32.const	$push15=, 0
+	i32.load	$3=, s($pop15)
 	block   	
 	block   	
 	block   	
-	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
+	i32.eqz 	$push18=, $3
+	br_if   	0, $pop18       # 0: down to label2
+# %bb.1:                                # %if.else
 	i32.ne  	$push4=, $4, $1
 	br_if   	2, $pop4        # 2: down to label0
-# BB#2:                                 # %if.else
+# %bb.2:                                # %if.else
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $2, $pop2
-	i32.const	$push21=, 255
-	i32.and 	$push1=, $pop3, $pop21
+	i32.const	$push17=, 255
+	i32.and 	$push1=, $pop3, $pop17
 	i32.eq  	$push5=, $pop1, $0
 	br_if   	1, $pop5        # 1: down to label1
 	br      	2               # 2: down to label0
@@ -36,7 +34,7 @@ bar:                                    # @bar
 	end_block                       # label2:
 	i32.ne  	$push6=, $4, $0
 	br_if   	1, $pop6        # 1: down to label0
-# BB#4:                                 # %lor.lhs.false
+# %bb.4:                                # %lor.lhs.false
 	i32.const	$push7=, 1
 	i32.add 	$push8=, $2, $pop7
 	i32.const	$push9=, 255
@@ -66,75 +64,70 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 255
-	i32.and 	$1=, $0, $pop23
+# %bb.0:                                # %entry
+	i32.const	$push19=, 255
+	i32.and 	$1=, $0, $pop19
 	i32.const	$push0=, 0
-	i32.load	$push22=, v($pop0)
-	tee_local	$push21=, $2=, $pop22
-	i32.const	$push20=, 255
-	i32.and 	$4=, $pop21, $pop20
-	i32.const	$push19=, 1
-	i32.add 	$push1=, $0, $pop19
+	i32.load	$3=, v($pop0)
 	i32.const	$push18=, 255
-	i32.and 	$0=, $pop1, $pop18
+	i32.and 	$4=, $3, $pop18
+	i32.const	$push17=, 1
+	i32.add 	$push1=, $0, $pop17
+	i32.const	$push16=, 255
+	i32.and 	$2=, $pop1, $pop16
+	i32.const	$push15=, 0
+	i32.load	$0=, s($pop15)
 	block   	
 	block   	
 	block   	
 	block   	
-	i32.const	$push17=, 0
-	i32.load	$push16=, s($pop17)
-	tee_local	$push15=, $3=, $pop16
-	i32.eqz 	$push35=, $pop15
-	br_if   	0, $pop35       # 0: down to label6
-# BB#1:                                 # %if.else.i
-	i32.ne  	$push3=, $4, $0
+	i32.eqz 	$push25=, $0
+	br_if   	0, $pop25       # 0: down to label6
+# %bb.1:                                # %if.else.i
+	i32.ne  	$push3=, $4, $2
 	br_if   	3, $pop3        # 3: down to label3
-# BB#2:                                 # %if.else.i
-	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
+# %bb.2:                                # %if.else.i
+	i32.const	$push21=, 1
+	i32.add 	$push2=, $3, $pop21
+	i32.const	$push20=, 255
+	i32.and 	$3=, $pop2, $pop20
+	i32.ne  	$push4=, $3, $1
 	br_if   	3, $pop4        # 3: down to label3
-# BB#3:                                 # %bar.exit
-	i32.const	$push6=, 0
+# %bb.3:                                # %bar.exit
 	i32.const	$push5=, 1
-	i32.xor 	$push29=, $3, $pop5
-	tee_local	$push28=, $5=, $pop29
-	i32.store	s($pop6), $pop28
+	i32.xor 	$5=, $0, $pop5
+	i32.const	$push6=, 0
+	i32.store	s($pop6), $5
 	br_if   	1, $5           # 1: down to label5
 	br      	2               # 2: down to label4
 .LBB1_4:                                # %if.then.i
 	end_block                       # label6:
 	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
+# %bb.5:                                # %lor.lhs.false.i
+	i32.const	$push22=, 1
+	i32.add 	$push8=, $3, $pop22
 	i32.const	$push9=, 255
-	i32.and 	$push31=, $pop8, $pop9
-	tee_local	$push30=, $2=, $pop31
-	i32.ne  	$push10=, $pop30, $0
+	i32.and 	$3=, $pop8, $pop9
+	i32.ne  	$push10=, $3, $2
 	br_if   	2, $pop10       # 2: down to label3
-# BB#6:                                 # %bar.exit.thread
+# %bb.6:                                # %bar.exit.thread
 	i32.const	$push11=, 0
-	i32.const	$push33=, 1
-	i32.store	s($pop11), $pop33
+	i32.const	$push23=, 1
+	i32.store	s($pop11), $pop23
 .LBB1_7:                                # %if.else.i40
 	end_block                       # label5:
 	i32.ne  	$push12=, $4, $1
 	br_if   	1, $pop12       # 1: down to label3
-# BB#8:                                 # %if.else.i40
-	i32.ne  	$push13=, $2, $0
+# %bb.8:                                # %if.else.i40
+	i32.ne  	$push13=, $3, $2
 	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
+	i32.store	s($pop14), $0
+	i32.const	$push24=, 0
+	return  	$pop24
 .LBB1_10:                               # %if.then8.i
 	end_block                       # label3:
 	call    	abort@FUNCTION
@@ -150,7 +143,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.const	$push0=, -10
 	i32.store	v($pop6), $pop0
@@ -168,7 +161,7 @@ main:                                   # @main
 	block   	
 	i32.eqz 	$push12=, $0
 	br_if   	0, $pop12       # 0: down to label9
-# BB#2:                                 # %if.else.i.i
+# %bb.2:                                # %if.else.i.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	i32.xor 	$push1=, $1, $2
 	i32.const	$push9=, 255
@@ -182,7 +175,7 @@ main:                                   # @main
 	i32.const	$push10=, 265
 	i32.lt_s	$push3=, $2, $pop10
 	br_if   	0, $pop3        # 0: up to label8
-# BB#4:                                 # %for.end
+# %bb.4:                                # %for.end
 	end_loop
 	i32.const	$push4=, 0
 	return  	$pop4
@@ -213,5 +206,5 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr19449.c.s b/test/torture-s/pr19449.c.s
index 428539e9e..d7c9d4d2b 100644
--- a/test/torture-s/pr19449.c.s
+++ b/test/torture-s/pr19449.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,18 +20,18 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 0
 	i32.load	$push1=, y($pop5)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push0=, z($pop6)
 	i32.const	$push2=, 3
 	i32.ne  	$push3=, $pop0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false1
+# %bb.2:                                # %lor.lhs.false1
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_3:                                # %if.then
@@ -61,5 +61,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr19515.c.s b/test/torture-s/pr19515.c.s
index 7cfe8e527..12867546e 100644
--- a/test/torture-s/pr19515.c.s
+++ b/test/torture-s/pr19515.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr19606.c.s b/test/torture-s/pr19606.c.s
index c993c383a..45e3555ee 100644
--- a/test/torture-s/pr19606.c.s
+++ b/test/torture-s/pr19606.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, a($pop0)
 	i32.const	$push2=, 1
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, a($pop0)
 	i32.const	$push2=, 5
@@ -39,23 +39,22 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load8_s	$push11=, a($pop0)
-	tee_local	$push10=, $0=, $pop11
+	i32.load8_s	$0=, a($pop0)
+	block   	
 	i32.const	$push1=, 1
-	i32.shr_u	$push2=, $pop10, $pop1
+	i32.shr_u	$push2=, $0, $pop1
 	i32.const	$push3=, 2147483646
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 5
 	i32.rem_u	$push6=, $0, $pop5
 	i32.const	$push7=, 2
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end7
+# %bb.2:                                # %if.end7
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -76,6 +75,6 @@ a:
 	.size	a, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr19687.c.s b/test/torture-s/pr19687.c.s
index c9ce76410..10bcc3f98 100644
--- a/test/torture-s/pr19687.c.s
+++ b/test/torture-s/pr19687.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond.3
+# %bb.0:                                # %for.cond.3
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr19689.c.s b/test/torture-s/pr19689.c.s
index 37df17e04..32fcee452 100644
--- a/test/torture-s/pr19689.c.s
+++ b/test/torture-s/pr19689.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push7=, 0
 	i32.load	$push3=, f($pop7)
@@ -27,7 +27,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i32.load	$push1=, f($pop7)
@@ -52,4 +52,4 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr20100-1.c.s b/test/torture-s/pr20100-1.c.s
index 3886e6410..886d6d1ed 100644
--- a/test/torture-s/pr20100-1.c.s
+++ b/test/torture-s/pr20100-1.c.s
@@ -7,21 +7,20 @@
 frob:                                   # @frob
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store16	p($pop0), $1
-	i32.const	$push14=, 0
-	i32.const	$push13=, 0
+	i32.const	$push12=, 0
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $0, $pop1
-	i32.const	$push12=, 0
-	i32.load8_u	$push3=, e($pop12)
+	i32.const	$push11=, 0
+	i32.load8_u	$push3=, e($pop11)
 	i32.const	$push4=, -1
 	i32.add 	$push5=, $pop3, $pop4
 	i32.eq  	$push6=, $pop5, $0
-	i32.select	$push11=, $pop13, $pop2, $pop6
-	tee_local	$push10=, $0=, $pop11
-	i32.store16	g($pop14), $pop10
+	i32.select	$0=, $pop12, $pop2, $pop6
+	i32.const	$push10=, 0
+	i32.store16	g($pop10), $0
 	i32.const	$push7=, 65535
 	i32.and 	$push8=, $0, $pop7
 	i32.eq  	$push9=, $pop8, $1
@@ -37,20 +36,18 @@ frob:                                   # @frob
 get_n:                                  # @get_n
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
+	i32.const	$push13=, 0
+	i32.load16_u	$2=, g($pop13)
+	i32.const	$push12=, 0
+	i32.load16_u	$0=, p($pop12)
 	block   	
-	i32.const	$push17=, 0
-	i32.load16_u	$push16=, p($pop17)
-	tee_local	$push15=, $0=, $pop16
-	i32.const	$push14=, 0
-	i32.load16_u	$push13=, g($pop14)
-	tee_local	$push12=, $2=, $pop13
-	i32.eq  	$push0=, $pop15, $pop12
+	i32.eq  	$push0=, $0, $2
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push18=, 0
-	i32.load8_u	$push1=, e($pop18)
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push14=, 0
+	i32.load8_u	$push1=, e($pop14)
 	i32.const	$push2=, -1
 	i32.add 	$1=, $pop1, $pop2
 	i32.const	$3=, 0
@@ -58,26 +55,24 @@ get_n:                                  # @get_n
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
-	i32.const	$push28=, 0
-	i32.const	$push27=, 65535
-	i32.and 	$push26=, $2, $pop27
-	tee_local	$push25=, $2=, $pop26
-	i32.const	$push24=, 1
-	i32.add 	$push4=, $pop25, $pop24
-	i32.eq  	$push3=, $1, $2
-	i32.select	$2=, $pop28, $pop4, $pop3
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $3, $pop23
-	tee_local	$push21=, $3=, $pop22
 	i32.const	$push20=, 65535
-	i32.and 	$push5=, $pop21, $pop20
-	i32.const	$push19=, 4
-	i32.gt_u	$push6=, $pop5, $pop19
+	i32.and 	$2=, $2, $pop20
+	i32.const	$push19=, 0
+	i32.const	$push18=, 1
+	i32.add 	$push4=, $2, $pop18
+	i32.eq  	$push3=, $1, $2
+	i32.select	$2=, $pop19, $pop4, $pop3
+	i32.const	$push17=, 1
+	i32.add 	$3=, $3, $pop17
+	i32.const	$push16=, 65535
+	i32.and 	$push5=, $3, $pop16
+	i32.const	$push15=, 4
+	i32.gt_u	$push6=, $pop5, $pop15
 	br_if   	1, $pop6        # 1: down to label1
-# BB#3:                                 # %while.body
+# %bb.3:                                # %while.body
                                         #   in Loop: Header=BB1_2 Depth=1
-	i32.const	$push29=, 65535
-	i32.and 	$push7=, $2, $pop29
+	i32.const	$push21=, 65535
+	i32.and 	$push7=, $2, $pop21
 	i32.ne  	$push8=, $0, $pop7
 	br_if   	0, $pop8        # 0: up to label2
 .LBB1_4:                                # %while.cond.while.end_crit_edge
@@ -100,7 +95,7 @@ get_n:                                  # @get_n
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 2
 	i32.store16	p($pop1), $pop0
@@ -140,5 +135,5 @@ e:
 	.size	e, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr20187-1.c.s b/test/torture-s/pr20187-1.c.s
index 70c57bc55..305328c07 100644
--- a/test/torture-s/pr20187-1.c.s
+++ b/test/torture-s/pr20187-1.c.s
@@ -7,13 +7,12 @@
 test:                                   # @test
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push3=, b($pop0)
-	i32.const	$push11=, 0
-	i32.load	$push10=, a($pop11)
-	tee_local	$push9=, $0=, $pop10
-	i32.mul 	$push4=, $pop3, $pop9
+	i32.load	$0=, a($pop0)
+	i32.const	$push9=, 0
+	i32.load	$push3=, b($pop9)
+	i32.mul 	$push4=, $pop3, $0
 	i32.const	$push1=, 1
 	i32.select	$push2=, $0, $pop1, $0
 	i32.and 	$push5=, $pop4, $pop2
@@ -32,13 +31,12 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push3=, b($pop0)
-	i32.const	$push12=, 0
-	i32.load	$push11=, a($pop12)
-	tee_local	$push10=, $0=, $pop11
-	i32.mul 	$push4=, $pop3, $pop10
+	i32.load	$0=, a($pop0)
+	i32.const	$push10=, 0
+	i32.load	$push3=, b($pop10)
+	i32.mul 	$push4=, $pop3, $0
 	i32.const	$push1=, 1
 	i32.select	$push2=, $0, $pop1, $0
 	i32.and 	$push5=, $pop4, $pop2
@@ -70,4 +68,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr20466-1.c.s b/test/torture-s/pr20466-1.c.s
index 7f2a249b1..5a462e62e 100644
--- a/test/torture-s/pr20466-1.c.s
+++ b/test/torture-s/pr20466-1.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$5=, 0($0)
 	i32.store	0($0), $2
 	i32.load	$push0=, 0($4)
@@ -31,14 +31,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push25=, 0
+# %bb.0:                                # %entry
 	i32.const	$push23=, 0
 	i32.load	$push22=, __stack_pointer($pop23)
 	i32.const	$push24=, 32
-	i32.sub 	$push46=, $pop22, $pop24
-	tee_local	$push45=, $0=, $pop46
-	i32.store	__stack_pointer($pop25), $pop45
+	i32.sub 	$0=, $pop22, $pop24
+	i32.const	$push25=, 0
+	i32.store	__stack_pointer($pop25), $0
 	i32.const	$push4=, 42
 	i32.store	28($0), $pop4
 	i32.const	$push5=, 66
@@ -72,35 +71,35 @@ main:                                   # @main
 	i32.const	$push44=, 66
 	i32.ne  	$push10=, $pop9, $pop44
 	br_if   	0, $pop10       # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 8($0)
 	i32.const	$push40=, 20
 	i32.add 	$push41=, $0, $pop40
 	copy_local	$push1=, $pop41
 	i32.ne  	$push11=, $pop0, $pop1
 	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.load	$push2=, 20($0)
 	i32.const	$push12=, 99
 	i32.ne  	$push13=, $pop2, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.load	$push3=, 16($0)
 	i32.const	$push14=, -1
 	i32.ne  	$push15=, $pop3, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false6
+# %bb.4:                                # %lor.lhs.false6
 	i32.load	$push17=, 4($0)
 	i32.const	$push42=, 12
 	i32.add 	$push43=, $0, $pop42
 	i32.ne  	$push18=, $pop17, $pop43
 	br_if   	0, $pop18       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false6
+# %bb.5:                                # %lor.lhs.false6
 	i32.load	$push16=, 12($0)
 	i32.const	$push19=, 55
 	i32.ne  	$push20=, $pop16, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	i32.const	$push21=, 0
 	call    	exit@FUNCTION, $pop21
 	unreachable
@@ -113,6 +112,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 35ad86dbf..2410e6bcd 100644
--- a/test/torture-s/pr20527-1.c.s
+++ b/test/torture-s/pr20527-1.c.s
@@ -7,17 +7,16 @@
 f:                                      # @f
 	.param  	i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.gt_s	$push0=, $2, $3
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
-	i32.const	$push12=, -1
-	i32.add 	$4=, $2, $pop12
+# %bb.1:                                # %for.body.preheader
+	i32.const	$push10=, -1
+	i32.add 	$4=, $2, $pop10
 	i32.const	$push1=, 2
-	i32.shl 	$push11=, $2, $pop1
-	tee_local	$push10=, $2=, $pop11
-	i32.add 	$0=, $0, $pop10
+	i32.shl 	$2=, $2, $pop1
+	i32.add 	$0=, $0, $2
 	i32.add 	$push2=, $1, $2
 	i32.const	$push9=, 4
 	i32.add 	$2=, $pop2, $pop9
@@ -26,23 +25,21 @@ f:                                      # @f
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.load	$push5=, 0($2)
-	i32.const	$push21=, -4
-	i32.add 	$push3=, $2, $pop21
+	i32.const	$push15=, -4
+	i32.add 	$push3=, $2, $pop15
 	i32.load	$push4=, 0($pop3)
 	i32.sub 	$push6=, $pop5, $pop4
-	i32.add 	$push20=, $pop6, $1
-	tee_local	$push19=, $1=, $pop20
-	i32.const	$push18=, -1
-	i32.add 	$push7=, $pop19, $pop18
+	i32.add 	$1=, $pop6, $1
+	i32.const	$push14=, -1
+	i32.add 	$push7=, $1, $pop14
 	i32.store	0($0), $pop7
-	i32.const	$push17=, 4
-	i32.add 	$0=, $0, $pop17
-	i32.const	$push16=, 4
-	i32.add 	$2=, $2, $pop16
-	i32.const	$push15=, 1
-	i32.add 	$push14=, $4, $pop15
-	tee_local	$push13=, $4=, $pop14
-	i32.lt_s	$push8=, $pop13, $3
+	i32.const	$push13=, 4
+	i32.add 	$0=, $0, $pop13
+	i32.const	$push12=, 4
+	i32.add 	$2=, $2, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$4=, $4, $pop11
+	i32.lt_s	$push8=, $4, $3
 	br_if   	0, $pop8        # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
@@ -59,14 +56,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 16
-	i32.sub 	$push20=, $pop13, $pop15
-	tee_local	$push19=, $0=, $pop20
-	i32.store	__stack_pointer($pop16), $pop19
+	i32.sub 	$0=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $0
 	i32.const	$push17=, 4
 	i32.add 	$push18=, $0, $pop17
 	i32.const	$push2=, b
@@ -78,17 +74,17 @@ main:                                   # @main
 	i32.const	$push3=, 3
 	i32.ne  	$push5=, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label2
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push7=, 8($0)
 	i32.const	$push6=, 9
 	i32.ne  	$push8=, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label2
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i32.load	$push10=, 12($0)
 	i32.const	$push9=, 21
 	i32.ne  	$push11=, $pop10, $pop9
 	br_if   	0, $pop11       # 0: down to label2
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push12=, 0
 	call    	exit@FUNCTION, $pop12
 	unreachable
@@ -113,6 +109,6 @@ b:
 	.size	b, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 32adc4fb0..680a76df5 100644
--- a/test/torture-s/pr20601-1.c.s
+++ b/test/torture-s/pr20601-1.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 .LBB0_1:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
@@ -23,7 +23,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,7 +37,7 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %land.rhs.lr.ph.i
+# %bb.0:                                # %land.rhs.lr.ph.i
 	i32.const	$push35=, 0
 	i32.const	$push34=, 4
 	i32.store	b($pop35), $pop34
@@ -61,20 +61,18 @@ main:                                   # @main
 	block   	
 	block   	
 	loop    	                # label6:
-	i32.load	$push38=, 0($0)
-	tee_local	$push37=, $2=, $pop38
-	i32.load8_u	$push1=, 0($pop37)
+	i32.load	$2=, 0($0)
+	i32.load8_u	$push1=, 0($2)
 	i32.const	$push36=, 45
 	i32.ne  	$push2=, $pop1, $pop36
 	br_if   	1, $pop2        # 1: down to label5
-# BB#2:                                 # %while.body.i
+# %bb.2:                                # %while.body.i
                                         #   in Loop: Header=BB2_1 Depth=1
+	i32.load8_s	$4=, 1($2)
 	block   	
-	i32.load8_s	$push40=, 1($2)
-	tee_local	$push39=, $4=, $pop40
-	i32.eqz 	$push81=, $pop39
-	br_if   	0, $pop81       # 0: down to label7
-# BB#3:                                 # %land.lhs.true.i
+	i32.eqz 	$push63=, $4
+	br_if   	0, $pop63       # 0: down to label7
+# %bb.3:                                # %land.lhs.true.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	i32.load8_u	$push5=, 2($2)
 	br_if   	5, $pop5        # 5: down to label2
@@ -85,25 +83,25 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	i32.const	$push41=, 80
-	i32.eq  	$push6=, $4, $pop41
+	i32.const	$push37=, 80
+	i32.eq  	$push6=, $4, $pop37
 	br_if   	0, $pop6        # 0: down to label11
-# BB#5:                                 # %if.end.i
+# %bb.5:                                # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push42=, 117
-	i32.eq  	$push7=, $4, $pop42
+	i32.const	$push38=, 117
+	i32.eq  	$push7=, $4, $pop38
 	br_if   	2, $pop7        # 2: down to label9
-# BB#6:                                 # %if.end.i
+# %bb.6:                                # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push43=, 45
-	i32.ne  	$push8=, $4, $pop43
+	i32.const	$push39=, 45
+	i32.ne  	$push8=, $4, $pop39
 	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
 	end_block                       # label11:
-	i32.const	$push44=, 4096
-	i32.or  	$3=, $3, $pop44
+	i32.const	$push40=, 4096
+	i32.or  	$3=, $3, $pop40
 .LBB2_8:                                # %sw.epilog.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label10:
@@ -113,37 +111,33 @@ main:                                   # @main
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label9:
 	i32.load	$push16=, 4($0)
-	i32.eqz 	$push82=, $pop16
-	br_if   	5, $pop82       # 5: down to label2
-# BB#10:                                # %if.end19.i
+	i32.eqz 	$push64=, $pop16
+	br_if   	5, $pop64       # 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=, $0, $pop52
-	tee_local	$push50=, $0=, $pop51
-	i32.store	t+4100($pop53), $pop50
-	i32.const	$push49=, 0
-	i32.store	e($pop49), $0
-	i32.const	$push48=, 0
-	i32.const	$push47=, -1
-	i32.add 	$push46=, $1, $pop47
-	tee_local	$push45=, $4=, $pop46
-	i32.store	d($pop48), $pop45
+	i32.const	$push45=, 4
+	i32.add 	$0=, $0, $pop45
+	i32.const	$push44=, 0
+	i32.store	t+4100($pop44), $0
+	i32.const	$push43=, 0
+	i32.store	e($pop43), $0
+	i32.const	$push42=, -1
+	i32.add 	$4=, $1, $pop42
+	i32.const	$push41=, 0
+	i32.store	d($pop41), $4
 .LBB2_11:                               # %sw.epilog.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label8:
-	i32.const	$push62=, 0
-	i32.const	$push61=, 4
-	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=, $1=, $pop56
-	i32.store	d($pop58), $pop55
-	i32.const	$push54=, 1
-	i32.gt_s	$push17=, $4, $pop54
+	i32.const	$push50=, 4
+	i32.add 	$0=, $0, $pop50
+	i32.const	$push49=, 0
+	i32.store	e($pop49), $0
+	i32.const	$push48=, -1
+	i32.add 	$1=, $4, $pop48
+	i32.const	$push47=, 0
+	i32.store	d($pop47), $1
+	i32.const	$push46=, 1
+	i32.gt_s	$push17=, $4, $pop46
 	br_if   	0, $pop17       # 0: up to label6
 	br      	3               # 3: down to label3
 .LBB2_12:                               # %while.end.i
@@ -155,16 +149,14 @@ main:                                   # @main
 	br      	2               # 2: down to label2
 .LBB2_13:                               # %sw.bb22.i
 	end_block                       # label4:
-	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.add 	$0=, $0, $pop9
+	i32.const	$push10=, 0
+	i32.store	e($pop10), $0
 	i32.const	$push11=, -1
-	i32.add 	$push64=, $1, $pop11
-	tee_local	$push63=, $1=, $pop64
-	i32.store	d($pop65), $pop63
+	i32.add 	$1=, $1, $pop11
+	i32.const	$push51=, 0
+	i32.store	d($pop51), $1
 	i32.const	$push14=, 1536
 	i32.or  	$push15=, $3, $pop14
 	i32.const	$push12=, 1
@@ -172,50 +164,49 @@ main:                                   # @main
 	i32.select	$3=, $pop15, $3, $pop13
 .LBB2_14:                               # %setup2.exit
 	end_block                       # label3:
-	i32.const	$push69=, 0
-	i32.const	$push68=, .L.str.4
-	i32.store	t($pop69), $pop68
+	i32.const	$push53=, 0
+	i32.const	$push52=, .L.str.4
+	i32.store	t($pop53), $pop52
 	block   	
 	i32.const	$push18=, 512
 	i32.and 	$push19=, $3, $pop18
-	i32.eqz 	$push83=, $pop19
-	br_if   	0, $pop83       # 0: down to label12
-# BB#15:                                # %if.then6.i
-	i32.const	$push74=, 0
-	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.eqz 	$push65=, $pop19
+	br_if   	0, $pop65       # 0: down to label12
+# %bb.15:                               # %if.then6.i
+	i32.const	$push58=, 0
+	i32.const	$push57=, f
+	i32.store	e($pop58), $pop57
+	i32.const	$push56=, 0
+	i32.const	$push55=, .L.str.4
+	i32.store	f($pop56), $pop55
+	i32.const	$push54=, 0
 	i32.const	$push20=, 1
 	i32.add 	$push21=, $1, $pop20
-	i32.store	d($pop70), $pop21
+	i32.store	d($pop54), $pop21
 	i32.const	$4=, 4
 .LBB2_16:                               # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label13:
-	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
+	i32.const	$push61=, -4
+	i32.add 	$push24=, $pop23, $pop61
+	i32.load	$2=, 0($pop24)
+	i32.const	$push60=, f
+	i32.add 	$push22=, $4, $pop60
+	i32.store	0($pop22), $2
+	i32.const	$push59=, 4
+	i32.add 	$4=, $4, $pop59
 	br_if   	0, $2           # 0: up to label13
 .LBB2_17:                               # %setup1.exit
 	end_loop
 	end_block                       # label12:
 	i32.const	$push26=, 1024
 	i32.and 	$push27=, $3, $pop26
-	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)
+	i32.eqz 	$push66=, $pop27
+	br_if   	1, $pop66       # 1: down to label1
+# %bb.18:                               # %setup1.exit
+	i32.const	$push62=, 0
+	i32.load	$push25=, a+16($pop62)
 	br_if   	1, $pop25       # 1: down to label1
 .LBB2_19:                               # %if.then.i
 	end_block                       # label2:
@@ -333,6 +324,6 @@ f:
 	.size	f, 64
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8664bfa45..7e610b8b4 100644
--- a/test/torture-s/pr20621-1.c.s
+++ b/test/torture-s/pr20621-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $1, $pop0
 	i32.add 	$push2=, $0, $pop1
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push2=, gb+4($pop0)
 	i32.const	$push4=, 0
@@ -44,4 +44,4 @@ gb:
 	.size	gb, 65536
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr21173.c.s b/test/torture-s/pr21173.c.s
index ae83d8d32..84af9fc5d 100644
--- a/test/torture-s/pr21173.c.s
+++ b/test/torture-s/pr21173.c.s
@@ -6,14 +6,13 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i32.const	$push10=, 0
-	i32.load	$push2=, a($pop10)
+# %bb.0:                                # %entry
 	i32.const	$push0=, q
-	i32.sub 	$push9=, $0, $pop0
-	tee_local	$push8=, $0=, $pop9
-	i32.add 	$push3=, $pop2, $pop8
+	i32.sub 	$0=, $0, $pop0
+	i32.const	$push1=, 0
+	i32.const	$push8=, 0
+	i32.load	$push2=, a($pop8)
+	i32.add 	$push3=, $pop2, $0
 	i32.store	a($pop1), $pop3
 	i32.const	$push7=, 0
 	i32.const	$push6=, 0
@@ -31,7 +30,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 0
 	i32.load	$push1=, a($pop4)
@@ -39,7 +38,7 @@ main:                                   # @main
 	i32.load	$push0=, a+4($pop3)
 	i32.or  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %for.cond.1
+# %bb.1:                                # %for.cond.1
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB1_2:                                # %if.then
@@ -68,5 +67,5 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr21331.c.s b/test/torture-s/pr21331.c.s
index 204f06f15..c2ef11f3c 100644
--- a/test/torture-s/pr21331.c.s
+++ b/test/torture-s/pr21331.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -40,4 +40,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr21964-1.c.s b/test/torture-s/pr21964-1.c.s
index ab7f56fec..3c3c70fe8 100644
--- a/test/torture-s/pr21964-1.c.s
+++ b/test/torture-s/pr21964-1.c.s
@@ -6,14 +6,14 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push1=, $1
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.eqz 	$push2=, $0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#2:                                 # %if.then2.split
+# %bb.2:                                # %if.then2.split
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_3:                                # %if.then
@@ -31,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -40,6 +40,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fb9845dd3..04fc0b673 100644
--- a/test/torture-s/pr22061-1.c.s
+++ b/test/torture-s/pr22061-1.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,11 +18,10 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push3=, N($pop0)
-	tee_local	$push2=, $1=, $pop3
-	i32.add 	$push1=, $0, $pop2
+	i32.load	$1=, N($pop0)
+	i32.add 	$push1=, $0, $1
 	i32.store8	0($pop1), $1
                                         # fallthrough-return
 	.endfunc
@@ -35,7 +34,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 4
 	i32.store	N($pop1), $pop0
@@ -56,5 +55,5 @@ N:
 	.size	N, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22061-2.c.s b/test/torture-s/pr22061-2.c.s
index 822ffd9f2..863d2f8bd 100644
--- a/test/torture-s/pr22061-2.c.s
+++ b/test/torture-s/pr22061-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -24,5 +24,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22098-1.c.s b/test/torture-s/pr22098-1.c.s
index e3d7764d8..ca7028280 100644
--- a/test/torture-s/pr22098-1.c.s
+++ b/test/torture-s/pr22098-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22098-2.c.s b/test/torture-s/pr22098-2.c.s
index bcf8d5a7b..5ef4f832e 100644
--- a/test/torture-s/pr22098-2.c.s
+++ b/test/torture-s/pr22098-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22098-3.c.s b/test/torture-s/pr22098-3.c.s
index 5adfa6c08..419cfc85b 100644
--- a/test/torture-s/pr22098-3.c.s
+++ b/test/torture-s/pr22098-3.c.s
@@ -7,16 +7,15 @@
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load	$push1=, n($pop5)
+	i32.load	$push1=, n($pop0)
 	i32.const	$push2=, 1
-	i32.add 	$push4=, $pop1, $pop2
-	tee_local	$push3=, $0=, $pop4
-	i32.store	n($pop0), $pop3
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	i32.add 	$0=, $pop1, $pop2
+	i32.const	$push3=, 0
+	i32.store	n($pop3), $0
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -28,19 +27,18 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, n($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, n($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 1
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	n($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	n($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	call    	exit@FUNCTION, $pop6
+# %bb.1:                                # %if.end
+	i32.const	$push4=, 0
+	call    	exit@FUNCTION, $pop4
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -60,6 +58,6 @@ n:
 	.size	n, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr22348.c.s b/test/torture-s/pr22348.c.s
index 62464db07..66b49e52d 100644
--- a/test/torture-s/pr22348.c.s
+++ b/test/torture-s/pr22348.c.s
@@ -6,12 +6,12 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 53
 	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -27,7 +27,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,5 +35,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr22429.c.s b/test/torture-s/pr22429.c.s
index f2d0c9cf5..61e6ff325 100644
--- a/test/torture-s/pr22429.c.s
+++ b/test/torture-s/pr22429.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1073741824
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 31
@@ -25,7 +25,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,4 +33,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr22493-1.c.s b/test/torture-s/pr22493-1.c.s
index 39331b40a..5a4a14a92 100644
--- a/test/torture-s/pr22493-1.c.s
+++ b/test/torture-s/pr22493-1.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -20,7 +20,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -28,5 +28,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr22630.c.s b/test/torture-s/pr22630.c.s
index 60f21ed05..ccc97dedb 100644
--- a/test/torture-s/pr22630.c.s
+++ b/test/torture-s/pr22630.c.s
@@ -6,13 +6,13 @@
 	.type	bla,@function
 bla:                                    # @bla
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, j
 	i32.select	$push1=, $0, $pop0, $0
 	i32.eq  	$push2=, $pop1, $0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then1
+# %bb.1:                                # %if.then1
 	i32.const	$push4=, 0
 	i32.const	$push3=, 1
 	i32.store	j($pop4), $pop3
@@ -29,7 +29,7 @@ bla:                                    # @bla
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	j($pop1), $pop0
@@ -49,4 +49,4 @@ j:
 	.size	j, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr23047.c.s b/test/torture-s/pr23047.c.s
index ed208d885..02ecff5ff 100644
--- a/test/torture-s/pr23047.c.s
+++ b/test/torture-s/pr23047.c.s
@@ -7,17 +7,16 @@
 f:                                      # @f
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 31
-	i32.shr_s	$push6=, $0, $pop0
-	tee_local	$push5=, $1=, $pop6
-	i32.add 	$push1=, $0, $pop5
+	i32.shr_s	$1=, $0, $pop0
+	block   	
+	i32.add 	$push1=, $0, $1
 	i32.xor 	$push2=, $pop1, $1
 	i32.const	$push3=, -1
 	i32.gt_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	return
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
@@ -34,7 +33,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2147483648
 	call    	f@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -45,6 +44,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr23135.c.s b/test/torture-s/pr23135.c.s
index ed94e2c8c..78ab262b3 100644
--- a/test/torture-s/pr23135.c.s
+++ b/test/torture-s/pr23135.c.s
@@ -6,14 +6,14 @@
 	.type	verify,@function
 verify:                                 # @verify
 	.param  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $2
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.ne  	$push1=, $1, $3
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -30,241 +30,215 @@ verify:                                 # @verify
 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	$push100=, 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.const	$push90=, 0
-	i32.load	$push89=, j($pop90)
-	tee_local	$push88=, $4=, $pop89
+# %bb.0:                                # %entry
+	i32.const	$push88=, 0
+	i32.load	$1=, i+4($pop88)
 	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
+	i32.load	$5=, j+4($pop87)
+	i32.add 	$7=, $5, $1
+	i32.const	$push86=, 0
+	i32.store	res+4($pop86), $7
+	i32.const	$push85=, 0
+	i32.load	$0=, i($pop85)
+	i32.const	$push84=, 0
+	i32.load	$4=, j($pop84)
+	i32.add 	$6=, $4, $0
+	i32.const	$push83=, 0
+	i32.store	res($pop83), $6
 	block   	
 	i32.const	$push0=, 160
 	i32.ne  	$push1=, $6, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 113
 	i32.ne  	$push3=, $7, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %verify.exit
+# %bb.2:                                # %verify.exit
+	i32.mul 	$8=, $4, $0
 	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=, $5, $1
-	tee_local	$push101=, $9=, $pop102
-	i32.store	res+4($pop103), $pop101
+	i32.store	res($pop4), $8
+	i32.mul 	$9=, $5, $1
+	i32.const	$push89=, 0
+	i32.store	res+4($pop89), $9
 	i32.const	$push5=, 1500
 	i32.ne  	$push6=, $8, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#3:                                 # %verify.exit
+# %bb.3:                                # %verify.exit
 	i32.const	$push7=, 1300
 	i32.ne  	$push8=, $9, $pop7
 	br_if   	0, $pop8        # 0: down to label1
-# BB#4:                                 # %verify.exit48
+# %bb.4:                                # %verify.exit48
+	i32.div_s	$10=, $0, $4
 	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, $5
-	tee_local	$push106=, $11=, $pop107
-	i32.store	res+4($pop108), $pop106
+	i32.store	res($pop9), $10
+	i32.div_s	$11=, $1, $5
+	i32.const	$push90=, 0
+	i32.store	res+4($pop90), $11
 	i32.const	$push10=, 15
 	i32.ne  	$push11=, $10, $pop10
 	br_if   	0, $pop11       # 0: down to label1
-# BB#5:                                 # %verify.exit48
+# %bb.5:                                # %verify.exit48
 	i32.const	$push12=, 7
 	i32.ne  	$push13=, $11, $pop12
 	br_if   	0, $pop13       # 0: down to label1
-# BB#6:                                 # %verify.exit54
+# %bb.6:                                # %verify.exit54
+	i32.and 	$12=, $4, $0
 	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=, $5, $1
-	tee_local	$push111=, $13=, $pop112
-	i32.store	res+4($pop113), $pop111
+	i32.store	res($pop14), $12
+	i32.and 	$13=, $5, $1
+	i32.const	$push91=, 0
+	i32.store	res+4($pop91), $13
 	i32.const	$push15=, 2
 	i32.ne  	$push16=, $12, $pop15
 	br_if   	0, $pop16       # 0: down to label1
-# BB#7:                                 # %verify.exit54
+# %bb.7:                                # %verify.exit54
 	i32.const	$push17=, 4
 	i32.ne  	$push18=, $13, $pop17
 	br_if   	0, $pop18       # 0: down to label1
-# BB#8:                                 # %verify.exit60
+# %bb.8:                                # %verify.exit60
+	i32.or  	$14=, $4, $0
 	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=, $5, $1
-	tee_local	$push116=, $15=, $pop117
-	i32.store	res+4($pop118), $pop116
+	i32.store	res($pop19), $14
+	i32.or  	$15=, $5, $1
+	i32.const	$push92=, 0
+	i32.store	res+4($pop92), $15
 	i32.const	$push20=, 158
 	i32.ne  	$push21=, $14, $pop20
 	br_if   	0, $pop21       # 0: down to label1
-# BB#9:                                 # %verify.exit60
+# %bb.9:                                # %verify.exit60
 	i32.const	$push22=, 109
 	i32.ne  	$push23=, $15, $pop22
 	br_if   	0, $pop23       # 0: down to label1
-# BB#10:                                # %verify.exit66
+# %bb.10:                               # %verify.exit66
+	i32.xor 	$4=, $4, $0
 	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=, $5, $1
-	tee_local	$push121=, $5=, $pop122
-	i32.store	res+4($pop123), $pop121
+	i32.store	res($pop24), $4
+	i32.xor 	$5=, $5, $1
+	i32.const	$push93=, 0
+	i32.store	res+4($pop93), $5
 	i32.const	$push25=, 156
 	i32.ne  	$push26=, $4, $pop25
 	br_if   	0, $pop26       # 0: down to label1
-# BB#11:                                # %verify.exit66
+# %bb.11:                               # %verify.exit66
 	i32.const	$push27=, 105
 	i32.ne  	$push28=, $5, $pop27
 	br_if   	0, $pop28       # 0: down to label1
-# BB#12:                                # %verify.exit72
+# %bb.12:                               # %verify.exit72
+	i32.const	$push96=, 0
+	i32.sub 	$3=, $pop96, $1
+	i32.const	$push95=, 0
+	i32.sub 	$2=, $pop95, $0
 	i32.const	$push29=, 0
-	i32.const	$push132=, 0
-	i32.sub 	$push131=, $pop132, $0
-	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=, $3=, $pop127
-	i32.store	res+4($pop129), $pop126
+	i32.store	res($pop29), $2
+	i32.const	$push94=, 0
+	i32.store	res+4($pop94), $3
 	i32.const	$push30=, -150
 	i32.ne  	$push31=, $2, $pop30
 	br_if   	0, $pop31       # 0: down to label1
-# BB#13:                                # %verify.exit72
+# %bb.13:                               # %verify.exit72
 	i32.const	$push32=, -100
 	i32.ne  	$push33=, $3, $pop32
 	br_if   	0, $pop33       # 0: down to label1
-# BB#14:                                # %verify.exit78
-	i32.const	$push35=, 0
+# %bb.14:                               # %verify.exit78
 	i32.const	$push34=, -1
-	i32.xor 	$push138=, $0, $pop34
-	tee_local	$push137=, $16=, $pop138
-	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.xor 	$16=, $0, $pop34
+	i32.const	$push35=, 0
+	i32.store	res($pop35), $16
+	i32.const	$push98=, -1
+	i32.xor 	$17=, $1, $pop98
+	i32.const	$push97=, 0
+	i32.store	res+4($pop97), $17
 	i32.const	$push36=, 150
 	i32.ne  	$push37=, $0, $pop36
 	br_if   	0, $pop37       # 0: down to label1
-# BB#15:                                # %verify.exit78
+# %bb.15:                               # %verify.exit78
 	i32.const	$push38=, -101
 	i32.ne  	$push39=, $17, $pop38
 	br_if   	0, $pop39       # 0: down to label1
-# BB#16:                                # %verify.exit84
-	i32.const	$push45=, 0
+# %bb.16:                               # %verify.exit84
 	i32.sub 	$push40=, $16, $0
 	i32.add 	$push41=, $pop40, $8
 	i32.add 	$push42=, $pop41, $6
 	i32.add 	$push43=, $pop42, $12
 	i32.add 	$push44=, $pop43, $14
-	i32.add 	$push145=, $pop44, $4
-	tee_local	$push144=, $0=, $pop145
-	i32.store	res($pop45), $pop144
-	i32.const	$push143=, 0
-	i32.store	k($pop143), $0
-	i32.const	$push142=, 0
+	i32.add 	$0=, $pop44, $4
+	i32.const	$push45=, 0
+	i32.store	res($pop45), $0
+	i32.const	$push101=, 0
+	i32.store	k($pop101), $0
 	i32.sub 	$push46=, $17, $1
 	i32.add 	$push47=, $pop46, $9
 	i32.add 	$push48=, $pop47, $7
 	i32.add 	$push49=, $pop48, $13
 	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.add 	$1=, $pop50, $5
+	i32.const	$push100=, 0
+	i32.store	res+4($pop100), $1
+	i32.const	$push99=, 0
+	i32.store	k+4($pop99), $1
 	i32.const	$push51=, 1675
 	i32.ne  	$push52=, $0, $pop51
 	br_if   	0, $pop52       # 0: down to label1
-# BB#17:                                # %verify.exit84
+# %bb.17:                               # %verify.exit84
 	i32.const	$push53=, 1430
 	i32.ne  	$push54=, $1, $pop53
 	br_if   	0, $pop54       # 0: down to label1
-# BB#18:                                # %verify.exit90
-	i32.const	$push60=, 0
+# %bb.18:                               # %verify.exit90
 	i32.mul 	$push55=, $16, $2
 	i32.mul 	$push56=, $pop55, $8
 	i32.mul 	$push57=, $pop56, $6
 	i32.mul 	$push58=, $pop57, $12
 	i32.mul 	$push59=, $pop58, $14
-	i32.mul 	$push152=, $pop59, $4
-	tee_local	$push151=, $0=, $pop152
-	i32.store	res($pop60), $pop151
-	i32.const	$push150=, 0
-	i32.store	k($pop150), $0
-	i32.const	$push149=, 0
+	i32.mul 	$0=, $pop59, $4
+	i32.const	$push60=, 0
+	i32.store	res($pop60), $0
+	i32.const	$push104=, 0
+	i32.store	k($pop104), $0
 	i32.mul 	$push61=, $17, $3
 	i32.mul 	$push62=, $pop61, $9
 	i32.mul 	$push63=, $pop62, $7
 	i32.mul 	$push64=, $pop63, $13
 	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.mul 	$1=, $pop65, $5
+	i32.const	$push103=, 0
+	i32.store	res+4($pop103), $1
+	i32.const	$push102=, 0
+	i32.store	k+4($pop102), $1
 	i32.const	$push66=, 1456467968
 	i32.ne  	$push67=, $0, $pop66
 	br_if   	0, $pop67       # 0: down to label1
-# BB#19:                                # %verify.exit90
+# %bb.19:                               # %verify.exit90
 	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
+# %bb.20:                               # %verify.exit96
 	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	$push159=, $pop75, $16
-	tee_local	$push158=, $6=, $pop159
-	i32.store	res($pop160), $pop158
-	i32.const	$push157=, 0
-	i32.store	k($pop157), $6
-	i32.const	$push156=, 0
+	i32.div_s	$6=, $pop75, $16
+	i32.const	$push108=, 0
+	i32.store	res($pop108), $6
+	i32.const	$push107=, 0
+	i32.store	k($pop107), $6
 	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	$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.div_s	$0=, $pop81, $17
+	i32.const	$push106=, 0
+	i32.store	res+4($pop106), $0
+	i32.const	$push105=, 0
+	i32.store	k+4($pop105), $0
 	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
+# %bb.21:                               # %verify.exit102
+	i32.const	$push109=, 0
+	call    	exit@FUNCTION, $pop109
 	unreachable
 .LBB1_22:                               # %if.then.i
 	end_block                       # label1:
@@ -313,6 +287,6 @@ k:
 	.size	k, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr23324.c.s b/test/torture-s/pr23324.c.s
index 41b88d31e..be3b81910 100644
--- a/test/torture-s/pr23324.c.s
+++ b/test/torture-s/pr23324.c.s
@@ -6,93 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	f64, f32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push9=, 0
-	f64.load	$push8=, wv6+32($pop9)
-	tee_local	$push7=, $0=, $pop8
-	f64.ne  	$push0=, $pop7, $0
-	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %caller_bf6.exit
-	i32.const	$push12=, 0
-	f32.load	$push11=, yv7($pop12)
-	tee_local	$push10=, $1=, $pop11
-	f32.ne  	$push1=, $pop10, $1
-	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end26.i.i
-	i32.const	$push2=, 0
-	f64.load	$push14=, yv7+16($pop2)
-	tee_local	$push13=, $0=, $pop14
-	f64.ne  	$push3=, $pop13, $0
-	br_if   	0, $pop3        # 0: down to label0
-# BB#3:                                 # %if.end30.i.i
-	i32.const	$push17=, 0
-	f32.load	$push16=, yv7+24($pop17)
-	tee_local	$push15=, $1=, $pop16
-	f32.ne  	$push4=, $pop15, $1
-	br_if   	0, $pop4        # 0: down to label0
-# BB#4:                                 # %if.end34.i.i
-	i32.const	$push20=, 0
-	f32.load	$push19=, zv7($pop20)
-	tee_local	$push18=, $1=, $pop19
-	f32.ne  	$push5=, $pop18, $1
-	br_if   	0, $pop5        # 0: down to label0
-# BB#5:                                 # %caller_bf7.exit
-	i32.const	$push6=, 0
-	return  	$pop6
-.LBB0_6:                                # %if.then109.i.i
-	end_block                       # label0:
-	call    	abort@FUNCTION
-	unreachable
+# %bb.0:                                # %entry
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
                                         # -- End function
-	.type	wv6,@object             # @wv6
-	.section	.data.wv6,"aw",@progbits
-	.p2align	3
-wv6:
-	.int8	72                      # 0x48
-	.int8	66                      # 0x42
-	.int8	32                      # 0x20
-	.int8	16                      # 0x10
-	.int32	67426805                # 0x404d9f5
-	.int32	1047191860              # 0x3e6ae134
-	.int32	1366022414              # 0x516bd90e
-	.int8	90                      # 0x5a
-	.int8	147                     # 0x93
-	.int8	98                      # 0x62
-	.int8	2                       # 0x2
-	.int32	1069379046              # 0x3fbd6de6
-	.int32	358273621
-	.skip	4
-	.int64	4659514866546242126     # double 3318.0419780000002
-	.size	wv6, 40
 
-	.type	zv7,@object             # @zv7
-	.section	.data.zv7,"aw",@progbits
-	.p2align	2
-zv7:
-	.int32	1167954387              # float 5042.22803
-	.size	zv7, 4
-
-	.type	yv7,@object             # @yv7
-	.section	.data.yv7,"aw",@progbits
-	.p2align	3
-yv7:
-	.int32	1189834750              # float 30135.9961
-	.int16	42435                   # 0xa5c3
-	.skip	2
-	.int8	170                     # 0xaa
-	.int8	0                       # 0x0
-	.int16	22116                   # 0x5664
-	.skip	4
-	.int64	4673007878717811523     # double 26479.628148
-	.int32	1165963103              # float 4082.96069
-	.skip	4
-	.size	yv7, 32
-
-
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
-	.functype	abort, void
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr23467.c.s b/test/torture-s/pr23467.c.s
index 7d6f9dc0d..e2d3c4f84 100644
--- a/test/torture-s/pr23467.c.s
+++ b/test/torture-s/pr23467.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -24,5 +24,5 @@ v:
 	.size	v, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr23604.c.s b/test/torture-s/pr23604.c.s
index 60cc0f180..8cdee7ccb 100644
--- a/test/torture-s/pr23604.c.s
+++ b/test/torture-s/pr23604.c.s
@@ -7,18 +7,18 @@
 g:                                      # @g
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then2
+# %bb.1:                                # %if.then2
 	i32.eq  	$push2=, $0, $1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#2:                                 # %if.then2
+# %bb.2:                                # %if.then2
 	i32.eqz 	$push5=, $1
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %return
+# %bb.3:                                # %return
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_4:                                # %if.end9
@@ -35,7 +35,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -43,4 +43,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr23941.c.s b/test/torture-s/pr23941.c.s
index 8f4a5404e..21a71930a 100644
--- a/test/torture-s/pr23941.c.s
+++ b/test/torture-s/pr23941.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	f64.load	$push0=, d($pop3)
 	f64.const	$push1=, 0x1p-127
 	f64.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -34,5 +34,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr24141.c.s b/test/torture-s/pr24141.c.s
index 6b9d9ea88..e552a96bb 100644
--- a/test/torture-s/pr24141.c.s
+++ b/test/torture-s/pr24141.c.s
@@ -5,7 +5,7 @@
 	.globl	g
 	.type	g,@function
 g:                                      # @g
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	i($pop1), $pop0
@@ -20,13 +20,13 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push2=, $0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	br_if   	0, $1           # 0: down to label0
-# BB#2:                                 # %if.then10
+# %bb.2:                                # %if.then10
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	i($pop1), $pop0
@@ -43,7 +43,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	i($pop1), $pop0
@@ -63,4 +63,4 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr24142.c.s b/test/torture-s/pr24142.c.s
index b24678c1e..52058b40a 100644
--- a/test/torture-s/pr24142.c.s
+++ b/test/torture-s/pr24142.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 2
 	i32.lt_u	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -24,7 +24,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,4 +32,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr24716.c.s b/test/torture-s/pr24716.c.s
index b1182823f..38a72b961 100644
--- a/test/torture-s/pr24716.c.s
+++ b/test/torture-s/pr24716.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$5=, 0
 	i32.const	$3=, 0
 	block   	
@@ -17,7 +17,7 @@ f:                                      # @f
 	i32.const	$push15=, 3
 	i32.lt_s	$push0=, $pop16, $pop15
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:
+# %bb.1:
 	i32.const	$6=, 12
 	br      	1               # 1: down to label0
 .LBB0_2:
@@ -86,28 +86,27 @@ f:                                      # @f
 	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
+# %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	$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
+	i32.const	$push19=, 1
+	i32.add 	$5=, $5, $pop19
+	i32.const	$push18=, -1
+	i32.add 	$4=, $3, $pop18
+	i32.gt_s	$push3=, $5, $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	$4=, 0
-	i32.const	$push22=, 1
-	i32.eq  	$push2=, $3, $pop22
+	i32.const	$push20=, 1
+	i32.eq  	$push2=, $3, $pop20
 	br_if   	18, $pop2       # 18: down to label15
-# BB#8:                                 #   in Loop: Header=BB0_3 Depth=1
+# %bb.8:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 0
 	br      	31              # 31: up to label2
 .LBB0_9:                                # %if.end4
@@ -115,105 +114,102 @@ f:                                      # @f
 	end_block                       # label33:
 	i32.le_s	$push4=, $5, $1
 	br_if   	16, $pop4       # 16: down to label16
-# BB#10:                                #   in Loop: Header=BB0_3 Depth=1
+# %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  	$3=, $4, $1
-# BB#12:                                #   in Loop: Header=BB0_3 Depth=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 	$push24=, $5, $3
-	tee_local	$push23=, $5=, $pop24
-	i32.gt_s	$push5=, $pop23, $1
+	i32.add 	$5=, $5, $3
+	i32.gt_s	$push5=, $5, $1
 	br_if   	16, $pop5       # 16: down to label14
-# BB#14:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.14:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 1
 	br      	28              # 28: up to label2
 .LBB0_15:                               # %while.end
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label30:
-	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	$push22=, 2
+	i32.shl 	$push6=, $0, $pop22
+	i32.const	$push21=, W
+	i32.add 	$2=, $pop6, $pop21
+	i32.load	$3=, 0($2)
+# %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.eqz 	$push38=, $3
-	br_if   	18, $pop38      # 18: down to label10
-# BB#18:                                #   in Loop: Header=BB0_3 Depth=1
+	i32.eqz 	$push30=, $3
+	br_if   	18, $pop30      # 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:                               # %if.then13.peel
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label28:
-	i32.const	$push29=, 0
-	i32.store	0($2), $pop29
+	i32.const	$push23=, 0
+	i32.store	0($2), $pop23
 	i32.const	$5=, 1
-# BB#20:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.20:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 4
 	br      	25              # 25: up to label2
 .LBB0_21:                               # %do.cond16.peel
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label27:
-	i32.const	$push30=, 0
-	i32.le_s	$push7=, $1, $pop30
+	i32.const	$push24=, 0
+	i32.le_s	$push7=, $1, $pop24
 	br_if   	17, $pop7       # 17: down to label9
-# BB#22:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.22:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 5
 	br      	24              # 24: up to label2
 .LBB0_23:                               # %do.cond19
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label26:
 	i32.const	$3=, 0
-	i32.const	$push31=, 0
-	i32.gt_s	$push8=, $0, $pop31
+	i32.const	$push25=, 0
+	i32.gt_s	$push8=, $0, $pop25
 	br_if   	14, $pop8       # 14: down to label11
-# BB#24:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.24:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 6
 	br      	23              # 23: up to label2
 .LBB0_25:                               # %do.body22
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label25:
-	i32.const	$push34=, 2
-	i32.shl 	$push10=, $0, $pop34
-	i32.const	$push33=, Link
-	i32.add 	$push11=, $pop10, $pop33
+	i32.const	$push28=, 2
+	i32.shl 	$push10=, $0, $pop28
+	i32.const	$push27=, Link
+	i32.add 	$push11=, $pop10, $pop27
 	i32.load	$0=, 0($pop11)
-	i32.const	$push32=, 1
-	i32.lt_s	$push9=, $4, $pop32
+	i32.const	$push26=, 1
+	i32.lt_s	$push9=, $4, $pop26
 	br_if   	18, $pop9       # 18: down to label6
-# BB#26:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.26:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 15
 	br      	22              # 22: up to label2
 .LBB0_27:                               # %while.body26.lr.ph
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label24:
-	i32.const	$push35=, -1
-	i32.ne  	$3=, $0, $pop35
+	i32.const	$push29=, -1
+	i32.ne  	$3=, $0, $pop29
 	i32.const	$1=, 0
-# BB#28:                                #   in Loop: Header=BB0_3 Depth=1
+# %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.add 	$push37=, $1, $3
-	tee_local	$push36=, $1=, $pop37
-	i32.lt_s	$push12=, $pop36, $4
+	i32.add 	$1=, $1, $3
+	i32.lt_s	$push12=, $1, $4
 	br_if   	18, $pop12      # 18: down to label4
-# BB#30:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.30:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 17
 	br      	20              # 20: up to label2
 .LBB0_31:                               # %do.cond33.loopexit
@@ -224,7 +220,7 @@ f:                                      # @f
 .LBB0_32:                               #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label21:
 	i32.const	$1=, 0
-# BB#33:                                #   in Loop: Header=BB0_3 Depth=1
+# %bb.33:                               #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$6=, 8
 	br      	18              # 18: up to label2
 .LBB0_34:                               # %do.cond33
@@ -314,7 +310,7 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i32.const	$1=, 2
 	i32.const	$4=, 0
@@ -325,7 +321,7 @@ main:                                   # @main
 	i32.const	$push14=, 3
 	i32.lt_s	$push0=, $pop15, $pop14
 	br_if   	0, $pop0        # 0: down to label38
-# BB#1:
+# %bb.1:
 	i32.const	$5=, 10
 	br      	1               # 1: down to label37
 .LBB1_2:
@@ -385,28 +381,27 @@ main:                                   # @main
 	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
+# %bb.5:                                #   in Loop: Header=BB1_3 Depth=1
 	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                       # 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
+	i32.const	$push18=, 1
+	i32.add 	$4=, $4, $pop18
+	i32.const	$push17=, -1
+	i32.add 	$3=, $0, $pop17
+	i32.gt_s	$push4=, $4, $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                       # label63:
 	i32.const	$3=, 0
-	i32.const	$push21=, 1
-	i32.eq  	$push2=, $0, $pop21
+	i32.const	$push19=, 1
+	i32.eq  	$push2=, $0, $pop19
 	br_if   	13, $pop2       # 13: down to label49
-# BB#8:                                 #   in Loop: Header=BB1_3 Depth=1
+# %bb.8:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 0
 	br      	23              # 23: up to label39
 .LBB1_9:                                # %if.end4.i
@@ -414,73 +409,68 @@ main:                                   # @main
 	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
+# %bb.10:                               #   in Loop: Header=BB1_3 Depth=1
 	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                       # label61:
 	i32.eq  	$0=, $3, $1
-# BB#12:                                #   in Loop: Header=BB1_3 Depth=1
+# %bb.12:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 12
 	br      	21              # 21: up to label39
 .LBB1_13:                               # %while.body.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label60:
-	i32.add 	$push23=, $4, $0
-	tee_local	$push22=, $4=, $pop23
-	i32.gt_s	$push6=, $pop22, $1
+	i32.add 	$4=, $4, $0
+	i32.gt_s	$push6=, $4, $1
 	br_if   	11, $pop6       # 11: down to label48
-# BB#14:                                #   in Loop: Header=BB1_3 Depth=1
+# %bb.14:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 1
 	br      	20              # 20: up to label39
 .LBB1_15:                               # %do.body10.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	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	$push21=, 2
+	i32.shl 	$push7=, $2, $pop21
+	i32.const	$push20=, W
+	i32.add 	$0=, $pop7, $pop20
+	i32.load	$push8=, 0($0)
+	i32.eqz 	$push27=, $pop8
+	br_if   	13, $pop27      # 13: down to label45
+# %bb.16:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 2
 	br      	19              # 19: up to label39
 .LBB1_17:                               # %if.then13.peel.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label58:
-	i32.const	$push28=, 0
-	i32.store	0($0), $pop28
+	i32.const	$push22=, 0
+	i32.store	0($0), $pop22
 	i32.const	$4=, 1
-# BB#18:                                #   in Loop: Header=BB1_3 Depth=1
+# %bb.18:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 3
 	br      	18              # 18: up to label39
 .LBB1_19:                               # %do.cond16.peel.i
                                         #   in Loop: Header=BB1_3 Depth=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.eqz 	$push28=, $1
+	br_if   	14, $pop28      # 14: down to label42
+# %bb.20:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 4
 	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.const	$push26=, 0
+	i32.gt_s	$0=, $3, $pop26
+	i32.const	$push25=, 2
+	i32.shl 	$push9=, $2, $pop25
+	i32.const	$push24=, Link
+	i32.add 	$push10=, $pop9, $pop24
+	i32.load	$2=, 0($pop10)
+	i32.const	$push23=, -1
+	i32.ne  	$1=, $2, $pop23
+	i32.and 	$push11=, $0, $1
 	i32.add 	$4=, $4, $pop11
 	br_if   	11, $1          # 11: down to label44
 	br      	12              # 12: down to label43
@@ -491,9 +481,9 @@ main:                                   # @main
 .LBB1_23:                               # %f.exit
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label54:
-	i32.eqz 	$push41=, $4
-	br_if   	12, $pop41      # 12: down to label41
-# BB#24:                                #   in Loop: Header=BB1_3 Depth=1
+	i32.eqz 	$push29=, $4
+	br_if   	12, $pop29      # 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
@@ -577,5 +567,5 @@ W:
 	.size	W, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr24851.c.s b/test/torture-s/pr24851.c.s
index dc2418315..cc01c2990 100644
--- a/test/torture-s/pr24851.c.s
+++ b/test/torture-s/pr24851.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr25125.c.s b/test/torture-s/pr25125.c.s
index 76c365226..62e48f154 100644
--- a/test/torture-s/pr25125.c.s
+++ b/test/torture-s/pr25125.c.s
@@ -8,13 +8,13 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	block   	
 	i32.const	$push6=, 0
 	i32.gt_s	$push0=, $0, $pop6
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push1=, 65535
 	i32.and 	$push2=, $0, $pop1
 	i32.const	$push3=, 32768
@@ -34,14 +34,14 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -32767
 	i32.call	$push1=, f@FUNCTION, $pop0
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -54,6 +54,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr25737.c.s b/test/torture-s/pr25737.c.s
index a89071e9b..e33a6cdd1 100644
--- a/test/torture-s/pr25737.c.s
+++ b/test/torture-s/pr25737.c.s
@@ -7,11 +7,10 @@
 time_enqueue:                           # @time_enqueue
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
-	i32.const	$push2=, 0
-	i32.load	$push1=, Timer_Queue($pop2)
+	i32.const	$push1=, 0
                                         # fallthrough-return: $pop1
 	.endfunc
 .Lfunc_end0:
@@ -23,22 +22,12 @@ time_enqueue:                           # @time_enqueue
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
-	i32.const	$push2=, 0
-	i32.store	Timer_Queue($pop0), $pop2
-	i32.const	$push1=, 0
-                                        # fallthrough-return: $pop1
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
-	.type	Timer_Queue,@object     # @Timer_Queue
-	.section	.bss.Timer_Queue,"aw",@nobits
-	.p2align	2
-Timer_Queue:
-	.skip	4
-	.size	Timer_Queue, 4
-
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr27073.c.s b/test/torture-s/pr27073.c.s
index 3077079a1..95f4306e6 100644
--- a/test/torture-s/pr27073.c.s
+++ b/test/torture-s/pr27073.c.s
@@ -6,35 +6,34 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.eqz 	$push13=, $4
-	br_if   	0, $pop13       # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push11=, $4
+	br_if   	0, $pop11       # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push0=, 0
 	i32.sub 	$4=, $pop0, $4
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.store	0($0), $5
-	i32.const	$push12=, 4
-	i32.add 	$push1=, $0, $pop12
+	i32.const	$push10=, 4
+	i32.add 	$push1=, $0, $pop10
 	i32.store	0($pop1), $6
-	i32.const	$push11=, 8
-	i32.add 	$push2=, $0, $pop11
+	i32.const	$push9=, 8
+	i32.add 	$push2=, $0, $pop9
 	i32.store	0($pop2), $7
-	i32.const	$push10=, 12
-	i32.add 	$push3=, $0, $pop10
+	i32.const	$push8=, 12
+	i32.add 	$push3=, $0, $pop8
 	i32.store	0($pop3), $8
-	i32.const	$push9=, 16
-	i32.add 	$push4=, $0, $pop9
+	i32.const	$push7=, 16
+	i32.add 	$push4=, $0, $pop7
 	i32.store	0($pop4), $9
-	i32.const	$push8=, 20
-	i32.add 	$0=, $0, $pop8
-	i32.const	$push7=, 1
-	i32.add 	$push6=, $4, $pop7
-	tee_local	$push5=, $4=, $pop6
-	br_if   	0, $pop5        # 0: up to label1
+	i32.const	$push6=, 20
+	i32.add 	$0=, $0, $pop6
+	i32.const	$push5=, 1
+	i32.add 	$4=, $4, $pop5
+	br_if   	0, $4           # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
 	end_block                       # label0:
@@ -50,14 +49,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push37=, 0
+# %bb.0:                                # %entry
 	i32.const	$push35=, 0
 	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 48
-	i32.sub 	$push41=, $pop34, $pop36
-	tee_local	$push40=, $0=, $pop41
-	i32.store	__stack_pointer($pop37), $pop40
+	i32.sub 	$0=, $pop34, $pop36
+	i32.const	$push37=, 0
+	i32.store	__stack_pointer($pop37), $0
 	i32.const	$push4=, 2
 	i32.const	$push3=, 100
 	i32.const	$push39=, 200
@@ -70,52 +68,52 @@ main:                                   # @main
 	i32.const	$push38=, 100
 	i32.ne  	$push6=, $pop5, $pop38
 	br_if   	0, $pop6        # 0: down to label2
-# BB#1:                                 # %for.cond
+# %bb.1:                                # %for.cond
 	i32.load	$push7=, 4($0)
-	i32.const	$push42=, 200
-	i32.ne  	$push8=, $pop7, $pop42
+	i32.const	$push40=, 200
+	i32.ne  	$push8=, $pop7, $pop40
 	br_if   	0, $pop8        # 0: down to label2
-# BB#2:                                 # %for.cond.1
+# %bb.2:                                # %for.cond.1
 	i32.load	$push10=, 8($0)
 	i32.const	$push9=, 300
 	i32.ne  	$push11=, $pop10, $pop9
 	br_if   	0, $pop11       # 0: down to label2
-# BB#3:                                 # %for.cond.2
+# %bb.3:                                # %for.cond.2
 	i32.load	$push13=, 12($0)
 	i32.const	$push12=, 400
 	i32.ne  	$push14=, $pop13, $pop12
 	br_if   	0, $pop14       # 0: down to label2
-# BB#4:                                 # %for.cond.3
+# %bb.4:                                # %for.cond.3
 	i32.load	$push16=, 16($0)
 	i32.const	$push15=, 500
 	i32.ne  	$push17=, $pop16, $pop15
 	br_if   	0, $pop17       # 0: down to label2
-# BB#5:                                 # %for.cond.4
+# %bb.5:                                # %for.cond.4
 	i32.load	$push19=, 20($0)
 	i32.const	$push18=, 100
 	i32.ne  	$push20=, $pop19, $pop18
 	br_if   	0, $pop20       # 0: down to label2
-# BB#6:                                 # %for.cond.5
+# %bb.6:                                # %for.cond.5
 	i32.load	$push22=, 24($0)
 	i32.const	$push21=, 200
 	i32.ne  	$push23=, $pop22, $pop21
 	br_if   	0, $pop23       # 0: down to label2
-# BB#7:                                 # %for.cond.6
+# %bb.7:                                # %for.cond.6
 	i32.load	$push25=, 28($0)
 	i32.const	$push24=, 300
 	i32.ne  	$push26=, $pop25, $pop24
 	br_if   	0, $pop26       # 0: down to label2
-# BB#8:                                 # %for.cond.7
+# %bb.8:                                # %for.cond.7
 	i32.load	$push28=, 32($0)
 	i32.const	$push27=, 400
 	i32.ne  	$push29=, $pop28, $pop27
 	br_if   	0, $pop29       # 0: down to label2
-# BB#9:                                 # %for.cond.8
+# %bb.9:                                # %for.cond.8
 	i32.load	$push31=, 36($0)
 	i32.const	$push30=, 500
 	i32.ne  	$push32=, $pop31, $pop30
 	br_if   	0, $pop32       # 0: down to label2
-# BB#10:                                # %for.cond.9
+# %bb.10:                               # %for.cond.9
 	i32.const	$push33=, 0
 	call    	exit@FUNCTION, $pop33
 	unreachable
@@ -128,6 +126,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr27260.c.s b/test/torture-s/pr27260.c.s
index 77abbea6b..91b1c65bd 100644
--- a/test/torture-s/pr27260.c.s
+++ b/test/torture-s/pr27260.c.s
@@ -7,15 +7,14 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i64
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.ne  	$push1=, $0, $pop0
 	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
+	i64.mul 	$1=, $pop2, $pop3
+	i32.const	$push4=, 0
+	i64.store	buf+56($pop4), $1
 	i32.const	$push11=, 0
 	i64.store	buf+48($pop11), $1
 	i32.const	$push10=, 0
@@ -42,122 +41,117 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push3=, 0
+# %bb.0:                                # %entry
+	i32.const	$1=, 0
+	i32.const	$push16=, 0
 	i32.const	$push2=, 2
-	i32.store8	buf+64($pop3), $pop2
-	i32.const	$1=, -1
+	i32.store8	buf+64($pop16), $pop2
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	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
+	i32.const	$push17=, buf
+	i32.add 	$push3=, $1, $pop17
+	i32.load8_u	$push4=, 0($pop3)
+	br_if   	1, $pop4        # 1: down to label1
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	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
+	i32.const	$push19=, 1
+	i32.add 	$1=, $1, $pop19
+	i32.const	$push18=, 63
+	i32.le_u	$push5=, $1, $pop18
+	br_if   	0, $pop5        # 0: up to label2
+# %bb.3:                                # %for.end
 	end_loop
-	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	$push7=, 0
+	i64.const	$push6=, 72340172838076673
+	i64.store	buf+56($pop7), $pop6
 	i32.const	$push33=, 0
 	i64.const	$push32=, 72340172838076673
-	i64.store	buf+32($pop33), $pop32
+	i64.store	buf+48($pop33), $pop32
 	i32.const	$push31=, 0
 	i64.const	$push30=, 72340172838076673
-	i64.store	buf+24($pop31), $pop30
+	i64.store	buf+40($pop31), $pop30
 	i32.const	$push29=, 0
 	i64.const	$push28=, 72340172838076673
-	i64.store	buf+16($pop29), $pop28
+	i64.store	buf+32($pop29), $pop28
 	i32.const	$push27=, 0
 	i64.const	$push26=, 72340172838076673
-	i64.store	buf+8($pop27), $pop26
+	i64.store	buf+24($pop27), $pop26
 	i32.const	$push25=, 0
 	i64.const	$push24=, 72340172838076673
-	i64.store	buf($pop25), $pop24
+	i64.store	buf+16($pop25), $pop24
+	i32.const	$push23=, 0
+	i64.const	$push22=, 72340172838076673
+	i64.store	buf+8($pop23), $pop22
+	i32.const	$push21=, 0
+	i64.const	$push20=, 72340172838076673
+	i64.store	buf($pop21), $pop20
 	i32.const	$1=, 1
 .LBB1_4:                                # %for.cond3
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	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
+	i32.const	$push34=, 63
+	i32.gt_u	$push8=, $1, $pop34
+	br_if   	1, $pop8        # 1: down to label3
+# %bb.5:                                # %for.cond3.for.body6_crit_edge
                                         #   in Loop: Header=BB1_4 Depth=1
-	i32.const	$push42=, buf
-	i32.add 	$0=, $1, $pop42
-	i32.const	$push41=, 1
-	i32.add 	$push0=, $1, $pop41
+	i32.const	$push37=, buf
+	i32.add 	$0=, $1, $pop37
+	i32.const	$push36=, 1
+	i32.add 	$push0=, $1, $pop36
 	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
+	i32.load8_u	$push14=, 0($0)
+	i32.const	$push35=, 1
+	i32.eq  	$push15=, $pop14, $pop35
+	br_if   	0, $pop15       # 0: up to label4
 	br      	2               # 2: down to label1
 .LBB1_6:                                # %for.end15
 	end_loop
 	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	$push10=, 0
+	i64.const	$push9=, 0
+	i64.store	buf+56($pop10), $pop9
+	i32.const	$push51=, 0
+	i64.const	$push50=, 0
+	i64.store	buf+48($pop51), $pop50
+	i32.const	$push49=, 0
+	i64.const	$push48=, 0
+	i64.store	buf+40($pop49), $pop48
+	i32.const	$push47=, 0
+	i64.const	$push46=, 0
+	i64.store	buf+32($pop47), $pop46
+	i32.const	$push45=, 0
+	i64.const	$push44=, 0
+	i64.store	buf+24($pop45), $pop44
+	i32.const	$push43=, 0
+	i64.const	$push42=, 0
+	i64.store	buf+16($pop43), $pop42
+	i32.const	$push41=, 0
+	i64.const	$push40=, 0
+	i64.store	buf+8($pop41), $pop40
+	i32.const	$push39=, 0
+	i64.const	$push38=, 0
+	i64.store	buf($pop39), $pop38
 	i32.const	$1=, 1
 .LBB1_7:                                # %for.cond16
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	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
+	i32.const	$push52=, 63
+	i32.gt_u	$push11=, $1, $pop52
+	br_if   	2, $pop11       # 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
+	i32.const	$push54=, buf
+	i32.add 	$0=, $1, $pop54
+	i32.const	$push53=, 1
+	i32.add 	$push1=, $1, $pop53
 	copy_local	$1=, $pop1
-	i32.load8_u	$push16=, 0($0)
-	i32.eqz 	$push61=, $pop16
-	br_if   	0, $pop61       # 0: up to label5
+	i32.load8_u	$push13=, 0($0)
+	i32.eqz 	$push55=, $pop13
+	br_if   	0, $pop55       # 0: up to label5
 .LBB1_9:                                # %if.then
 	end_loop
 	end_block                       # label1:
@@ -165,8 +159,8 @@ main:                                   # @main
 	unreachable
 .LBB1_10:                               # %if.end33
 	end_block                       # label0:
-	i32.const	$push15=, 0
-                                        # fallthrough-return: $pop15
+	i32.const	$push12=, 0
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -181,5 +175,5 @@ buf:
 	.size	buf, 65
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr27285.c.s b/test/torture-s/pr27285.c.s
index 92f3c50da..7a31b5fce 100644
--- a/test/torture-s/pr27285.c.s
+++ b/test/torture-s/pr27285.c.s
@@ -7,42 +7,39 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load8_u	$3=, 1($0)
 	block   	
-	i32.load8_u	$push8=, 1($0)
-	tee_local	$push7=, $3=, $pop8
-	i32.eqz 	$push22=, $pop7
-	br_if   	0, $pop22       # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push16=, $3
+	br_if   	0, $pop16       # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push0=, 3
 	i32.add 	$1=, $1, $pop0
-	i32.const	$push9=, 3
-	i32.add 	$0=, $0, $pop9
+	i32.const	$push7=, 3
+	i32.add 	$0=, $0, $pop7
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push21=, 255
-	i32.const	$push20=, 255
-	i32.const	$push19=, 8
-	i32.sub 	$push1=, $pop19, $3
-	i32.shl 	$push2=, $pop20, $pop1
-	i32.const	$push18=, 7
-	i32.gt_s	$push17=, $3, $pop18
-	tee_local	$push16=, $2=, $pop17
-	i32.select	$push3=, $pop21, $pop2, $pop16
+	i32.const	$push15=, 7
+	i32.gt_s	$2=, $3, $pop15
+	i32.const	$push14=, 255
+	i32.const	$push13=, 255
+	i32.const	$push12=, 8
+	i32.sub 	$push1=, $pop12, $3
+	i32.shl 	$push2=, $pop13, $pop1
+	i32.select	$push3=, $pop14, $pop2, $2
 	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
-	i32.const	$push14=, 1
-	i32.add 	$0=, $0, $pop14
-	i32.const	$push13=, -8
-	i32.add 	$push6=, $3, $pop13
-	i32.const	$push12=, 0
-	i32.select	$push11=, $pop6, $pop12, $2
-	tee_local	$push10=, $3=, $pop11
-	br_if   	0, $pop10       # 0: up to label1
+	i32.const	$push11=, -8
+	i32.add 	$push6=, $3, $pop11
+	i32.const	$push10=, 0
+	i32.select	$3=, $pop6, $pop10, $2
+	i32.const	$push9=, 1
+	i32.add 	$1=, $1, $pop9
+	i32.const	$push8=, 1
+	i32.add 	$0=, $0, $pop8
+	br_if   	0, $3           # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
 	end_block                       # label0:
@@ -58,14 +55,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push31=, 0
+# %bb.0:                                # %entry
 	i32.const	$push29=, 0
 	i32.load	$push28=, __stack_pointer($pop29)
 	i32.const	$push30=, 48
-	i32.sub 	$push53=, $pop28, $pop30
-	tee_local	$push52=, $0=, $pop53
-	i32.store	__stack_pointer($pop31), $pop52
+	i32.sub 	$0=, $pop28, $pop30
+	i32.const	$push31=, 0
+	i32.store	__stack_pointer($pop31), $0
 	i32.const	$push35=, 24
 	i32.add 	$push36=, $0, $pop35
 	i32.const	$push2=, 18
@@ -112,22 +108,22 @@ main:                                   # @main
 	i32.const	$push15=, 170
 	i32.ne  	$push17=, $pop16, $pop15
 	br_if   	0, $pop17       # 0: down to label2
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load8_u	$push19=, 4($0)
 	i32.const	$push18=, 187
 	i32.ne  	$push20=, $pop19, $pop18
 	br_if   	0, $pop20       # 0: down to label2
-# BB#2:                                 # %lor.lhs.false13
+# %bb.2:                                # %lor.lhs.false13
 	i32.load8_u	$push22=, 5($0)
 	i32.const	$push21=, 204
 	i32.ne  	$push23=, $pop22, $pop21
 	br_if   	0, $pop23       # 0: down to label2
-# BB#3:                                 # %lor.lhs.false22
+# %bb.3:                                # %lor.lhs.false22
 	i32.load8_u	$push25=, 6($0)
 	i32.const	$push24=, 128
 	i32.ne  	$push26=, $pop25, $pop24
 	br_if   	0, $pop26       # 0: down to label2
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push34=, 0
 	i32.const	$push32=, 48
 	i32.add 	$push33=, $0, $pop32
@@ -152,5 +148,5 @@ main:                                   # @main
 	.size	.Lmain.x, 19
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr27364.c.s b/test/torture-s/pr27364.c.s
index 61bf57673..d97355c12 100644
--- a/test/torture-s/pr27364.c.s
+++ b/test/torture-s/pr27364.c.s
@@ -8,13 +8,13 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	block   	
 	i32.const	$push0=, 1294
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 3321928
 	i32.mul 	$push3=, $0, $pop2
 	i32.const	$push4=, 1000000
@@ -37,7 +37,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -46,5 +46,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr27671-1.c.s b/test/torture-s/pr27671-1.c.s
index fe14c4181..bee0979f8 100644
--- a/test/torture-s/pr27671-1.c.s
+++ b/test/torture-s/pr27671-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr28289.c.s b/test/torture-s/pr28289.c.s
index 4c86272f2..3fdec5925 100644
--- a/test/torture-s/pr28289.c.s
+++ b/test/torture-s/pr28289.c.s
@@ -6,7 +6,7 @@
 	.type	ix86_split_ashr,@function
 ix86_split_ashr:                        # @ix86_split_ashr
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push1=, ok@FUNCTION
 	i32.const	$push0=, gen_x86_64_shrd@FUNCTION
@@ -24,7 +24,7 @@ ix86_split_ashr:                        # @ix86_split_ashr
 ok:                                     # @ok
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	exit@FUNCTION, $0
 	unreachable
 	.endfunc
@@ -36,7 +36,7 @@ ok:                                     # @ok
 gen_x86_64_shrd:                        # @gen_x86_64_shrd
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,7 +49,7 @@ gen_x86_64_shrd:                        # @gen_x86_64_shrd
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push3=, ok@FUNCTION
 	i32.const	$push2=, gen_x86_64_shrd@FUNCTION
@@ -73,5 +73,5 @@ one:
 	.size	one, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr28403.c.s b/test/torture-s/pr28403.c.s
index 50860c224..bedc5bf41 100644
--- a/test/torture-s/pr28403.c.s
+++ b/test/torture-s/pr28403.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.add 	$push0=, $1, $0
 	i32.add 	$push1=, $pop0, $2
@@ -30,7 +30,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 1
 	i32.const	$push3=, 2
 	i32.const	$push10=, 1
@@ -54,14 +54,14 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 81985529216486895
 	i64.call	$push1=, bar@FUNCTION, $pop0
 	i64.const	$push2=, 312749974122
 	i64.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -83,6 +83,6 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr28651.c.s b/test/torture-s/pr28651.c.s
index c27b1ce98..e8a7b2c86 100644
--- a/test/torture-s/pr28651.c.s
+++ b/test/torture-s/pr28651.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483643
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,13 +22,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 2147483647
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	i32.eqz 	$push3=, $pop1
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB1_2:                                # %if.then
@@ -40,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr28778.c.s b/test/torture-s/pr28778.c.s
index 77f187a60..52dd99afb 100644
--- a/test/torture-s/pr28778.c.s
+++ b/test/torture-s/pr28778.c.s
@@ -7,17 +7,16 @@
 find:                                   # @find
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 128
-	i32.sub 	$push12=, $pop4, $pop6
-	tee_local	$push11=, $1=, $pop12
-	i32.store	__stack_pointer($pop7), $pop11
+	i32.sub 	$1=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	i32.const	$push0=, 42
 	i32.store	12($1), $pop0
 	copy_local	$0=, $1
@@ -28,7 +27,7 @@ find:                                   # @find
 	i32.const	$push2=, 42
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#3:                                 # %aglChoosePixelFormat.exit
+# %bb.3:                                # %aglChoosePixelFormat.exit
 	i32.const	$push10=, 0
 	i32.const	$push8=, 128
 	i32.add 	$push9=, $1, $pop8
@@ -48,13 +47,13 @@ find:                                   # @find
 	.type	aglChoosePixelFormat,@function
 aglChoosePixelFormat:                   # @aglChoosePixelFormat
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 12($0)
 	i32.const	$push1=, 42
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label2:
@@ -70,7 +69,7 @@ aglChoosePixelFormat:                   # @aglChoosePixelFormat
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %find.exit
+# %bb.0:                                # %find.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -78,5 +77,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr28982a.c.s b/test/torture-s/pr28982a.c.s
index c152bd957..4079eff20 100644
--- a/test/torture-s/pr28982a.c.s
+++ b/test/torture-s/pr28982a.c.s
@@ -7,12 +7,12 @@
 foo:                                    # @foo
 	.param  	i32
 	.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
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
-	i32.eqz 	$push143=, $0
-	br_if   	0, $pop143      # 0: down to label1
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push141=, $0
+	br_if   	0, $pop141      # 0: down to label1
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push119=, 0
 	i32.load	$push0=, incs($pop119)
 	i32.const	$push40=, 2
@@ -156,6 +156,8 @@ foo:                                    # @foo
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
+	i32.const	$push120=, -1
+	i32.add 	$0=, $0, $pop120
 	f32.load	$push41=, 0($40)
 	f32.add 	$60=, $60, $pop41
 	f32.load	$push42=, 0($39)
@@ -236,10 +238,7 @@ foo:                                    # @foo
 	copy_local	$39=, $pop21
 	i32.add 	$push20=, $40, $1
 	copy_local	$40=, $pop20
-	i32.const	$push122=, -1
-	i32.add 	$push121=, $0, $pop122
-	tee_local	$push120=, $0=, $pop121
-	br_if   	0, $pop120      # 0: up to label2
+	br_if   	0, $0           # 0: up to label2
 	br      	2               # 2: down to label0
 .LBB0_3:
 	end_loop
@@ -266,46 +265,46 @@ foo:                                    # @foo
 	f32.const	$60=, 0x0p0
 .LBB0_4:                                # %while.end
 	end_block                       # label0:
-	i32.const	$push142=, 0
-	f32.store	results+4($pop142), $42
-	i32.const	$push141=, 0
-	f32.store	results($pop141), $41
 	i32.const	$push140=, 0
-	f32.store	results+8($pop140), $43
+	f32.store	results+4($pop140), $42
 	i32.const	$push139=, 0
-	f32.store	results+12($pop139), $44
+	f32.store	results($pop139), $41
 	i32.const	$push138=, 0
-	f32.store	results+16($pop138), $45
+	f32.store	results+8($pop138), $43
 	i32.const	$push137=, 0
-	f32.store	results+20($pop137), $46
+	f32.store	results+12($pop137), $44
 	i32.const	$push136=, 0
-	f32.store	results+24($pop136), $47
+	f32.store	results+16($pop136), $45
 	i32.const	$push135=, 0
-	f32.store	results+28($pop135), $48
+	f32.store	results+20($pop135), $46
 	i32.const	$push134=, 0
-	f32.store	results+32($pop134), $49
+	f32.store	results+24($pop134), $47
 	i32.const	$push133=, 0
-	f32.store	results+36($pop133), $50
+	f32.store	results+28($pop133), $48
 	i32.const	$push132=, 0
-	f32.store	results+40($pop132), $51
+	f32.store	results+32($pop132), $49
 	i32.const	$push131=, 0
-	f32.store	results+44($pop131), $52
+	f32.store	results+36($pop131), $50
 	i32.const	$push130=, 0
-	f32.store	results+48($pop130), $53
+	f32.store	results+40($pop130), $51
 	i32.const	$push129=, 0
-	f32.store	results+52($pop129), $54
+	f32.store	results+44($pop129), $52
 	i32.const	$push128=, 0
-	f32.store	results+56($pop128), $55
+	f32.store	results+48($pop128), $53
 	i32.const	$push127=, 0
-	f32.store	results+60($pop127), $56
+	f32.store	results+52($pop127), $54
 	i32.const	$push126=, 0
-	f32.store	results+64($pop126), $57
+	f32.store	results+56($pop126), $55
 	i32.const	$push125=, 0
-	f32.store	results+68($pop125), $58
+	f32.store	results+60($pop125), $56
 	i32.const	$push124=, 0
-	f32.store	results+72($pop124), $59
+	f32.store	results+64($pop124), $57
 	i32.const	$push123=, 0
-	f32.store	results+76($pop123), $60
+	f32.store	results+68($pop123), $58
+	i32.const	$push122=, 0
+	f32.store	results+72($pop122), $59
+	i32.const	$push121=, 0
+	f32.store	results+76($pop121), $60
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -318,7 +317,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, input
 	i32.const	$1=, 0
 	i32.const	$push154=, 0
@@ -431,15 +430,14 @@ main:                                   # @main
 	loop    	                # 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	$push157=, 4
+	i32.add 	$0=, $0, $pop157
+	i32.const	$push156=, 1
+	i32.add 	$1=, $1, $pop156
 	i32.const	$push155=, 80
-	i32.ne  	$push34=, $pop156, $pop155
+	i32.ne  	$push34=, $1, $pop155
 	br_if   	0, $pop34       # 0: up to label3
-# BB#2:                                 # %for.end8
+# %bb.2:                                # %for.end8
 	end_loop
 	i32.const	$push35=, 4
 	call    	foo@FUNCTION, $pop35
@@ -447,98 +445,98 @@ main:                                   # @main
 	f32.load	$push40=, results($pop36)
 	f32.const	$push41=, 0x0p0
 	f32.ne  	$push42=, $pop40, $pop41
-	i32.const	$push178=, 0
-	f32.load	$push37=, results+4($pop178)
+	i32.const	$push176=, 0
+	f32.load	$push37=, results+4($pop176)
 	f32.const	$push38=, 0x1.4p3
 	f32.ne  	$push39=, $pop37, $pop38
 	i32.or  	$push43=, $pop42, $pop39
-	i32.const	$push177=, 0
-	f32.load	$push44=, results+8($pop177)
+	i32.const	$push175=, 0
+	f32.load	$push44=, results+8($pop175)
 	f32.const	$push45=, 0x1.4p4
 	f32.ne  	$push46=, $pop44, $pop45
 	i32.or  	$push47=, $pop43, $pop46
-	i32.const	$push176=, 0
-	f32.load	$push48=, results+12($pop176)
+	i32.const	$push174=, 0
+	f32.load	$push48=, results+12($pop174)
 	f32.const	$push49=, 0x1.ep4
 	f32.ne  	$push50=, $pop48, $pop49
 	i32.or  	$push51=, $pop47, $pop50
-	i32.const	$push175=, 0
-	f32.load	$push52=, results+16($pop175)
+	i32.const	$push173=, 0
+	f32.load	$push52=, results+16($pop173)
 	f32.const	$push53=, 0x1.4p5
 	f32.ne  	$push54=, $pop52, $pop53
 	i32.or  	$push55=, $pop51, $pop54
-	i32.const	$push174=, 0
-	f32.load	$push56=, results+20($pop174)
+	i32.const	$push172=, 0
+	f32.load	$push56=, results+20($pop172)
 	f32.const	$push57=, 0x1.9p5
 	f32.ne  	$push58=, $pop56, $pop57
 	i32.or  	$push59=, $pop55, $pop58
-	i32.const	$push173=, 0
-	f32.load	$push60=, results+24($pop173)
+	i32.const	$push171=, 0
+	f32.load	$push60=, results+24($pop171)
 	f32.const	$push61=, 0x1.ep5
 	f32.ne  	$push62=, $pop60, $pop61
 	i32.or  	$push63=, $pop59, $pop62
-	i32.const	$push172=, 0
-	f32.load	$push64=, results+28($pop172)
+	i32.const	$push170=, 0
+	f32.load	$push64=, results+28($pop170)
 	f32.const	$push65=, 0x1.18p6
 	f32.ne  	$push66=, $pop64, $pop65
 	i32.or  	$push67=, $pop63, $pop66
-	i32.const	$push171=, 0
-	f32.load	$push68=, results+32($pop171)
+	i32.const	$push169=, 0
+	f32.load	$push68=, results+32($pop169)
 	f32.const	$push69=, 0x1.4p6
 	f32.ne  	$push70=, $pop68, $pop69
 	i32.or  	$push71=, $pop67, $pop70
-	i32.const	$push170=, 0
-	f32.load	$push72=, results+36($pop170)
+	i32.const	$push168=, 0
+	f32.load	$push72=, results+36($pop168)
 	f32.const	$push73=, 0x1.68p6
 	f32.ne  	$push74=, $pop72, $pop73
 	i32.or  	$push75=, $pop71, $pop74
-	i32.const	$push169=, 0
-	f32.load	$push76=, results+40($pop169)
+	i32.const	$push167=, 0
+	f32.load	$push76=, results+40($pop167)
 	f32.const	$push77=, 0x1.9p6
 	f32.ne  	$push78=, $pop76, $pop77
 	i32.or  	$push79=, $pop75, $pop78
-	i32.const	$push168=, 0
-	f32.load	$push80=, results+44($pop168)
+	i32.const	$push166=, 0
+	f32.load	$push80=, results+44($pop166)
 	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)
+	i32.const	$push165=, 0
+	f32.load	$push84=, results+48($pop165)
 	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)
+	i32.const	$push164=, 0
+	f32.load	$push88=, results+52($pop164)
 	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)
+	i32.const	$push163=, 0
+	f32.load	$push92=, results+56($pop163)
 	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)
+	i32.const	$push162=, 0
+	f32.load	$push96=, results+60($pop162)
 	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)
+	i32.const	$push161=, 0
+	f32.load	$push100=, results+64($pop161)
 	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)
+	i32.const	$push160=, 0
+	f32.load	$push104=, results+68($pop160)
 	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)
+	i32.const	$push159=, 0
+	f32.load	$push108=, results+72($pop159)
 	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)
+	i32.const	$push158=, 0
+	f32.load	$push112=, results+76($pop158)
 	f32.const	$push113=, 0x1.7cp7
 	f32.ne  	$push114=, $pop112, $pop113
 	i32.or  	$push115=, $pop111, $pop114
@@ -586,4 +584,4 @@ input:
 	.size	input, 320
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr28982b.c.s b/test/torture-s/pr28982b.c.s
index 6c24d54db..0630cbd83 100644
--- a/test/torture-s/pr28982b.c.s
+++ b/test/torture-s/pr28982b.c.s
@@ -1,629 +1,17 @@
 	.text
 	.file	"pr28982b.c"
-	.section	.text.bar,"ax",@progbits
-	.hidden	bar                     # -- Begin function bar
-	.globl	bar
-	.type	bar,@function
-bar:                                    # @bar
-	.param  	i32
-# BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i32.const	$push4=, 0
-	i32.load	$push2=, incs($pop4)
-	i32.load	$push0=, 0($0)
-	i32.add 	$push3=, $pop2, $pop0
-	i32.store	incs($pop1), $pop3
-                                        # fallthrough-return
-	.endfunc
-.Lfunc_end0:
-	.size	bar, .Lfunc_end0-bar
-                                        # -- End function
-	.section	.text.foo,"ax",@progbits
-	.hidden	foo                     # -- Begin function foo
-	.globl	foo
-	.type	foo,@function
-foo:                                    # @foo
-	.param  	i32
-	.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	$push62=, 0
-	i32.load	$push61=, __stack_pointer($pop62)
-	i32.const	$push63=, 524288
-	i32.sub 	$push75=, $pop61, $pop63
-	tee_local	$push74=, $61=, $pop75
-	i32.store	__stack_pointer($pop64), $pop74
-	i32.const	$push68=, 262144
-	i32.add 	$push69=, $61, $pop68
-	i32.const	$push73=, 0
-	i32.const	$push72=, 262144
-	i32.call	$drop=, memset@FUNCTION, $pop69, $pop73, $pop72
-	block   	
-	block   	
-	i32.eqz 	$push161=, $0
-	br_if   	0, $pop161      # 0: down to label1
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push134=, 0
-	i32.load	$push0=, incs($pop134)
-	i32.const	$push40=, 2
-	i32.shl 	$20=, $pop0, $pop40
-	i32.const	$push133=, 0
-	i32.load	$push1=, incs+4($pop133)
-	i32.const	$push132=, 2
-	i32.shl 	$19=, $pop1, $pop132
-	i32.const	$push131=, 0
-	i32.load	$push2=, incs+8($pop131)
-	i32.const	$push130=, 2
-	i32.shl 	$18=, $pop2, $pop130
-	i32.const	$push129=, 0
-	i32.load	$push3=, incs+12($pop129)
-	i32.const	$push128=, 2
-	i32.shl 	$17=, $pop3, $pop128
-	i32.const	$push127=, 0
-	i32.load	$push4=, incs+16($pop127)
-	i32.const	$push126=, 2
-	i32.shl 	$16=, $pop4, $pop126
-	i32.const	$push125=, 0
-	i32.load	$push5=, incs+20($pop125)
-	i32.const	$push124=, 2
-	i32.shl 	$15=, $pop5, $pop124
-	i32.const	$push123=, 0
-	i32.load	$push6=, incs+24($pop123)
-	i32.const	$push122=, 2
-	i32.shl 	$14=, $pop6, $pop122
-	i32.const	$push121=, 0
-	i32.load	$push7=, incs+28($pop121)
-	i32.const	$push120=, 2
-	i32.shl 	$13=, $pop7, $pop120
-	i32.const	$push119=, 0
-	i32.load	$push8=, incs+32($pop119)
-	i32.const	$push118=, 2
-	i32.shl 	$12=, $pop8, $pop118
-	i32.const	$push117=, 0
-	i32.load	$push9=, incs+36($pop117)
-	i32.const	$push116=, 2
-	i32.shl 	$11=, $pop9, $pop116
-	i32.const	$push115=, 0
-	i32.load	$push10=, incs+40($pop115)
-	i32.const	$push114=, 2
-	i32.shl 	$10=, $pop10, $pop114
-	i32.const	$push113=, 0
-	i32.load	$push11=, incs+44($pop113)
-	i32.const	$push112=, 2
-	i32.shl 	$9=, $pop11, $pop112
-	i32.const	$push111=, 0
-	i32.load	$push12=, incs+48($pop111)
-	i32.const	$push110=, 2
-	i32.shl 	$8=, $pop12, $pop110
-	i32.const	$push109=, 0
-	i32.load	$push13=, incs+52($pop109)
-	i32.const	$push108=, 2
-	i32.shl 	$7=, $pop13, $pop108
-	i32.const	$push107=, 0
-	i32.load	$push14=, incs+56($pop107)
-	i32.const	$push106=, 2
-	i32.shl 	$6=, $pop14, $pop106
-	i32.const	$push105=, 0
-	i32.load	$push15=, incs+60($pop105)
-	i32.const	$push104=, 2
-	i32.shl 	$5=, $pop15, $pop104
-	i32.const	$push103=, 0
-	i32.load	$push16=, incs+64($pop103)
-	i32.const	$push102=, 2
-	i32.shl 	$4=, $pop16, $pop102
-	i32.const	$push101=, 0
-	i32.load	$push17=, incs+68($pop101)
-	i32.const	$push100=, 2
-	i32.shl 	$3=, $pop17, $pop100
-	i32.const	$push99=, 0
-	i32.load	$push18=, incs+72($pop99)
-	i32.const	$push98=, 2
-	i32.shl 	$2=, $pop18, $pop98
-	i32.const	$push97=, 0
-	i32.load	$push19=, incs+76($pop97)
-	i32.const	$push96=, 2
-	i32.shl 	$1=, $pop19, $pop96
-	i32.const	$push95=, 0
-	i32.load	$21=, ptrs($pop95)
-	i32.const	$push94=, 0
-	i32.load	$22=, ptrs+4($pop94)
-	i32.const	$push93=, 0
-	i32.load	$23=, ptrs+8($pop93)
-	i32.const	$push92=, 0
-	i32.load	$24=, ptrs+12($pop92)
-	i32.const	$push91=, 0
-	i32.load	$25=, ptrs+16($pop91)
-	i32.const	$push90=, 0
-	i32.load	$26=, ptrs+20($pop90)
-	i32.const	$push89=, 0
-	i32.load	$27=, ptrs+24($pop89)
-	i32.const	$push88=, 0
-	i32.load	$28=, ptrs+28($pop88)
-	i32.const	$push87=, 0
-	i32.load	$29=, ptrs+32($pop87)
-	i32.const	$push86=, 0
-	i32.load	$30=, ptrs+36($pop86)
-	i32.const	$push85=, 0
-	i32.load	$31=, ptrs+40($pop85)
-	i32.const	$push84=, 0
-	i32.load	$32=, ptrs+44($pop84)
-	i32.const	$push83=, 0
-	i32.load	$33=, ptrs+48($pop83)
-	i32.const	$push82=, 0
-	i32.load	$34=, ptrs+52($pop82)
-	i32.const	$push81=, 0
-	i32.load	$35=, ptrs+56($pop81)
-	i32.const	$push80=, 0
-	i32.load	$36=, ptrs+60($pop80)
-	i32.const	$push79=, 0
-	i32.load	$37=, ptrs+64($pop79)
-	i32.const	$push78=, 0
-	i32.load	$38=, ptrs+68($pop78)
-	i32.const	$push77=, 0
-	i32.load	$39=, ptrs+72($pop77)
-	i32.const	$push76=, 0
-	i32.load	$40=, ptrs+76($pop76)
-	f32.const	$60=, 0x0p0
-	f32.const	$59=, 0x0p0
-	f32.const	$58=, 0x0p0
-	f32.const	$57=, 0x0p0
-	f32.const	$56=, 0x0p0
-	f32.const	$55=, 0x0p0
-	f32.const	$54=, 0x0p0
-	f32.const	$53=, 0x0p0
-	f32.const	$52=, 0x0p0
-	f32.const	$51=, 0x0p0
-	f32.const	$50=, 0x0p0
-	f32.const	$49=, 0x0p0
-	f32.const	$48=, 0x0p0
-	f32.const	$47=, 0x0p0
-	f32.const	$46=, 0x0p0
-	f32.const	$45=, 0x0p0
-	f32.const	$44=, 0x0p0
-	f32.const	$43=, 0x0p0
-	f32.const	$42=, 0x0p0
-	f32.const	$41=, 0x0p0
-.LBB1_2:                                # %while.body
-                                        # =>This Inner Loop Header: Depth=1
-	loop    	                # label2:
-	f32.load	$push41=, 0($40)
-	f32.add 	$60=, $60, $pop41
-	f32.load	$push42=, 0($39)
-	f32.add 	$59=, $59, $pop42
-	f32.load	$push43=, 0($38)
-	f32.add 	$58=, $58, $pop43
-	f32.load	$push44=, 0($37)
-	f32.add 	$57=, $57, $pop44
-	f32.load	$push45=, 0($36)
-	f32.add 	$56=, $56, $pop45
-	f32.load	$push46=, 0($35)
-	f32.add 	$55=, $55, $pop46
-	f32.load	$push47=, 0($34)
-	f32.add 	$54=, $54, $pop47
-	f32.load	$push48=, 0($33)
-	f32.add 	$53=, $53, $pop48
-	f32.load	$push49=, 0($32)
-	f32.add 	$52=, $52, $pop49
-	f32.load	$push50=, 0($31)
-	f32.add 	$51=, $51, $pop50
-	f32.load	$push51=, 0($30)
-	f32.add 	$50=, $50, $pop51
-	f32.load	$push52=, 0($29)
-	f32.add 	$49=, $49, $pop52
-	f32.load	$push53=, 0($28)
-	f32.add 	$48=, $48, $pop53
-	f32.load	$push54=, 0($27)
-	f32.add 	$47=, $47, $pop54
-	f32.load	$push55=, 0($26)
-	f32.add 	$46=, $46, $pop55
-	f32.load	$push56=, 0($25)
-	f32.add 	$45=, $45, $pop56
-	f32.load	$push57=, 0($24)
-	f32.add 	$44=, $44, $pop57
-	f32.load	$push58=, 0($23)
-	f32.add 	$43=, $43, $pop58
-	f32.load	$push59=, 0($22)
-	f32.add 	$42=, $42, $pop59
-	f32.load	$push60=, 0($21)
-	f32.add 	$41=, $41, $pop60
-	i32.add 	$push39=, $21, $20
-	copy_local	$21=, $pop39
-	i32.add 	$push38=, $22, $19
-	copy_local	$22=, $pop38
-	i32.add 	$push37=, $23, $18
-	copy_local	$23=, $pop37
-	i32.add 	$push36=, $24, $17
-	copy_local	$24=, $pop36
-	i32.add 	$push35=, $25, $16
-	copy_local	$25=, $pop35
-	i32.add 	$push34=, $26, $15
-	copy_local	$26=, $pop34
-	i32.add 	$push33=, $27, $14
-	copy_local	$27=, $pop33
-	i32.add 	$push32=, $28, $13
-	copy_local	$28=, $pop32
-	i32.add 	$push31=, $29, $12
-	copy_local	$29=, $pop31
-	i32.add 	$push30=, $30, $11
-	copy_local	$30=, $pop30
-	i32.add 	$push29=, $31, $10
-	copy_local	$31=, $pop29
-	i32.add 	$push28=, $32, $9
-	copy_local	$32=, $pop28
-	i32.add 	$push27=, $33, $8
-	copy_local	$33=, $pop27
-	i32.add 	$push26=, $34, $7
-	copy_local	$34=, $pop26
-	i32.add 	$push25=, $35, $6
-	copy_local	$35=, $pop25
-	i32.add 	$push24=, $36, $5
-	copy_local	$36=, $pop24
-	i32.add 	$push23=, $37, $4
-	copy_local	$37=, $pop23
-	i32.add 	$push22=, $38, $3
-	copy_local	$38=, $pop22
-	i32.add 	$push21=, $39, $2
-	copy_local	$39=, $pop21
-	i32.add 	$push20=, $40, $1
-	copy_local	$40=, $pop20
-	i32.const	$push137=, -1
-	i32.add 	$push136=, $0, $pop137
-	tee_local	$push135=, $0=, $pop136
-	br_if   	0, $pop135      # 0: up to label2
-	br      	2               # 2: down to label0
-.LBB1_3:
-	end_loop
-	end_block                       # label1:
-	f32.const	$41=, 0x0p0
-	f32.const	$42=, 0x0p0
-	f32.const	$43=, 0x0p0
-	f32.const	$44=, 0x0p0
-	f32.const	$45=, 0x0p0
-	f32.const	$46=, 0x0p0
-	f32.const	$47=, 0x0p0
-	f32.const	$48=, 0x0p0
-	f32.const	$49=, 0x0p0
-	f32.const	$50=, 0x0p0
-	f32.const	$51=, 0x0p0
-	f32.const	$52=, 0x0p0
-	f32.const	$53=, 0x0p0
-	f32.const	$54=, 0x0p0
-	f32.const	$55=, 0x0p0
-	f32.const	$56=, 0x0p0
-	f32.const	$57=, 0x0p0
-	f32.const	$58=, 0x0p0
-	f32.const	$59=, 0x0p0
-	f32.const	$60=, 0x0p0
-.LBB1_4:                                # %while.end
-	end_block                       # label0:
-	i32.const	$push160=, 0
-	f32.store	results+4($pop160), $42
-	i32.const	$push159=, 0
-	f32.store	results($pop159), $41
-	i32.const	$push158=, 0
-	f32.store	results+8($pop158), $43
-	i32.const	$push157=, 0
-	f32.store	results+12($pop157), $44
-	i32.const	$push156=, 0
-	f32.store	results+16($pop156), $45
-	i32.const	$push155=, 0
-	f32.store	results+20($pop155), $46
-	i32.const	$push154=, 0
-	f32.store	results+24($pop154), $47
-	i32.const	$push153=, 0
-	f32.store	results+28($pop153), $48
-	i32.const	$push152=, 0
-	f32.store	results+32($pop152), $49
-	i32.const	$push151=, 0
-	f32.store	results+36($pop151), $50
-	i32.const	$push150=, 0
-	f32.store	results+40($pop150), $51
-	i32.const	$push149=, 0
-	f32.store	results+44($pop149), $52
-	i32.const	$push148=, 0
-	f32.store	results+48($pop148), $53
-	i32.const	$push147=, 0
-	f32.store	results+52($pop147), $54
-	i32.const	$push146=, 0
-	f32.store	results+56($pop146), $55
-	i32.const	$push145=, 0
-	f32.store	results+60($pop145), $56
-	i32.const	$push144=, 0
-	f32.store	results+64($pop144), $57
-	i32.const	$push143=, 0
-	f32.store	results+68($pop143), $58
-	i32.const	$push142=, 0
-	f32.store	results+72($pop142), $59
-	i32.const	$push141=, 0
-	f32.store	results+76($pop141), $60
-	i32.const	$push70=, 262144
-	i32.add 	$push71=, $61, $pop70
-	i32.const	$push140=, 262144
-	i32.call	$push139=, memcpy@FUNCTION, $61, $pop71, $pop140
-	tee_local	$push138=, $21=, $pop139
-	call    	bar@FUNCTION, $pop138
-	i32.const	$push67=, 0
-	i32.const	$push65=, 524288
-	i32.add 	$push66=, $21, $pop65
-	i32.store	__stack_pointer($pop67), $pop66
-                                        # fallthrough-return
-	.endfunc
-.Lfunc_end1:
-	.size	foo, .Lfunc_end1-foo
-                                        # -- End function
 	.section	.text.main,"ax",@progbits
 	.hidden	main                    # -- Begin function main
 	.globl	main
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$0=, input
-	i32.const	$1=, 0
-	i32.const	$push154=, 0
-	i32.const	$push153=, input
-	i32.store	ptrs($pop154), $pop153
-	i32.const	$push152=, 0
-	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
-	i64.const	$push2=, 8589934593
-	i64.store	incs+4($pop150):p2align=2, $pop2
-	i32.const	$push149=, 0
-	i32.const	$push3=, input+12
-	i32.store	ptrs+12($pop149), $pop3
-	i32.const	$push148=, 0
-	i32.const	$push4=, input+16
-	i32.store	ptrs+16($pop148), $pop4
-	i32.const	$push147=, 0
-	i64.const	$push5=, 17179869187
-	i64.store	incs+12($pop147):p2align=2, $pop5
-	i32.const	$push146=, 0
-	i32.const	$push6=, input+20
-	i32.store	ptrs+20($pop146), $pop6
-	i32.const	$push145=, 0
-	i32.const	$push7=, input+24
-	i32.store	ptrs+24($pop145), $pop7
-	i32.const	$push144=, 0
-	i64.const	$push8=, 25769803781
-	i64.store	incs+20($pop144):p2align=2, $pop8
-	i32.const	$push143=, 0
-	i32.const	$push9=, input+28
-	i32.store	ptrs+28($pop143), $pop9
-	i32.const	$push142=, 0
-	i32.const	$push10=, input+32
-	i32.store	ptrs+32($pop142), $pop10
-	i32.const	$push141=, 0
-	i64.const	$push11=, 34359738375
-	i64.store	incs+28($pop141):p2align=2, $pop11
-	i32.const	$push140=, 0
-	i32.const	$push12=, input+36
-	i32.store	ptrs+36($pop140), $pop12
-	i32.const	$push139=, 0
-	i32.const	$push13=, input+40
-	i32.store	ptrs+40($pop139), $pop13
-	i32.const	$push138=, 0
-	i64.const	$push14=, 42949672969
-	i64.store	incs+36($pop138):p2align=2, $pop14
-	i32.const	$push137=, 0
-	i32.const	$push15=, input+44
-	i32.store	ptrs+44($pop137), $pop15
-	i32.const	$push136=, 0
-	i32.const	$push135=, 0
-	i32.store	incs($pop136), $pop135
-	i32.const	$push134=, 0
-	i32.const	$push16=, input+48
-	i32.store	ptrs+48($pop134), $pop16
-	i32.const	$push133=, 0
-	i32.const	$push17=, 11
-	i32.store	incs+44($pop133), $pop17
-	i32.const	$push132=, 0
-	i32.const	$push18=, 12
-	i32.store	incs+48($pop132), $pop18
-	i32.const	$push131=, 0
-	i32.const	$push19=, input+52
-	i32.store	ptrs+52($pop131), $pop19
-	i32.const	$push130=, 0
-	i32.const	$push20=, 13
-	i32.store	incs+52($pop130), $pop20
-	i32.const	$push129=, 0
-	i32.const	$push21=, input+56
-	i32.store	ptrs+56($pop129), $pop21
-	i32.const	$push128=, 0
-	i32.const	$push22=, 14
-	i32.store	incs+56($pop128), $pop22
-	i32.const	$push127=, 0
-	i32.const	$push23=, input+60
-	i32.store	ptrs+60($pop127), $pop23
-	i32.const	$push126=, 0
-	i32.const	$push24=, 15
-	i32.store	incs+60($pop126), $pop24
-	i32.const	$push125=, 0
-	i32.const	$push25=, input+64
-	i32.store	ptrs+64($pop125), $pop25
-	i32.const	$push124=, 0
-	i32.const	$push26=, 16
-	i32.store	incs+64($pop124), $pop26
-	i32.const	$push123=, 0
-	i32.const	$push27=, input+68
-	i32.store	ptrs+68($pop123), $pop27
-	i32.const	$push122=, 0
-	i32.const	$push28=, 17
-	i32.store	incs+68($pop122), $pop28
-	i32.const	$push121=, 0
-	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	$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	$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.const	$push178=, 0
-	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	$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	$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	$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	$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	$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	$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	$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	$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	$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	$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
+# %bb.0:                                # %entry
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
-.Lfunc_end2:
-	.size	main, .Lfunc_end2-main
+.Lfunc_end0:
+	.size	main, .Lfunc_end0-main
                                         # -- End function
-	.hidden	incs                    # @incs
-	.type	incs,@object
-	.section	.bss.incs,"aw",@nobits
-	.globl	incs
-	.p2align	4
-incs:
-	.skip	80
-	.size	incs, 80
-
-	.hidden	ptrs                    # @ptrs
-	.type	ptrs,@object
-	.section	.bss.ptrs,"aw",@nobits
-	.globl	ptrs
-	.p2align	4
-ptrs:
-	.skip	80
-	.size	ptrs, 80
-
-	.hidden	results                 # @results
-	.type	results,@object
-	.section	.bss.results,"aw",@nobits
-	.globl	results
-	.p2align	4
-results:
-	.skip	80
-	.size	results, 80
-
-	.hidden	input                   # @input
-	.type	input,@object
-	.section	.bss.input,"aw",@nobits
-	.globl	input
-	.p2align	4
-input:
-	.skip	320
-	.size	input, 320
-
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr29006.c.s b/test/torture-s/pr29006.c.s
index 3f4564970..141204e85 100644
--- a/test/torture-s/pr29006.c.s
+++ b/test/torture-s/pr29006.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 0
 	i64.store	1($0):p2align=0, $pop0
                                         # fallthrough-return
@@ -21,14 +21,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop7, $pop9
-	tee_local	$push15=, $1=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
+	i32.sub 	$1=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $1
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $1, $pop2
 	i32.const	$push0=, 0
@@ -58,4 +57,4 @@ main:                                   # @main
 	.size	.Lmain.s, 9
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr29156.c.s b/test/torture-s/pr29156.c.s
index f5e7290cd..5030e825d 100644
--- a/test/torture-s/pr29156.c.s
+++ b/test/torture-s/pr29156.c.s
@@ -7,7 +7,7 @@
 bla:                                    # @bla
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.store	4($1), $pop0
 	i32.const	$push1=, 0
@@ -27,7 +27,7 @@ bla:                                    # @bla
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	global($pop1), $pop0
@@ -47,4 +47,4 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr29695-1.c.s b/test/torture-s/pr29695-1.c.s
index 12ce8c3eb..d4eea3ea8 100644
--- a/test/torture-s/pr29695-1.c.s
+++ b/test/torture-s/pr29695-1.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 128
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 128
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 896
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -128
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -58,7 +58,7 @@ f4:                                     # @f4
 	.type	f5,@function
 f5:                                     # @f5
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -71,7 +71,7 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 2147483648
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -84,7 +84,7 @@ f6:                                     # @f6
 	.type	f7,@function
 f7:                                     # @f7
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, 15032385536
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -97,7 +97,7 @@ f7:                                     # @f7
 	.type	f8,@function
 f8:                                     # @f8
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -2147483648
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -110,7 +110,7 @@ f8:                                     # @f8
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -118,4 +118,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end8-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr29695-2.c.s b/test/torture-s/pr29695-2.c.s
index 73a6b0411..8208ffc49 100644
--- a/test/torture-s/pr29695-2.c.s
+++ b/test/torture-s/pr29695-2.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, a($pop0)
 	i32.const	$push2=, 128
@@ -22,7 +22,7 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, b($pop0)
 	i32.const	$push2=, 128
@@ -38,7 +38,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, b($pop0)
 	i32.const	$push2=, 31
@@ -56,7 +56,7 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, b($pop0)
 	i32.const	$push2=, 31
@@ -74,7 +74,7 @@ f4:                                     # @f4
 	.type	f5,@function
 f5:                                     # @f5
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, c($pop0)
 	i64.const	$push2=, 2147483648
@@ -90,7 +90,7 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load32_u	$push1=, d($pop0)
 	i64.const	$push2=, 2147483648
@@ -106,7 +106,7 @@ f6:                                     # @f6
 	.type	f7,@function
 f7:                                     # @f7
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push4=, 15032385536
 	i64.const	$push3=, 0
 	i32.const	$push0=, 0
@@ -125,7 +125,7 @@ f7:                                     # @f7
 	.type	f8,@function
 f8:                                     # @f8
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push4=, -2147483648
 	i64.const	$push3=, 0
 	i32.const	$push0=, 0
@@ -144,7 +144,7 @@ f8:                                     # @f8
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push10=, 0
 	i32.load8_u	$push0=, a($pop10)
@@ -152,25 +152,25 @@ main:                                   # @main
 	i32.shr_u	$push2=, $pop0, $pop1
 	i32.eqz 	$push17=, $pop2
 	br_if   	0, $pop17       # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push12=, 0
 	i32.load8_s	$push3=, b($pop12)
 	i32.const	$push11=, 0
 	i32.ge_s	$push4=, $pop3, $pop11
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %if.end12
+# %bb.2:                                # %if.end12
 	i32.const	$push14=, 0
 	i32.load	$push5=, c($pop14)
 	i32.const	$push13=, 0
 	i32.ge_s	$push6=, $pop5, $pop13
 	br_if   	0, $pop6        # 0: down to label0
-# BB#3:                                 # %if.end16
+# %bb.3:                                # %if.end16
 	i32.const	$push16=, 0
 	i32.load	$push7=, d($pop16)
 	i32.const	$push15=, 0
 	i32.ge_s	$push8=, $pop7, $pop15
 	br_if   	0, $pop8        # 0: down to label0
-# BB#4:                                 # %if.end28
+# %bb.4:                                # %if.end28
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB8_5:                                # %if.then
@@ -217,5 +217,5 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr29797-1.c.s b/test/torture-s/pr29797-1.c.s
index d3bd96e09..90af55e04 100644
--- a/test/torture-s/pr29797-1.c.s
+++ b/test/torture-s/pr29797-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 32768
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr29797-2.c.s b/test/torture-s/pr29797-2.c.s
index 2b218c545..4f3258013 100644
--- a/test/torture-s/pr29797-2.c.s
+++ b/test/torture-s/pr29797-2.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 32768
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr29798.c.s b/test/torture-s/pr29798.c.s
index 2d74d9866..6201706d8 100644
--- a/test/torture-s/pr29798.c.s
+++ b/test/torture-s/pr29798.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end4.1
+# %bb.0:                                # %if.end4.1
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr30185.c.s b/test/torture-s/pr30185.c.s
index 9009600e2..dc359a562 100644
--- a/test/torture-s/pr30185.c.s
+++ b/test/torture-s/pr30185.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push1=, 8($1)
 	i64.load	$push0=, 8($2)
 	i64.div_s	$push2=, $pop1, $pop0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end10
+# %bb.0:                                # %if.end10
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -30,4 +30,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr30778.c.s b/test/torture-s/pr30778.c.s
index 701a7dd4c..41c4fd3d1 100644
--- a/test/torture-s/pr30778.c.s
+++ b/test/torture-s/pr30778.c.s
@@ -6,12 +6,11 @@
 	.type	init_reg_last,@function
 init_reg_last:                          # @init_reg_last
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push12=, reg_stat($pop0)
-	tee_local	$push11=, $0=, $pop12
+	i32.load	$0=, reg_stat($pop0)
 	i64.const	$push1=, 0
-	i64.store	0($pop11):p2align=0, $pop1
+	i64.store	0($0):p2align=0, $pop1
 	i32.const	$push2=, 18
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push10=, 0
@@ -36,14 +35,13 @@ init_reg_last:                          # @init_reg_last
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 32
-	i32.sub 	$push15=, $pop3, $pop5
-	tee_local	$push14=, $0=, $pop15
-	i32.store	__stack_pointer($pop6), $pop14
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push13=, 0
 	i32.const	$push10=, 8
 	i32.add 	$push11=, $0, $pop10
@@ -56,13 +54,13 @@ main:                                   # @main
 	i32.const	$push12=, -1
 	i32.ne  	$push2=, $pop1, $pop12
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %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	$push16=, 0
-	return  	$pop16
+	i32.const	$push14=, 0
+	return  	$pop14
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -79,5 +77,5 @@ reg_stat:
 	.size	reg_stat, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr31072.c.s b/test/torture-s/pr31072.c.s
index dc6f093c9..f50e273cb 100644
--- a/test/torture-s/pr31072.c.s
+++ b/test/torture-s/pr31072.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, ReadyFlag_NotProperlyInitialized($pop3)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -34,5 +34,5 @@ ReadyFlag_NotProperlyInitialized:
 	.size	ReadyFlag_NotProperlyInitialized, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr31136.c.s b/test/torture-s/pr31136.c.s
index 0c7c9c9d0..a40c6eb50 100644
--- a/test/torture-s/pr31136.c.s
+++ b/test/torture-s/pr31136.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i32.load16_u	$push1=, s($pop7)
@@ -31,4 +31,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr31169.c.s b/test/torture-s/pr31169.c.s
index cc67be1ae..e9a1957d0 100644
--- a/test/torture-s/pr31169.c.s
+++ b/test/torture-s/pr31169.c.s
@@ -8,22 +8,21 @@ sign_bit_p:                             # @sign_bit_p
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	block   	
-	block   	
+# %bb.0:                                # %entry
 	i32.load16_u	$push0=, 0($0)
 	i32.const	$push1=, 511
-	i32.and 	$push20=, $pop0, $pop1
-	tee_local	$push19=, $0=, $pop20
+	i32.and 	$0=, $pop0, $pop1
+	block   	
+	block   	
 	i32.const	$push2=, 33
-	i32.lt_u	$push3=, $pop19, $pop2
+	i32.lt_u	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$3=, -1
-	i32.const	$push21=, -1
+	i32.const	$push19=, -1
 	i32.const	$push9=, 64
 	i32.sub 	$push10=, $pop9, $0
-	i32.shr_u	$5=, $pop21, $pop10
+	i32.shr_u	$5=, $pop19, $pop10
 	i32.const	$push13=, 1
 	i32.const	$push11=, -33
 	i32.add 	$push12=, $0, $pop11
@@ -37,8 +36,8 @@ sign_bit_p:                             # @sign_bit_p
 	i32.sub 	$push5=, $pop4, $0
 	i32.shr_u	$3=, $pop6, $pop5
 	i32.const	$push8=, 1
-	i32.const	$push22=, -1
-	i32.add 	$push7=, $0, $pop22
+	i32.const	$push20=, -1
+	i32.add 	$push7=, $0, $pop20
 	i32.shl 	$4=, $pop8, $pop7
 	i32.const	$5=, 0
 	i32.const	$0=, 0
@@ -60,7 +59,7 @@ sign_bit_p:                             # @sign_bit_p
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %sign_bit_p.exit
+# %bb.0:                                # %sign_bit_p.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -68,4 +67,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr31448-2.c.s b/test/torture-s/pr31448-2.c.s
index 5dba89522..cbb6779a8 100644
--- a/test/torture-s/pr31448-2.c.s
+++ b/test/torture-s/pr31448-2.c.s
@@ -5,7 +5,7 @@
 	.globl	g
 	.type	g,@function
 g:                                      # @g
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	unreachable
 	unreachable
 	.endfunc
@@ -18,25 +18,23 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push15=, next($pop0)
-	tee_local	$push14=, $0=, $pop15
+	i32.load	$0=, next($pop0)
 	i32.load	$push1=, 0($0)
 	i32.const	$push2=, -16777216
 	i32.and 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 16711422
 	i32.or  	$push5=, $pop3, $pop4
-	i32.store	0($pop14), $pop5
-	i32.const	$push13=, 0
-	i32.load	$push12=, next($pop13)
-	tee_local	$push11=, $0=, $pop12
+	i32.store	0($0), $pop5
+	i32.const	$push11=, 0
+	i32.load	$0=, next($pop11)
 	i32.load	$push6=, 4($0)
 	i32.const	$push10=, -16777216
 	i32.and 	$push7=, $pop6, $pop10
 	i32.const	$push9=, 16711422
 	i32.or  	$push8=, $pop7, $pop9
-	i32.store	4($pop11), $pop8
+	i32.store	4($0), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -48,7 +46,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# %bb.0:                                # %if.end6
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
@@ -73,4 +71,4 @@ next:
 	.size	next, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr31448.c.s b/test/torture-s/pr31448.c.s
index 2c9a3ade7..414a60bcc 100644
--- a/test/torture-s/pr31448.c.s
+++ b/test/torture-s/pr31448.c.s
@@ -5,7 +5,7 @@
 	.globl	g
 	.type	g,@function
 g:                                      # @g
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	unreachable
 	unreachable
 	.endfunc
@@ -18,25 +18,23 @@ g:                                      # @g
 	.type	f,@function
 f:                                      # @f
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push15=, next($pop0)
-	tee_local	$push14=, $0=, $pop15
+	i32.load	$0=, next($pop0)
 	i32.load	$push1=, 0($0)
 	i32.const	$push2=, -16777216
 	i32.and 	$push3=, $pop1, $pop2
 	i32.const	$push4=, 16711422
 	i32.or  	$push5=, $pop3, $pop4
-	i32.store	0($pop14), $pop5
-	i32.const	$push13=, 0
-	i32.load	$push12=, next($pop13)
-	tee_local	$push11=, $0=, $pop12
+	i32.store	0($0), $pop5
+	i32.const	$push11=, 0
+	i32.load	$0=, next($pop11)
 	i32.load	$push6=, 4($0)
 	i32.const	$push10=, -16777216
 	i32.and 	$push7=, $pop6, $pop10
 	i32.const	$push9=, 16711422
 	i32.or  	$push8=, $pop7, $pop9
-	i32.store	4($pop11), $pop8
+	i32.store	4($0), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -48,7 +46,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end6
+# %bb.0:                                # %if.end6
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
@@ -73,4 +71,4 @@ next:
 	.size	next, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr31605.c.s b/test/torture-s/pr31605.c.s
index 32535939d..2844d6dc5 100644
--- a/test/torture-s/pr31605.c.s
+++ b/test/torture-s/pr31605.c.s
@@ -6,7 +6,7 @@
 	.type	put_field,@function
 put_field:                              # @put_field
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.add 	$push0=, $1, $0
 	i32.const	$push1=, -8
@@ -14,7 +14,7 @@ put_field:                              # @put_field
 	i32.const	$push5=, -8
 	i32.ne  	$push3=, $pop2, $pop5
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -31,7 +31,7 @@ put_field:                              # @put_field
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -40,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr32244-1.c.s b/test/torture-s/pr32244-1.c.s
index 80b448fd5..bec12f202 100644
--- a/test/torture-s/pr32244-1.c.s
+++ b/test/torture-s/pr32244-1.c.s
@@ -6,7 +6,7 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i64.load	$push1=, x($pop0)
@@ -14,7 +14,7 @@ test1:                                  # @test1
 	i64.shl 	$push3=, $pop1, $pop2
 	i64.ne  	$push4=, $pop3, $0
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,7 +30,7 @@ test1:                                  # @test1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then.i
+# %bb.0:                                # %if.then.i
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i64.load	$push1=, x($pop6)
@@ -55,5 +55,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr32500.c.s b/test/torture-s/pr32500.c.s
index 63896dc66..5a2e0c40c 100644
--- a/test/torture-s/pr32500.c.s
+++ b/test/torture-s/pr32500.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	x($pop0), $0
                                         # fallthrough-return
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -34,7 +34,7 @@ bar:                                    # @bar
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.then4
+# %bb.0:                                # %if.then4
 	i32.const	$push0=, 57005
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, 48879
@@ -59,5 +59,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr33142.c.s b/test/torture-s/pr33142.c.s
index ef8b4310a..11586ef94 100644
--- a/test/torture-s/pr33142.c.s
+++ b/test/torture-s/pr33142.c.s
@@ -8,27 +8,26 @@ lisp_atan2:                             # @lisp_atan2
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	block   	
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 0
 	i32.gt_s	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.then2
+# %bb.2:                                # %if.then2
 	i32.const	$push4=, 31
-	i32.shr_s	$push8=, $1, $pop4
-	tee_local	$push7=, $2=, $pop8
-	i32.add 	$push5=, $1, $pop7
+	i32.shr_s	$2=, $1, $pop4
+	i32.add 	$push5=, $1, $2
 	i32.xor 	$push6=, $pop5, $2
 	i32.le_s	$2=, $pop6, $0
 .LBB0_3:                                # %return
 	end_block                       # label0:
-	copy_local	$push9=, $2
-                                        # fallthrough-return: $pop9
+	copy_local	$push7=, $2
+                                        # fallthrough-return: $pop7
 	.endfunc
 .Lfunc_end0:
 	.size	lisp_atan2, .Lfunc_end0-lisp_atan2
@@ -40,14 +39,13 @@ lisp_atan2:                             # @lisp_atan2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push14=, $pop6, $pop8
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop9), $pop13
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i32.const	$push0=, 63
 	i32.store	12($0), $pop0
 	i32.const	$push1=, -77
@@ -57,7 +55,7 @@ main:                                   # @main
 	i32.load	$push3=, 8($0)
 	i32.call	$push4=, lisp_atan2@FUNCTION, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push12=, 0
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $0, $pop10
@@ -73,5 +71,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33382.c.s b/test/torture-s/pr33382.c.s
index 1e65a66cb..690620bca 100644
--- a/test/torture-s/pr33382.c.s
+++ b/test/torture-s/pr33382.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	x+4($pop1), $pop0
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push0=, 1
 	i32.store	x+4($pop3), $pop0
@@ -31,7 +31,7 @@ main:                                   # @main
 	i32.const	$push2=, 0
 	i32.load	$push1=, x+8($pop2)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -56,5 +56,5 @@ x:
 	.size	x, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33631.c.s b/test/torture-s/pr33631.c.s
index faf821458..3d9a83ade 100644
--- a/test/torture-s/pr33631.c.s
+++ b/test/torture-s/pr33631.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr33669.c.s b/test/torture-s/pr33669.c.s
index 94c47d9ab..f4c6d8ea4 100644
--- a/test/torture-s/pr33669.c.s
+++ b/test/torture-s/pr33669.c.s
@@ -8,37 +8,34 @@ foo:                                    # @foo
 	.param  	i32, i64, i32
 	.result 	i64
 	.local  	i32, i64, i64
-# BB#0:                                 # %entry
-	i64.const	$5=, -1
-	block   	
-	i32.load	$push17=, 0($0)
-	tee_local	$push16=, $3=, $pop17
-	i32.add 	$push0=, $2, $3
+# %bb.0:                                # %entry
+	i32.load	$3=, 0($0)
 	i64.extend_u/i32	$push1=, $3
-	i64.rem_s	$push15=, $1, $pop1
-	tee_local	$push14=, $4=, $pop15
-	i32.wrap/i64	$push2=, $pop14
+	i64.rem_s	$4=, $1, $pop1
+	i32.add 	$push0=, $2, $3
+	i32.wrap/i64	$push2=, $4
 	i32.add 	$push3=, $pop0, $pop2
 	i32.const	$push4=, -1
-	i32.add 	$push13=, $pop3, $pop4
-	tee_local	$push12=, $2=, $pop13
+	i32.add 	$2=, $pop3, $pop4
+	i64.const	$5=, -1
+	block   	
 	i32.rem_u	$push5=, $2, $3
-	i32.sub 	$push6=, $pop12, $pop5
-	i32.lt_u	$push7=, $pop16, $pop6
+	i32.sub 	$push6=, $2, $pop5
+	i32.lt_u	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.sub 	$5=, $1, $4
 	i32.load	$push8=, 4($0)
 	i32.le_u	$push9=, $pop8, $3
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %if.then13
+# %bb.2:                                # %if.then13
 	i32.const	$push10=, 4
 	i32.add 	$push11=, $0, $pop10
 	i32.store	0($pop11), $3
 .LBB0_3:                                # %cleanup
 	end_block                       # label0:
-	copy_local	$push18=, $5
-                                        # fallthrough-return: $pop18
+	copy_local	$push12=, $5
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -49,7 +46,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -57,4 +54,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr33779-1.c.s b/test/torture-s/pr33779-1.c.s
index c1524f253..47d4b9061 100644
--- a/test/torture-s/pr33779-1.c.s
+++ b/test/torture-s/pr33779-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1073741823
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push3=, 1073741823
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -31,4 +31,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr33779-2.c.s b/test/torture-s/pr33779-2.c.s
index 62c5a2880..8ae4a5f3f 100644
--- a/test/torture-s/pr33779-2.c.s
+++ b/test/torture-s/pr33779-2.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 4
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -33,4 +33,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr33870-1.c.s b/test/torture-s/pr33870-1.c.s
index 2dec7d37b..29a2a9fb4 100644
--- a/test/torture-s/pr33870-1.c.s
+++ b/test/torture-s/pr33870-1.c.s
@@ -8,47 +8,44 @@ sort_pagelist:                          # @sort_pagelist
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push46=, 0
+	i32.load	$push45=, __stack_pointer($pop46)
+	i32.const	$push47=, 160
+	i32.sub 	$7=, $pop45, $pop47
+	i32.const	$push48=, 0
+	i32.store	__stack_pointer($pop48), $7
+	i32.const	$push72=, 0
 	i32.const	$push0=, 100
-	i32.call	$1=, memset@FUNCTION, $4, $pop64, $pop0
-	i32.const	$4=, 0
+	i32.call	$1=, memset@FUNCTION, $7, $pop72, $pop0
+	i32.const	$7=, 0
 	block   	
-	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	$push13=, 96
-	i32.add 	$6=, $1, $pop13
+	i32.eqz 	$push118=, $0
+	br_if   	0, $pop118      # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push60=, 112
+	i32.add 	$push61=, $1, $pop60
+	i32.const	$push74=, 32
+	i32.add 	$3=, $pop61, $pop74
+	i32.const	$push62=, 112
+	i32.add 	$push63=, $1, $pop62
+	i32.const	$push73=, 32
+	i32.add 	$2=, $pop63, $pop73
+	i32.const	$push14=, 96
+	i32.add 	$5=, $1, $pop14
 .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
+                                        #     Child Loop BB0_22 Depth 2
 	loop    	                # label1:
-	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
+	copy_local	$7=, $0
+	i32.const	$push76=, 32
+	i32.add 	$9=, $7, $pop76
+	i32.load	$0=, 0($9)
+	i32.const	$push75=, 0
+	i32.store	0($9), $pop75
+	i32.const	$6=, 0
 .LBB0_3:                                # %for.body
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Loop Header: Depth=2
@@ -58,339 +55,416 @@ sort_pagelist:                          # @sort_pagelist
 	block   	
 	block   	
 	block   	
-	loop    	                # label7:
-	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
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	loop    	                # label12:
+	i32.const	$push77=, 2
+	i32.shl 	$push1=, $6, $pop77
+	i32.add 	$4=, $1, $pop1
+	i32.load	$9=, 0($4)
+	i32.eqz 	$push119=, $9
+	br_if   	1, $pop119      # 1: down to label11
+# %bb.4:                                # %if.else
                                         #   in Loop: Header=BB0_3 Depth=2
-	i32.const	$push80=, 0
-	i32.store	xx($pop80), $2
+	i32.const	$push78=, 0
+	i32.store	xx($pop78), $2
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push124=, $4
-	br_if   	0, $pop124      # 0: down to label10
-# BB#5:                                 # %while.body.i.preheader
+	i32.eqz 	$push120=, $7
+	br_if   	0, $pop120      # 0: down to label15
+# %bb.5:                                # %while.body.i.preheader
                                         #   in Loop: Header=BB0_3 Depth=2
-	i32.const	$push60=, 112
-	i32.add 	$push61=, $1, $pop60
-	copy_local	$8=, $pop61
+	i32.const	$push68=, 112
+	i32.add 	$push69=, $1, $pop68
+	copy_local	$8=, $pop69
 .LBB0_6:                                # %while.body.i
                                         #   Parent Loop BB0_2 Depth=1
                                         #     Parent Loop BB0_3 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
-	loop    	                # label11:
+	loop    	                # label16:
 	block   	
 	block   	
 	i32.load	$push3=, 4($9)
-	i32.load	$push2=, 4($4)
+	i32.load	$push2=, 4($7)
 	i32.ge_u	$push4=, $pop3, $pop2
-	br_if   	0, $pop4        # 0: down to label13
-# BB#7:                                 # %if.then.i
+	br_if   	0, $pop4        # 0: down to label18
+# %bb.7:                                # %if.then.i
                                         #   in Loop: Header=BB0_6 Depth=3
-	i32.const	$push82=, 32
-	i32.add 	$push7=, $8, $pop82
+	i32.const	$push80=, 32
+	i32.add 	$push7=, $8, $pop80
 	i32.store	0($pop7), $9
-	i32.const	$push81=, 32
-	i32.add 	$push8=, $9, $pop81
+	i32.const	$push79=, 32
+	i32.add 	$push8=, $9, $pop79
 	i32.load	$10=, 0($pop8)
-	copy_local	$11=, $4
+	copy_local	$11=, $7
 	copy_local	$8=, $9
-	br      	1               # 1: down to label12
+	br      	1               # 1: down to label17
 .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 	$push6=, $4, $pop83
+	end_block                       # label18:
+	i32.const	$push82=, 32
+	i32.add 	$push5=, $8, $pop82
+	i32.store	0($pop5), $7
+	i32.const	$push81=, 32
+	i32.add 	$push6=, $7, $pop81
 	i32.load	$11=, 0($pop6)
 	copy_local	$10=, $9
-	copy_local	$8=, $4
+	copy_local	$8=, $7
 .LBB0_9:                                # %if.end.i
                                         #   in Loop: Header=BB0_6 Depth=3
-	end_block                       # label12:
+	end_block                       # label17:
 	block   	
-	i32.const	$push86=, 0
-	i32.const	$push62=, 112
-	i32.add 	$push63=, $1, $pop62
-	i32.const	$push85=, 32
-	i32.add 	$push9=, $pop63, $pop85
+	i32.const	$push84=, 0
+	i32.const	$push70=, 112
+	i32.add 	$push71=, $1, $pop70
+	i32.const	$push83=, 32
+	i32.add 	$push9=, $pop71, $pop83
 	i32.load	$push10=, 0($pop9)
 	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
+	i32.store	vx($pop84), $pop11
+	i32.eqz 	$push121=, $10
+	br_if   	0, $pop121      # 0: down to label19
+# %bb.10:                               # %if.end.i
                                         #   in Loop: Header=BB0_6 Depth=3
-	copy_local	$4=, $11
+	copy_local	$7=, $11
 	copy_local	$9=, $10
-	br_if   	1, $11          # 1: up to label11
-.LBB0_11:                               # %merge_pagelist.exit
+	br_if   	1, $11          # 1: up to label16
+.LBB0_11:                               # %while.end.loopexit.i
                                         #   in Loop: Header=BB0_3 Depth=2
-	end_block                       # label14:
+	end_block                       # label19:
 	end_loop
-	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:
-	copy_local	$10=, $9
-	copy_local	$4=, $2
-.LBB0_13:                               # %merge_pagelist.exit.thread
+	i32.const	$push85=, 32
+	i32.add 	$7=, $8, $pop85
+	i32.eqz 	$push122=, $10
+	br_if   	1, $pop122      # 1: down to label14
+# %bb.12:                               #   in Loop: Header=BB0_3 Depth=2
+	copy_local	$push39=, $10
+	i32.store	0($7), $pop39
+	br      	2               # 2: down to label13
+.LBB0_13:                               #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label15:
+	copy_local	$push40=, $2
+	i32.store	0($pop40), $9
+	br      	1               # 1: down to label13
+.LBB0_14:                               # %if.else17.i
                                         #   in Loop: Header=BB0_3 Depth=2
-	end_block                       # label9:
-	copy_local	$11=, $10
-.LBB0_14:                               # %for.cond
+	end_block                       # label14:
+	block   	
+	i32.eqz 	$push123=, $11
+	br_if   	0, $pop123      # 0: down to label20
+# %bb.15:                               # %if.then19.i
                                         #   in Loop: Header=BB0_3 Depth=2
-	end_block                       # label8:
-	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
+	i32.store	0($7), $11
+	br      	1               # 1: down to label13
+.LBB0_16:                               # %if.else22.i
+                                        #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label20:
+	i32.const	$push86=, 0
+	i32.store	0($7), $pop86
+.LBB0_17:                               # %merge_pagelist.exit
+                                        #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label13:
+	i32.const	$push64=, 112
+	i32.add 	$push65=, $1, $pop64
+	i32.const	$push90=, 32
+	i32.add 	$9=, $pop65, $pop90
+	i32.load	$7=, 0($9)
+	i32.const	$push89=, 0
+	i32.store	0($4), $pop89
+	i32.const	$push88=, 1
+	i32.add 	$6=, $6, $pop88
+	i32.const	$push87=, 24
+	i32.lt_u	$push12=, $6, $pop87
+	br_if   	0, $pop12       # 0: up to label12
+# %bb.18:                               # %for.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
-	i32.const	$push96=, 24
-	i32.ne  	$push12=, $11, $pop96
-	br_if   	1, $pop12       # 1: down to label5
-# BB#16:                                # %if.then9
+	i32.const	$push91=, 24
+	i32.ne  	$push13=, $6, $pop91
+	br_if   	1, $pop13       # 1: down to label10
+# %bb.19:                               # %if.then9
                                         #   in Loop: Header=BB0_2 Depth=1
-	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
+	i32.load	$10=, 0($5)
+	i32.const	$push92=, 0
+	i32.store	xx($pop92), $3
+	i32.eqz 	$push124=, $7
+	br_if   	2, $pop124      # 2: down to label9
+# %bb.20:                               # %if.then9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.eqz 	$push127=, $9
-	br_if   	2, $pop127      # 2: down to label4
-# BB#18:                                # %while.body.i87.preheader
+	i32.eqz 	$push125=, $10
+	br_if   	2, $pop125      # 2: down to label9
+# %bb.21:                               # %while.body.i92.preheader
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push58=, 112
-	i32.add 	$push59=, $1, $pop58
-	copy_local	$7=, $pop59
-.LBB0_19:                               # %while.body.i87
+	i32.const	$push66=, 112
+	i32.add 	$push67=, $1, $pop66
+	copy_local	$6=, $pop67
+.LBB0_22:                               # %while.body.i92
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label15:
-	block   	
-	block   	
-	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	$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.i91
-                                        #   in Loop: Header=BB0_19 Depth=2
-	end_block                       # label17:
-	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:
+	loop    	                # label21:
 	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	$4=, $8
-	copy_local	$9=, $11
-	br_if   	1, $8           # 1: up to label15
-.LBB0_24:                               # %while.end.loopexit.i100
+	block   	
+	i32.load	$push16=, 4($10)
+	i32.load	$push15=, 4($7)
+	i32.ge_u	$push17=, $pop16, $pop15
+	br_if   	0, $pop17       # 0: down to label23
+# %bb.23:                               # %if.then.i94
+                                        #   in Loop: Header=BB0_22 Depth=2
+	i32.const	$push94=, 32
+	i32.add 	$push20=, $6, $pop94
+	i32.store	0($pop20), $10
+	i32.const	$push93=, 32
+	i32.add 	$push21=, $10, $pop93
+	i32.load	$11=, 0($pop21)
+	copy_local	$8=, $7
+	copy_local	$6=, $10
+	br      	1               # 1: down to label22
+.LBB0_24:                               # %if.else.i96
+                                        #   in Loop: Header=BB0_22 Depth=2
+	end_block                       # label23:
+	i32.const	$push96=, 32
+	i32.add 	$push18=, $6, $pop96
+	i32.store	0($pop18), $7
+	i32.const	$push95=, 32
+	i32.add 	$push19=, $7, $pop95
+	i32.load	$8=, 0($pop19)
+	copy_local	$11=, $10
+	copy_local	$6=, $7
+.LBB0_25:                               # %if.end.i103
+                                        #   in Loop: Header=BB0_22 Depth=2
+	end_block                       # label22:
+	block   	
+	i32.const	$push97=, 0
+	i32.load	$push22=, 0($9)
+	i32.load	$push23=, 0($pop22)
+	i32.store	vx($pop97), $pop23
+	i32.eqz 	$push126=, $11
+	br_if   	0, $pop126      # 0: down to label24
+# %bb.26:                               # %if.end.i103
+                                        #   in Loop: Header=BB0_22 Depth=2
+	copy_local	$7=, $8
+	copy_local	$10=, $11
+	br_if   	1, $8           # 1: up to label21
+.LBB0_27:                               # %while.end.loopexit.i105
                                         #   in Loop: Header=BB0_2 Depth=1
-	end_block                       # label18:
+	end_block                       # label24:
 	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
+	i32.const	$push98=, 32
+	i32.add 	$6=, $6, $pop98
+	i32.eqz 	$push127=, $11
+	br_if   	4, $pop127      # 4: down to label7
+# %bb.28:                               #   in Loop: Header=BB0_2 Depth=1
+	copy_local	$10=, $11
+	br      	3               # 3: down to label8
+.LBB0_29:                               # %for.end.thread
                                         #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label11:
+	i32.store	0($4), $7
+.LBB0_30:                               # %if.end13
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label10:
+	br_if   	8, $0           # 8: up to label1
+	br      	7               # 7: down to label2
+.LBB0_31:                               # %while.end.i106
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label9:
+	copy_local	$6=, $3
+	i32.eqz 	$push128=, $10
+	br_if   	2, $pop128      # 2: down to label6
+.LBB0_32:                               # %if.then14.i109
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label8:
+	i32.store	0($6), $10
+	br      	4               # 4: down to label3
+.LBB0_33:                               #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label7:
+	i32.const	$push99=, 0
+	i32.ne  	$push42=, $8, $pop99
+	br_if   	1, $pop42       # 1: down to label5
+	br      	2               # 2: down to label4
+.LBB0_34:                               #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label6:
-	i32.store	0($5), $4
-.LBB0_26:                               # %if.end13
+	copy_local	$8=, $7
+	copy_local	$6=, $3
+	i32.const	$push101=, 0
+	i32.eq  	$push41=, $7, $pop101
+	br_if   	1, $pop41       # 1: down to label4
+.LBB0_35:                               # %if.then19.i114
                                         #   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
+	i32.store	0($6), $8
+	br      	1               # 1: down to label3
+.LBB0_36:                               # %if.else22.i115
+                                        #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label4:
-	copy_local	$7=, $3
-	copy_local	$11=, $9
-	copy_local	$8=, $4
-.LBB0_28:                               # %merge_pagelist.exit106
+	i32.const	$push100=, 0
+	i32.store	0($6), $pop100
+.LBB0_37:                               # %merge_pagelist.exit116
                                         #   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
+	i32.load	$push24=, 0($9)
+	i32.store	0($5), $pop24
 	br_if   	1, $0           # 1: up to label1
-.LBB0_29:                               # %while.end.loopexit
+.LBB0_38:                               # %while.end.loopexit
 	end_block                       # label2:
 	end_loop
-	i32.load	$4=, 0($1)
-.LBB0_30:                               # %while.end
+	i32.load	$7=, 0($1)
+.LBB0_39:                               # %while.end
 	end_block                       # label0:
-	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
+	i32.const	$push52=, 112
+	i32.add 	$push53=, $1, $pop52
+	i32.const	$push102=, 32
+	i32.add 	$4=, $pop53, $pop102
+	i32.const	$6=, 1
+.LBB0_40:                               # %for.body17
                                         # =>This Loop Header: Depth=1
-                                        #     Child Loop BB0_34 Depth 2
-	loop    	                # label19:
-	i32.const	$push109=, 2
-	i32.shl 	$push25=, $7, $pop109
+                                        #     Child Loop BB0_43 Depth 2
+	loop    	                # label25:
+	i32.const	$push104=, 2
+	i32.shl 	$push25=, $6, $pop104
 	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
+	i32.const	$push103=, 0
+	i32.store	xx($pop103), $4
+	block   	
+	block   	
+	block   	
 	block   	
 	block   	
-	i32.eqz 	$push129=, $4
-	br_if   	0, $pop129      # 0: down to label21
-# BB#32:                                # %for.body17
-                                        #   in Loop: Header=BB0_31 Depth=1
+	block   	
+	block   	
+	i32.eqz 	$push129=, $7
+	br_if   	0, $pop129      # 0: down to label32
+# %bb.41:                               # %for.body17
+                                        #   in Loop: Header=BB0_40 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
+	br_if   	0, $pop130      # 0: down to label32
+# %bb.42:                               # %while.body.i55.preheader
+                                        #   in Loop: Header=BB0_40 Depth=1
+	i32.const	$push54=, 112
+	i32.add 	$push55=, $1, $pop54
+	copy_local	$8=, $pop55
+.LBB0_43:                               # %while.body.i55
+                                        #   Parent Loop BB0_40 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
-	loop    	                # label22:
+	loop    	                # label33:
 	block   	
 	block   	
-	i32.load	$push28=, 4($4)
+	i32.load	$push28=, 4($7)
 	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
+	br_if   	0, $pop29       # 0: down to label35
+# %bb.44:                               # %if.then.i57
+                                        #   in Loop: Header=BB0_43 Depth=2
+	i32.const	$push106=, 32
+	i32.add 	$push32=, $8, $pop106
+	i32.store	0($pop32), $7
+	i32.const	$push105=, 32
+	i32.add 	$push33=, $7, $pop105
 	i32.load	$10=, 0($pop33)
 	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
+	copy_local	$8=, $7
+	br      	1               # 1: down to label34
+.LBB0_45:                               # %if.else.i59
+                                        #   in Loop: Header=BB0_43 Depth=2
+	end_block                       # label35:
+	i32.const	$push108=, 32
+	i32.add 	$push30=, $8, $pop108
 	i32.store	0($pop30), $9
-	i32.const	$push112=, 32
-	i32.add 	$push31=, $9, $pop112
+	i32.const	$push107=, 32
+	i32.add 	$push31=, $9, $pop107
 	i32.load	$11=, 0($pop31)
-	copy_local	$10=, $4
+	copy_local	$10=, $7
 	copy_local	$8=, $9
-.LBB0_37:                               # %if.end.i66
-                                        #   in Loop: Header=BB0_34 Depth=2
-	end_block                       # label23:
+.LBB0_46:                               # %if.end.i66
+                                        #   in Loop: Header=BB0_43 Depth=2
+	end_block                       # label34:
 	block   	
-	i32.const	$push115=, 0
-	i32.const	$push50=, 112
-	i32.add 	$push51=, $1, $pop50
-	i32.const	$push114=, 32
-	i32.add 	$push34=, $pop51, $pop114
+	i32.const	$push110=, 0
+	i32.const	$push56=, 112
+	i32.add 	$push57=, $1, $pop56
+	i32.const	$push109=, 32
+	i32.add 	$push34=, $pop57, $pop109
 	i32.load	$push35=, 0($pop34)
 	i32.load	$push36=, 0($pop35)
-	i32.store	vx($pop115), $pop36
+	i32.store	vx($pop110), $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
+	br_if   	0, $pop131      # 0: down to label36
+# %bb.47:                               # %if.end.i66
+                                        #   in Loop: Header=BB0_43 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:
+	copy_local	$7=, $10
+	br_if   	1, $11          # 1: up to label33
+.LBB0_48:                               # %while.end.loopexit.i68
+                                        #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label36:
 	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
+	i32.const	$push111=, 32
+	i32.add 	$8=, $8, $pop111
+	i32.eqz 	$push132=, $10
+	br_if   	2, $pop132      # 2: down to label30
+# %bb.49:                               #   in Loop: Header=BB0_40 Depth=1
+	copy_local	$7=, $10
+	br      	1               # 1: down to label31
+.LBB0_50:                               # %while.end.i69
+                                        #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label32:
+	copy_local	$8=, $4
+	i32.eqz 	$push133=, $7
+	br_if   	2, $pop133      # 2: down to label29
+.LBB0_51:                               # %if.then14.i72
+                                        #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label31:
+	i32.store	0($8), $7
+	br      	4               # 4: down to label26
+.LBB0_52:                               #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label30:
+	i32.const	$push112=, 0
+	i32.ne  	$push44=, $11, $pop112
+	br_if   	1, $pop44       # 1: down to label28
+	br      	2               # 2: down to label27
+.LBB0_53:                               #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label29:
 	copy_local	$11=, $9
-.LBB0_41:                               # %merge_pagelist.exit74
-                                        #   in Loop: Header=BB0_31 Depth=1
-	end_block                       # label20:
-	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
+	copy_local	$8=, $4
+	i32.const	$push114=, 0
+	i32.eq  	$push43=, $9, $pop114
+	br_if   	1, $pop43       # 1: down to label27
+.LBB0_54:                               # %if.then19.i77
+                                        #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label28:
+	i32.store	0($8), $11
+	br      	1               # 1: down to label26
+.LBB0_55:                               # %if.else22.i78
+                                        #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label27:
+	i32.const	$push113=, 0
+	i32.store	0($8), $pop113
+.LBB0_56:                               # %merge_pagelist.exit79
+                                        #   in Loop: Header=BB0_40 Depth=1
+	end_block                       # label26:
+	i32.const	$push117=, 1
+	i32.add 	$6=, $6, $pop117
+	i32.const	$push58=, 112
+	i32.add 	$push59=, $1, $pop58
+	i32.const	$push116=, 32
+	i32.add 	$push38=, $pop59, $pop116
+	i32.load	$7=, 0($pop38)
+	i32.const	$push115=, 25
+	i32.ne  	$push37=, $6, $pop115
+	br_if   	0, $pop37       # 0: up to label25
+# %bb.57:                               # %for.end22
 	end_loop
-	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
+	i32.const	$push51=, 0
+	i32.const	$push49=, 160
+	i32.add 	$push50=, $1, $pop49
+	i32.store	__stack_pointer($pop51), $pop50
+	copy_local	$push134=, $7
+                                        # fallthrough-return: $pop134
 	.endfunc
 .Lfunc_end0:
 	.size	sort_pagelist, .Lfunc_end0-sort_pagelist
@@ -402,14 +476,13 @@ sort_pagelist:                          # @sort_pagelist
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push30=, 0
+# %bb.0:                                # %entry
 	i32.const	$push28=, 0
 	i32.load	$push27=, __stack_pointer($pop28)
 	i32.const	$push29=, 224
-	i32.sub 	$push39=, $pop27, $pop29
-	tee_local	$push38=, $1=, $pop39
-	i32.store	__stack_pointer($pop30), $pop38
+	i32.sub 	$1=, $pop27, $pop29
+	i32.const	$push30=, 0
+	i32.store	__stack_pointer($pop30), $1
 	i32.const	$push2=, 32
 	i32.add 	$push3=, $1, $pop2
 	i32.const	$push0=, 44
@@ -439,27 +512,26 @@ main:                                   # @main
 	i32.store	0($pop19), $pop20
 	i32.const	$push21=, 164
 	i32.add 	$push22=, $1, $pop21
-	i32.const	$push37=, 0
-	i32.store	0($pop22), $pop37
+	i32.const	$push35=, 0
+	i32.store	0($pop22), $pop35
 	i32.const	$push23=, 5
 	i32.store	4($1), $pop23
+	i32.call	$0=, sort_pagelist@FUNCTION, $1
 	block   	
-	i32.call	$push36=, sort_pagelist@FUNCTION, $1
-	tee_local	$push35=, $0=, $pop36
 	i32.const	$push34=, 32
 	i32.add 	$push24=, $0, $pop34
 	i32.load	$push25=, 0($pop24)
-	i32.eq  	$push26=, $pop35, $pop25
-	br_if   	0, $pop26       # 0: down to label26
-# BB#1:                                 # %if.end
+	i32.eq  	$push26=, $0, $pop25
+	br_if   	0, $pop26       # 0: down to label37
+# %bb.1:                                # %if.end
 	i32.const	$push33=, 0
 	i32.const	$push31=, 224
 	i32.add 	$push32=, $1, $pop31
 	i32.store	__stack_pointer($pop33), $pop32
-	i32.const	$push40=, 0
-	return  	$pop40
+	i32.const	$push36=, 0
+	return  	$pop36
 .LBB1_2:                                # %if.then
-	end_block                       # label26:
+	end_block                       # label37:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -485,5 +557,5 @@ vx:
 	.size	vx, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33870.c.s b/test/torture-s/pr33870.c.s
index bad2b18a0..82bb26420 100644
--- a/test/torture-s/pr33870.c.s
+++ b/test/torture-s/pr33870.c.s
@@ -7,40 +7,42 @@
 sort_pagelist:                          # @sort_pagelist
 	.param  	i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push32=, 0
+	i32.load	$push31=, __stack_pointer($pop32)
+	i32.const	$push33=, 144
+	i32.sub 	$7=, $pop31, $pop33
+	i32.const	$push34=, 0
+	i32.store	__stack_pointer($pop34), $7
+	i32.const	$push54=, 0
 	i32.const	$push0=, 100
-	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	$push36=, 104
-	i32.add 	$push37=, $1, $pop36
-	i32.const	$push49=, 28
-	i32.add 	$2=, $pop37, $pop49
-	i32.const	$push8=, 96
-	i32.add 	$5=, $1, $pop8
+	i32.call	$1=, memset@FUNCTION, $7, $pop54, $pop0
+	i32.const	$7=, 0
+	block   	
+	i32.eqz 	$push85=, $0
+	br_if   	0, $pop85       # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push44=, 104
+	i32.add 	$push45=, $1, $pop44
+	i32.const	$push56=, 28
+	i32.add 	$3=, $pop45, $pop56
+	i32.const	$push46=, 104
+	i32.add 	$push47=, $1, $pop46
+	i32.const	$push55=, 28
+	i32.add 	$2=, $pop47, $pop55
+	i32.const	$push9=, 96
+	i32.add 	$5=, $1, $pop9
 .LBB0_2:                                # %while.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_3 Depth 2
                                         #       Child Loop BB0_6 Depth 3
-                                        #     Child Loop BB0_18 Depth 2
+                                        #     Child Loop BB0_21 Depth 2
 	loop    	                # label1:
-	copy_local	$push52=, $0
-	tee_local	$push51=, $3=, $pop52
-	i32.load	$0=, 28($pop51)
-	i32.const	$push50=, 0
-	i32.store	28($3), $pop50
+	copy_local	$7=, $0
+	i32.load	$0=, 28($7)
+	i32.const	$push57=, 0
+	i32.store	28($7), $pop57
 	i32.const	$6=, 0
 .LBB0_3:                                # %for.body
                                         #   Parent Loop BB0_2 Depth=1
@@ -51,305 +53,376 @@ sort_pagelist:                          # @sort_pagelist
 	block   	
 	block   	
 	block   	
-	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
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	loop    	                # label12:
+	i32.const	$push58=, 2
+	i32.shl 	$push1=, $6, $pop58
+	i32.add 	$4=, $1, $pop1
+	i32.load	$9=, 0($4)
+	i32.eqz 	$push86=, $9
+	br_if   	1, $pop86       # 1: down to label11
+# %bb.4:                                # %if.else
                                         #   in Loop: Header=BB0_3 Depth=2
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push101=, $3
-	br_if   	0, $pop101      # 0: down to label10
-# BB#5:                                 # %while.body.i.preheader
+	i32.eqz 	$push87=, $7
+	br_if   	0, $pop87       # 0: down to label15
+# %bb.5:                                # %while.body.i.preheader
                                         #   in Loop: Header=BB0_3 Depth=2
-	i32.const	$push44=, 104
-	i32.add 	$push45=, $1, $pop44
-	copy_local	$7=, $pop45
-	copy_local	$8=, $9
+	i32.const	$push52=, 104
+	i32.add 	$push53=, $1, $pop52
+	copy_local	$8=, $pop53
 .LBB0_6:                                # %while.body.i
                                         #   Parent Loop BB0_2 Depth=1
                                         #     Parent Loop BB0_3 Depth=2
                                         # =>    This Inner Loop Header: Depth=3
 	block   	
-	loop    	                # label12:
+	loop    	                # label17:
 	block   	
 	block   	
-	i32.load	$push3=, 0($8)
-	i32.load	$push2=, 0($3)
+	i32.load	$push3=, 0($9)
+	i32.load	$push2=, 0($7)
 	i32.ge_u	$push4=, $pop3, $pop2
-	br_if   	0, $pop4        # 0: down to label14
-# BB#7:                                 # %if.then.i
+	br_if   	0, $pop4        # 0: down to label19
+# %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
+	i32.const	$push59=, 28
+	i32.add 	$push6=, $8, $pop59
+	i32.store	0($pop6), $9
+	i32.load	$11=, 28($9)
+	copy_local	$10=, $7
+	copy_local	$8=, $9
+	br_if   	1, $11          # 1: down to label18
+	br      	3               # 3: down to label16
 .LBB0_8:                                # %if.else.i
                                         #   in Loop: Header=BB0_6 Depth=3
-	end_block                       # label14:
-	i32.const	$push63=, 28
-	i32.add 	$push5=, $7, $pop63
-	i32.store	0($pop5), $3
-	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
+	end_block                       # label19:
+	i32.const	$push60=, 28
+	i32.add 	$push5=, $8, $pop60
+	i32.store	0($pop5), $7
+	i32.load	$10=, 28($7)
+	copy_local	$11=, $9
+	copy_local	$8=, $7
+	i32.eqz 	$push88=, $11
+	br_if   	2, $pop88       # 2: down to label16
 .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
+	end_block                       # label18:
+	copy_local	$7=, $10
+	copy_local	$9=, $11
+	br_if   	0, $10          # 0: up to label17
+.LBB0_10:                               # %while.end.i
                                         #   in Loop: Header=BB0_3 Depth=2
 	end_loop
-	end_block                       # label11:
-	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.const	$push38=, 104
-	i32.add 	$push39=, $1, $pop38
-	copy_local	$7=, $pop39
-.LBB0_12:                               # %merge_pagelist.exit.thread
+	end_block                       # label16:
+	i32.const	$push61=, 28
+	i32.add 	$7=, $8, $pop61
+	i32.eqz 	$push89=, $11
+	br_if   	1, $pop89       # 1: down to label14
+# %bb.11:                               # %if.then7.i
                                         #   in Loop: Header=BB0_3 Depth=2
-	end_block                       # label9:
-	copy_local	$10=, $9
-.LBB0_13:                               # %for.cond
+	i32.store	0($7), $11
+	br      	2               # 2: down to label13
+.LBB0_12:                               #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label15:
+	copy_local	$push25=, $2
+	copy_local	$push26=, $9
+	i32.store	0($pop25), $pop26
+	br      	1               # 1: down to label13
+.LBB0_13:                               # %if.else9.i
                                         #   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
+	end_block                       # label14:
+	block   	
+	i32.eqz 	$push90=, $10
+	br_if   	0, $pop90       # 0: down to label20
+# %bb.14:                               # %if.then11.i
+                                        #   in Loop: Header=BB0_3 Depth=2
+	i32.store	0($7), $10
+	br      	1               # 1: down to label13
+.LBB0_15:                               # %if.else13.i
+                                        #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label20:
+	i32.const	$push62=, 0
+	i32.store	0($7), $pop62
+.LBB0_16:                               # %merge_pagelist.exit
+                                        #   in Loop: Header=BB0_3 Depth=2
+	end_block                       # label13:
+	i32.const	$push48=, 104
+	i32.add 	$push49=, $1, $pop48
+	i32.const	$push66=, 28
+	i32.add 	$9=, $pop49, $pop66
+	i32.load	$7=, 0($9)
+	i32.const	$push65=, 0
+	i32.store	0($4), $pop65
+	i32.const	$push64=, 1
+	i32.add 	$6=, $6, $pop64
+	i32.const	$push63=, 24
+	i32.lt_u	$push7=, $6, $pop63
+	br_if   	0, $pop7        # 0: up to label12
+# %bb.17:                               # %for.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
-	i32.const	$push72=, 24
-	i32.ne  	$push7=, $10, $pop72
-	br_if   	1, $pop7        # 1: down to label5
-# BB#15:                                # %if.then7
+	i32.const	$push67=, 24
+	i32.ne  	$push8=, $6, $pop67
+	br_if   	1, $pop8        # 1: down to label10
+# %bb.18:                               # %if.then7
                                         #   in Loop: Header=BB0_2 Depth=1
-	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
+	i32.load	$11=, 0($5)
+	i32.eqz 	$push91=, $7
+	br_if   	2, $pop91       # 2: down to label9
+# %bb.19:                               # %if.then7
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.eqz 	$push104=, $8
-	br_if   	2, $pop104      # 2: down to label4
-# BB#17:                                # %while.body.i81.preheader
+	i32.eqz 	$push92=, $11
+	br_if   	2, $pop92       # 2: down to label9
+# %bb.20:                               # %while.body.i86.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
+	i32.const	$push50=, 104
+	i32.add 	$push51=, $1, $pop50
+	copy_local	$6=, $pop51
+.LBB0_21:                               # %while.body.i86
                                         #   Parent Loop BB0_2 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label16:
+	loop    	                # label22:
 	block   	
 	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
-	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
+	i32.load	$push11=, 0($11)
+	i32.load	$push10=, 0($7)
+	i32.ge_u	$push12=, $pop11, $pop10
+	br_if   	0, $pop12       # 0: down to label24
+# %bb.22:                               # %if.then.i88
+                                        #   in Loop: Header=BB0_21 Depth=2
+	i32.const	$push68=, 28
+	i32.add 	$push14=, $6, $pop68
+	i32.store	0($pop14), $11
+	i32.load	$10=, 28($11)
 	copy_local	$8=, $7
-	br_if   	0, $10          # 0: up to label16
-.LBB0_22:                               # %merge_pagelist.exit99.loopexit
+	copy_local	$6=, $11
+	br_if   	1, $10          # 1: down to label23
+	br      	3               # 3: down to label21
+.LBB0_23:                               # %if.else.i90
+                                        #   in Loop: Header=BB0_21 Depth=2
+	end_block                       # label24:
+	i32.const	$push69=, 28
+	i32.add 	$push13=, $6, $pop69
+	i32.store	0($pop13), $7
+	i32.load	$8=, 28($7)
+	copy_local	$10=, $11
+	copy_local	$6=, $7
+	i32.eqz 	$push93=, $10
+	br_if   	2, $pop93       # 2: down to label21
+.LBB0_24:                               # %if.end.i96
+                                        #   in Loop: Header=BB0_21 Depth=2
+	end_block                       # label23:
+	copy_local	$7=, $8
+	copy_local	$11=, $10
+	br_if   	0, $8           # 0: up to label22
+.LBB0_25:                               # %while.end.i103.loopexit
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_loop
-	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
+	end_block                       # label21:
+	i32.const	$push70=, 28
+	i32.add 	$6=, $6, $pop70
+	i32.eqz 	$push94=, $10
+	br_if   	4, $pop94       # 4: down to label7
+# %bb.26:                               #   in Loop: Header=BB0_2 Depth=1
+	copy_local	$11=, $10
+	br      	3               # 3: down to label8
+.LBB0_27:                               # %for.end.thread
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label11:
+	i32.store	0($4), $7
+.LBB0_28:                               # %if.end11
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label10:
+	br_if   	8, $0           # 8: up to label1
+	br      	7               # 7: down to label2
+.LBB0_29:                               # %while.end.i103
+                                        #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label9:
+	copy_local	$6=, $3
+	i32.eqz 	$push95=, $11
+	br_if   	2, $pop95       # 2: down to label6
+.LBB0_30:                               # %if.then7.i104
                                         #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label8:
+	i32.store	0($6), $11
+	br      	4               # 4: down to label3
+.LBB0_31:                               #   in Loop: Header=BB0_2 Depth=1
+	end_block                       # label7:
+	i32.const	$push71=, 0
+	i32.ne  	$push28=, $8, $pop71
+	br_if   	1, $pop28       # 1: down to label5
+	br      	2               # 2: down to label4
+.LBB0_32:                               #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label6:
-	i32.store	0($4), $3
-.LBB0_24:                               # %if.end11
+	copy_local	$8=, $7
+	copy_local	$6=, $3
+	i32.const	$push73=, 0
+	i32.eq  	$push27=, $7, $pop73
+	br_if   	1, $pop27       # 1: down to label4
+.LBB0_33:                               # %if.then11.i106
                                         #   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_25:                               #   in Loop: Header=BB0_2 Depth=1
+	i32.store	0($6), $8
+	br      	1               # 1: down to label3
+.LBB0_34:                               # %if.else13.i107
+                                        #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label4:
-	copy_local	$6=, $2
-	copy_local	$7=, $8
-	copy_local	$10=, $3
-.LBB0_26:                               # %merge_pagelist.exit99
+	i32.const	$push72=, 0
+	i32.store	0($6), $pop72
+.LBB0_35:                               # %merge_pagelist.exit109
                                         #   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_27:                               # %while.end.loopexit
+.LBB0_36:                               # %while.end.loopexit
 	end_block                       # label2:
 	end_loop
-	i32.load	$3=, 0($1)
-.LBB0_28:                               # %while.end
+	i32.load	$7=, 0($1)
+.LBB0_37:                               # %while.end
 	end_block                       # label0:
-	i32.const	$push32=, 104
-	i32.add 	$push33=, $1, $pop32
-	i32.const	$push84=, 28
-	i32.add 	$0=, $pop33, $pop84
+	i32.const	$push38=, 104
+	i32.add 	$push39=, $1, $pop38
+	i32.const	$push74=, 28
+	i32.add 	$4=, $pop39, $pop74
 	i32.const	$6=, 1
-.LBB0_29:                               # %for.body15
+.LBB0_38:                               # %for.body15
                                         # =>This Loop Header: Depth=1
-                                        #     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
+                                        #     Child Loop BB0_41 Depth 2
+	loop    	                # label25:
+	i32.const	$push75=, 2
+	i32.shl 	$push16=, $6, $pop75
 	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
+	i32.load	$9=, 0($pop17)
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	block   	
+	i32.eqz 	$push96=, $7
+	br_if   	0, $pop96       # 0: down to label32
+# %bb.39:                               # %for.body15
+                                        #   in Loop: Header=BB0_38 Depth=1
+	i32.eqz 	$push97=, $9
+	br_if   	0, $pop97       # 0: down to label32
+# %bb.40:                               # %while.body.i51.preheader
+                                        #   in Loop: Header=BB0_38 Depth=1
+	i32.const	$push40=, 104
+	i32.add 	$push41=, $1, $pop40
+	copy_local	$8=, $pop41
+.LBB0_41:                               # %while.body.i51
+                                        #   Parent Loop BB0_38 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	block   	
-	loop    	                # label23:
+	loop    	                # label34:
 	block   	
 	block   	
-	i32.load	$push19=, 0($3)
-	i32.load	$push18=, 0($8)
+	i32.load	$push19=, 0($7)
+	i32.load	$push18=, 0($9)
 	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
-	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	$3=, $9
-	br_if   	0, $10          # 0: up to label23
-.LBB0_36:                               # %merge_pagelist.exit69.loopexit
-                                        #   in Loop: Header=BB0_29 Depth=1
+	br_if   	0, $pop20       # 0: down to label36
+# %bb.42:                               # %if.then.i53
+                                        #   in Loop: Header=BB0_41 Depth=2
+	i32.const	$push76=, 28
+	i32.add 	$push22=, $8, $pop76
+	i32.store	0($pop22), $7
+	i32.load	$11=, 28($7)
+	copy_local	$10=, $9
+	copy_local	$8=, $7
+	br_if   	1, $11          # 1: down to label35
+	br      	3               # 3: down to label33
+.LBB0_43:                               # %if.else.i55
+                                        #   in Loop: Header=BB0_41 Depth=2
+	end_block                       # label36:
+	i32.const	$push77=, 28
+	i32.add 	$push21=, $8, $pop77
+	i32.store	0($pop21), $9
+	i32.load	$10=, 28($9)
+	copy_local	$11=, $7
+	copy_local	$8=, $9
+	i32.eqz 	$push98=, $11
+	br_if   	2, $pop98       # 2: down to label33
+.LBB0_44:                               # %if.end.i61
+                                        #   in Loop: Header=BB0_41 Depth=2
+	end_block                       # label35:
+	copy_local	$9=, $10
+	copy_local	$7=, $11
+	br_if   	0, $10          # 0: up to label34
+.LBB0_45:                               # %while.end.i68.loopexit
+                                        #   in Loop: Header=BB0_38 Depth=1
 	end_loop
-	end_block                       # label22:
-	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:
-	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_block                       # label33:
+	i32.const	$push78=, 28
+	i32.add 	$8=, $8, $pop78
+	i32.eqz 	$push99=, $11
+	br_if   	2, $pop99       # 2: down to label30
+# %bb.46:                               #   in Loop: Header=BB0_38 Depth=1
+	copy_local	$7=, $11
+	br      	1               # 1: down to label31
+.LBB0_47:                               # %while.end.i68
+                                        #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label32:
+	copy_local	$8=, $4
+	i32.eqz 	$push100=, $7
+	br_if   	2, $pop100      # 2: down to label29
+.LBB0_48:                               # %if.then7.i69
+                                        #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label31:
+	i32.store	0($8), $7
+	br      	4               # 4: down to label26
+.LBB0_49:                               #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label30:
+	i32.const	$push79=, 0
+	i32.ne  	$push30=, $10, $pop79
+	br_if   	1, $pop30       # 1: down to label28
+	br      	2               # 2: down to label27
+.LBB0_50:                               #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label29:
+	copy_local	$10=, $9
+	copy_local	$8=, $4
+	i32.const	$push81=, 0
+	i32.eq  	$push29=, $9, $pop81
+	br_if   	1, $pop29       # 1: down to label27
+.LBB0_51:                               # %if.then11.i71
+                                        #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label28:
+	i32.store	0($8), $10
+	br      	1               # 1: down to label26
+.LBB0_52:                               # %if.else13.i72
+                                        #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label27:
+	i32.const	$push80=, 0
+	i32.store	0($8), $pop80
+.LBB0_53:                               # %merge_pagelist.exit74
+                                        #   in Loop: Header=BB0_38 Depth=1
+	end_block                       # label26:
+	i32.const	$push84=, 1
+	i32.add 	$6=, $6, $pop84
+	i32.const	$push42=, 104
+	i32.add 	$push43=, $1, $pop42
+	i32.const	$push83=, 28
+	i32.add 	$push24=, $pop43, $pop83
+	i32.load	$7=, 0($pop24)
+	i32.const	$push82=, 25
+	i32.ne  	$push23=, $6, $pop82
+	br_if   	0, $pop23       # 0: up to label25
+# %bb.54:                               # %for.end20
 	end_loop
-	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
+	i32.const	$push37=, 0
+	i32.const	$push35=, 144
+	i32.add 	$push36=, $1, $pop35
+	i32.store	__stack_pointer($pop37), $pop36
+	copy_local	$push101=, $7
+                                        # fallthrough-return: $pop101
 	.endfunc
 .Lfunc_end0:
 	.size	sort_pagelist, .Lfunc_end0-sort_pagelist
@@ -361,14 +434,13 @@ sort_pagelist:                          # @sort_pagelist
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
 	i32.const	$push19=, 0
 	i32.load	$push18=, __stack_pointer($pop19)
 	i32.const	$push20=, 208
-	i32.sub 	$push29=, $pop18, $pop20
-	tee_local	$push28=, $1=, $pop29
-	i32.store	__stack_pointer($pop21), $pop28
+	i32.sub 	$1=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $1
 	i32.const	$push2=, 68
 	i32.add 	$push3=, $1, $pop2
 	i32.const	$push0=, 80
@@ -381,8 +453,8 @@ main:                                   # @main
 	i32.store	0($pop7), $pop5
 	i32.const	$push8=, 148
 	i32.add 	$push9=, $1, $pop8
-	i32.const	$push27=, 0
-	i32.store	0($pop9), $pop27
+	i32.const	$push25=, 0
+	i32.store	0($pop9), $pop25
 	i32.const	$push10=, 5
 	i32.store	0($1), $pop10
 	i32.const	$push11=, 4
@@ -394,21 +466,20 @@ main:                                   # @main
 	i32.const	$push14=, 40
 	i32.add 	$push15=, $1, $pop14
 	i32.store	28($1), $pop15
+	i32.call	$0=, sort_pagelist@FUNCTION, $1
 	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 label26
-# BB#1:                                 # %if.end
+	i32.eq  	$push17=, $0, $pop16
+	br_if   	0, $pop17       # 0: down to label37
+# %bb.1:                                # %if.end
 	i32.const	$push24=, 0
 	i32.const	$push22=, 208
 	i32.add 	$push23=, $1, $pop22
 	i32.store	__stack_pointer($pop24), $pop23
-	i32.const	$push30=, 0
-	return  	$pop30
+	i32.const	$push26=, 0
+	return  	$pop26
 .LBB1_2:                                # %if.then
-	end_block                       # label26:
+	end_block                       # label37:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -416,5 +487,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr33992.c.s b/test/torture-s/pr33992.c.s
index 41eb0e077..e240044ed 100644
--- a/test/torture-s/pr33992.c.s
+++ b/test/torture-s/pr33992.c.s
@@ -6,12 +6,12 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.eqz 	$push0=, $0
 	i32.eqz 	$push1=, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,53 +28,55 @@ bar:                                    # @bar
 do_test:                                # @do_test
 	.param  	i32
 	.local  	i64, i64, i64, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$1=, 0($0)
-	i64.const	$4=, -4294967296
-	i64.const	$3=, 63
+	i64.const	$4=, 0
 .LBB1_1:                                # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i64.const	$push15=, 4294967296
-	i64.add 	$4=, $4, $pop15
+	i64.const	$push17=, -1
+	i64.add 	$2=, $4, $pop17
+	i64.const	$push16=, 63
+	i64.add 	$3=, $4, $pop16
+	copy_local	$4=, $2
+	i64.const	$push15=, 1
 	i64.const	$push14=, 4294967295
-	i64.and 	$2=, $3, $pop14
-	i64.const	$push13=, -1
-	i64.add 	$push0=, $3, $pop13
-	copy_local	$3=, $pop0
-	i64.const	$push12=, 1
-	i64.shl 	$push2=, $pop12, $2
-	i64.and 	$push3=, $pop2, $1
-	i64.eqz 	$push4=, $pop3
-	br_if   	0, $pop4        # 0: up to label1
-# BB#2:                                 # %foo.exit
+	i64.and 	$push0=, $3, $pop14
+	i64.shl 	$push1=, $pop15, $pop0
+	i64.and 	$push2=, $pop1, $1
+	i64.eqz 	$push3=, $pop2
+	br_if   	0, $pop3        # 0: up to label1
+# %bb.2:                                # %foo.exit
 	end_loop
-	i64.const	$push5=, 32
-	i64.shr_s	$push6=, $4, $pop5
-	call    	bar@FUNCTION, $pop6
+	i64.const	$push19=, -1
+	i64.xor 	$push4=, $2, $pop19
+	i64.const	$push18=, 4294967295
+	i64.and 	$push5=, $pop4, $pop18
+	call    	bar@FUNCTION, $pop5
 	i64.load	$1=, 0($0)
-	i64.const	$4=, -4294967296
-	i64.const	$3=, 63
+	i64.const	$4=, 0
 .LBB1_3:                                # %for.cond.i.1
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i64.const	$push19=, 4294967296
-	i64.add 	$4=, $4, $pop19
-	i64.const	$push18=, 4294967295
-	i64.and 	$2=, $3, $pop18
-	i64.const	$push17=, -1
-	i64.add 	$push1=, $3, $pop17
-	copy_local	$3=, $pop1
-	i64.const	$push16=, 1
-	i64.shl 	$push7=, $pop16, $2
+	i64.const	$push23=, -1
+	i64.add 	$2=, $4, $pop23
+	i64.const	$push22=, 63
+	i64.add 	$3=, $4, $pop22
+	copy_local	$4=, $2
+	i64.const	$push21=, 1
+	i64.const	$push20=, 4294967295
+	i64.and 	$push6=, $3, $pop20
+	i64.shl 	$push7=, $pop21, $pop6
 	i64.and 	$push8=, $pop7, $1
 	i64.eqz 	$push9=, $pop8
 	br_if   	0, $pop9        # 0: up to label2
-# BB#4:                                 # %foo.exit.1
+# %bb.4:                                # %foo.exit.1
 	end_loop
-	i64.const	$push10=, 32
-	i64.shr_s	$push11=, $4, $pop10
-	call    	bar@FUNCTION, $pop11
+	i64.const	$push10=, -1
+	i64.xor 	$push11=, $2, $pop10
+	i64.const	$push12=, 4294967295
+	i64.and 	$push13=, $pop11, $pop12
+	call    	bar@FUNCTION, $pop13
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -87,14 +89,13 @@ do_test:                                # @do_test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop2, $pop4
-	tee_local	$push11=, $0=, $pop12
-	i32.store	__stack_pointer($pop5), $pop11
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i64.const	$push0=, -9223372036854775807
 	i64.store	8($0), $pop0
 	i32.const	$push9=, 8
@@ -111,5 +112,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34070-1.c.s b/test/torture-s/pr34070-1.c.s
index a30e6feff..78b1be6cb 100644
--- a/test/torture-s/pr34070-1.c.s
+++ b/test/torture-s/pr34070-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.rem_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34070-2.c.s b/test/torture-s/pr34070-2.c.s
index 35a52b1be..eb7fb9a16 100644
--- a/test/torture-s/pr34070-2.c.s
+++ b/test/torture-s/pr34070-2.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $pop0, $1
 	i32.div_s	$push2=, $0, $pop1
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -30,4 +30,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34099-2.c.s b/test/torture-s/pr34099-2.c.s
index e67c3cdeb..61bd32c4f 100644
--- a/test/torture-s/pr34099-2.c.s
+++ b/test/torture-s/pr34099-2.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.eqz 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.eqz 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.eqz 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -49,7 +49,7 @@ test3:                                  # @test3
 test4:                                  # @test4
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.eqz 	$push1=, $0
 	i32.eqz 	$push0=, $1
 	i32.or  	$push2=, $pop1, $pop0
@@ -64,7 +64,7 @@ test4:                                  # @test4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end12
+# %bb.0:                                # %if.end12
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -72,4 +72,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34099.c.s b/test/torture-s/pr34099.c.s
index 574610183..058e52fba 100644
--- a/test/torture-s/pr34099.c.s
+++ b/test/torture-s/pr34099.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.eqz 	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -28,4 +28,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34130.c.s b/test/torture-s/pr34130.c.s
index 27777c678..e721ebc05 100644
--- a/test/torture-s/pr34130.c.s
+++ b/test/torture-s/pr34130.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.const	$push4=, -2
 	i32.add 	$push5=, $0, $pop4
@@ -30,7 +30,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -38,4 +38,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34154.c.s b/test/torture-s/pr34154.c.s
index 7cb4903c5..36592d40a 100644
--- a/test/torture-s/pr34154.c.s
+++ b/test/torture-s/pr34154.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 19
 	i32.const	$push4=, 20
 	i64.const	$push0=, -1000000000000000000
@@ -26,7 +26,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,4 +34,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34176.c.s b/test/torture-s/pr34176.c.s
index 300c177e4..b85c8d797 100644
--- a/test/torture-s/pr34176.c.s
+++ b/test/torture-s/pr34176.c.s
@@ -7,7 +7,7 @@
 hash_find_entry:                        # @hash_find_entry
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.store	0($0), $pop0
 	i32.const	$push1=, 0
@@ -24,21 +24,20 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, foo.count($pop6)
-	tee_local	$push4=, $1=, $pop5
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$1=, foo.count($pop5)
+	i32.const	$push4=, 0
 	i32.const	$push0=, 1
-	i32.add 	$push1=, $pop4, $pop0
-	i32.store	foo.count($pop7), $pop1
+	i32.add 	$push1=, $1, $pop0
+	i32.store	foo.count($pop4), $pop1
 	block   	
 	i32.const	$push3=, 1
 	i32.ge_s	$push2=, $1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push8=, 0
-	return  	$pop8
+# %bb.1:                                # %if.end
+	i32.const	$push6=, 0
+	return  	$pop6
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -54,14 +53,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push13=, $pop1, $pop3
-	tee_local	$push12=, $2=, $pop13
-	i32.store	__stack_pointer($pop4), $pop12
+	i32.sub 	$2=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $2
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $2, $pop8
 	i32.call	$drop=, hash_find_entry@FUNCTION, $pop9
@@ -73,18 +71,17 @@ main:                                   # @main
 	i32.call	$drop=, foo@FUNCTION, $0
 	i32.const	$1=, 0
 	block   	
-	i32.eqz 	$push18=, $0
-	br_if   	0, $pop18       # 0: down to label2
+	i32.eqz 	$push14=, $0
+	br_if   	0, $pop14       # 0: down to label2
 .LBB2_2:                                # %while.body
                                         #   Parent Loop BB2_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label3:
-	i32.const	$push17=, 8
-	i32.add 	$1=, $1, $pop17
-	i32.const	$push16=, -1
-	i32.add 	$push15=, $0, $pop16
-	tee_local	$push14=, $0=, $pop15
-	br_if   	0, $pop14       # 0: up to label3
+	i32.const	$push13=, 8
+	i32.add 	$1=, $1, $pop13
+	i32.const	$push12=, -1
+	i32.add 	$0=, $0, $pop12
+	br_if   	0, $0           # 0: up to label3
 .LBB2_3:                                # %cleanup.cont7
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
@@ -92,9 +89,9 @@ main:                                   # @main
 	i32.const	$push10=, 12
 	i32.add 	$push11=, $2, $pop10
 	i32.call	$drop=, hash_find_entry@FUNCTION, $pop11
-	i32.eqz 	$push19=, $1
-	br_if   	0, $pop19       # 0: up to label1
-# BB#4:                                 # %for.end
+	i32.eqz 	$push15=, $1
+	br_if   	0, $pop15       # 0: up to label1
+# %bb.4:                                # %for.end
 	end_loop
 	i32.const	$push7=, 0
 	i32.const	$push5=, 16
@@ -114,5 +111,5 @@ foo.count:
 	.size	foo.count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34415.c.s b/test/torture-s/pr34415.c.s
index 89718ed5d..f8ee5e709 100644
--- a/test/torture-s/pr34415.c.s
+++ b/test/torture-s/pr34415.c.s
@@ -8,52 +8,48 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-                                        # implicit-def: %vreg64
+# %bb.0:                                # %entry
+                                        # implicit-def: %64
 	i32.const	$4=, 1
 .LBB0_1:                                # %for.cond
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_4 Depth 2
 	loop    	i32             # label0:
-	copy_local	$push24=, $0
-	tee_local	$push23=, $1=, $pop24
-	copy_local	$5=, $pop23
+	copy_local	$1=, $0
+	i32.load8_s	$0=, 0($1)
+	i32.const	$push18=, -32
+	i32.add 	$push0=, $0, $pop18
+	i32.const	$push17=, -97
+	i32.add 	$push1=, $0, $pop17
+	i32.const	$push16=, 255
+	i32.and 	$push2=, $pop1, $pop16
+	i32.const	$push15=, 26
+	i32.lt_u	$push3=, $pop2, $pop15
+	i32.select	$2=, $pop0, $0, $pop3
+	copy_local	$5=, $1
 	block   	
-	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
+	i32.eq  	$push4=, $2, $pop14
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	block   	
-	i32.const	$push25=, 65
-	i32.ne  	$push5=, $2, $pop25
+	i32.const	$push19=, 65
+	i32.ne  	$push5=, $2, $pop19
 	br_if   	0, $pop5        # 0: down to label2
-# BB#3:                                 # %do.body.preheader
+# %bb.3:                                # %do.body.preheader
                                         #   in Loop: Header=BB0_1 Depth=1
 	copy_local	$0=, $1
 .LBB0_4:                                # %do.body
                                         #   Parent Loop BB0_1 Depth=1
                                         # =>  This Inner Loop Header: Depth=2
 	loop    	                # label3:
+	i32.const	$push21=, 1
+	i32.add 	$5=, $0, $pop21
 	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
+	copy_local	$0=, $5
+	i32.const	$push20=, 43
+	i32.eq  	$push6=, $2, $pop20
 	br_if   	0, $pop6        # 0: up to label3
 	br      	2               # 2: down to label1
 .LBB0_5:                                # %for.end
@@ -61,9 +57,9 @@ foo:                                    # @foo
 	end_block                       # label2:
 	block   	
 	i32.const	$push7=, 3
-	i32.lt_s	$push8=, $4, $pop7
+	i32.lt_u	$push8=, $4, $pop7
 	br_if   	0, $pop8        # 0: down to label4
-# BB#6:                                 # %land.lhs.true17
+# %bb.6:                                # %land.lhs.true17
 	i32.const	$push9=, 58
 	i32.eq  	$push10=, $0, $pop9
 	i32.select	$push11=, $3, $1, $pop10
@@ -92,7 +88,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	i32.const	$push2=, .L.str+2
@@ -109,4 +105,4 @@ main:                                   # @main
 	.size	.L.str, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr34456.c.s b/test/torture-s/pr34456.c.s
index aab58a093..ee9d11a38 100644
--- a/test/torture-s/pr34456.c.s
+++ b/test/torture-s/pr34456.c.s
@@ -6,7 +6,7 @@
 	.type	debug,@function
 debug:                                  # @debug
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ debug:                                  # @debug
 bad_compare:                            # @bad_compare
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.sub 	$push1=, $pop0, $0
                                         # fallthrough-return: $pop1
@@ -34,7 +34,7 @@ bad_compare:                            # @bad_compare
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, array
 	i32.const	$push2=, 2
 	i32.const	$push1=, 8
@@ -54,22 +54,21 @@ compare:                                # @compare
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($1)
 	i32.load	$2=, 4($0)
 	block   	
-	i32.load	$push8=, 0($1)
-	tee_local	$push7=, $1=, $pop8
-	i32.eqz 	$push10=, $pop7
-	br_if   	0, $pop10       # 0: down to label0
-# BB#1:                                 # %land.lhs.true
+	i32.eqz 	$push8=, $1
+	br_if   	0, $pop8        # 0: down to label0
+# %bb.1:                                # %land.lhs.true
 	i32.load	$push0=, 0($0)
 	i32.call_indirect	$push1=, $pop0, $2
-	i32.eqz 	$push11=, $pop1
-	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %if.then
+	i32.eqz 	$push9=, $pop1
+	br_if   	0, $pop9        # 0: down to label0
+# %bb.2:                                # %if.then
 	i32.const	$push2=, 0
-	i32.const	$push9=, 0
-	i32.load	$push3=, errors($pop9)
+	i32.const	$push7=, 0
+	i32.load	$push3=, errors($pop7)
 	i32.const	$push4=, 1
 	i32.add 	$push5=, $pop3, $pop4
 	i32.store	errors($pop2), $pop5
@@ -103,5 +102,5 @@ errors:
 	.size	errors, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5d5e75fb2..8df7dfbe5 100644
--- a/test/torture-s/pr34768-1.c.s
+++ b/test/torture-s/pr34768-1.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.const	$push3=, 0
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -36,7 +36,7 @@ test:                                   # @test
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$1=, x($pop3)
 	i32.const	$push1=, foo@FUNCTION
@@ -57,7 +57,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push0=, 1
 	i32.store	x($pop3), $pop0
@@ -65,7 +65,7 @@ main:                                   # @main
 	i32.const	$push2=, 1
 	i32.call	$push1=, test@FUNCTION, $pop2
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB3_2:                                # %if.then
@@ -86,5 +86,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34768-2.c.s b/test/torture-s/pr34768-2.c.s
index c11c5c5aa..4bcaf5432 100644
--- a/test/torture-s/pr34768-2.c.s
+++ b/test/torture-s/pr34768-2.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.const	$push4=, 0
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -39,7 +39,7 @@ bar:                                    # @bar
 test:                                   # @test
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push4=, x($pop3)
 	i32.const	$push1=, foo@FUNCTION
@@ -61,7 +61,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push0=, 1
 	i32.store	x($pop3), $pop0
@@ -69,7 +69,7 @@ main:                                   # @main
 	i32.const	$push2=, 1
 	i32.call	$push1=, test@FUNCTION, $pop2
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB3_2:                                # %if.then
@@ -90,5 +90,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34971.c.s b/test/torture-s/pr34971.c.s
index f5e7b761a..2bd30c563 100644
--- a/test/torture-s/pr34971.c.s
+++ b/test/torture-s/pr34971.c.s
@@ -7,21 +7,20 @@
 test1:                                  # @test1
 	.param  	i64
 	.local  	i64
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i64.load	$push1=, x($pop0)
 	i64.const	$push2=, 1099511627775
-	i64.and 	$push10=, $pop1, $pop2
-	tee_local	$push9=, $1=, $pop10
+	i64.and 	$1=, $pop1, $pop2
+	block   	
 	i64.const	$push5=, 8
-	i64.shl 	$push6=, $pop9, $pop5
+	i64.shl 	$push6=, $1, $pop5
 	i64.const	$push3=, 32
 	i64.shr_u	$push4=, $1, $pop3
 	i64.or  	$push7=, $pop6, $pop4
 	i64.ne  	$push8=, $pop7, $0
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -37,7 +36,7 @@ test1:                                  # @test1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then.i
+# %bb.0:                                # %if.then.i
 	i32.const	$push0=, 0
 	i32.const	$push6=, 0
 	i64.load	$push1=, x($pop6)
@@ -62,5 +61,5 @@ x:
 	.size	x, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr34982.c.s b/test/torture-s/pr34982.c.s
index be92ac5da..4b2cbe809 100644
--- a/test/torture-s/pr34982.c.s
+++ b/test/torture-s/pr34982.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr35163.c.s b/test/torture-s/pr35163.c.s
index 36cc3588e..e7c2d34c6 100644
--- a/test/torture-s/pr35163.c.s
+++ b/test/torture-s/pr35163.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr35231.c.s b/test/torture-s/pr35231.c.s
index b96b7436b..f4790ea7c 100644
--- a/test/torture-s/pr35231.c.s
+++ b/test/torture-s/pr35231.c.s
@@ -7,13 +7,13 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.or  	$push0=, $1, $0
 	i32.const	$push1=, 1
 	i32.eq  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,7 +29,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 2
 	i32.const	$push0=, 0
 	i32.call	$drop=, foo@FUNCTION, $pop1, $pop0
@@ -40,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr35390.c.s b/test/torture-s/pr35390.c.s
index 63b2ec7ea..5351e02af 100644
--- a/test/torture-s/pr35390.c.s
+++ b/test/torture-s/pr35390.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -28,4 +28,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr35456.c.s b/test/torture-s/pr35456.c.s
index be477c0f9..70fb5943e 100644
--- a/test/torture-s/pr35456.c.s
+++ b/test/torture-s/pr35456.c.s
@@ -7,7 +7,7 @@
 not_fabs:                               # @not_fabs
 	.param  	f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.neg 	$push2=, $0
 	f64.const	$push0=, 0x0p0
 	f64.ge  	$push1=, $0, $pop0
@@ -23,7 +23,7 @@ not_fabs:                               # @not_fabs
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, -0x0p0
 	f64.call	$push1=, not_fabs@FUNCTION, $pop0
@@ -31,7 +31,7 @@ main:                                   # @main
 	i64.const	$push3=, 0
 	i64.ge_s	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB1_2:                                # %if.then
@@ -43,5 +43,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr35472.c.s b/test/torture-s/pr35472.c.s
index 03ab73a10..6b5ca9711 100644
--- a/test/torture-s/pr35472.c.s
+++ b/test/torture-s/pr35472.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	p($pop0), $1
 	i32.const	$push1=, -1
@@ -22,145 +22,122 @@ foo:                                    # @foo
 	.type	test,@function
 test:                                   # @test
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push31=, 0
+# %bb.0:                                # %entry
 	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.sub 	$16=, $pop28, $pop30
+	i32.const	$push31=, 0
+	i32.store	__stack_pointer($pop31), $16
 	i32.const	$push35=, 64
 	i32.add 	$push36=, $16, $pop35
 	i32.const	$push0=, 56
-	i32.add 	$push123=, $pop36, $pop0
-	tee_local	$push122=, $0=, $pop123
+	i32.add 	$0=, $pop36, $pop0
 	i64.const	$push1=, 0
-	i64.store	0($pop122), $pop1
+	i64.store	0($0), $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.add 	$1=, $pop38, $pop2
+	i64.const	$push79=, 0
+	i64.store	0($1), $pop79
 	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.add 	$2=, $pop40, $pop3
+	i64.const	$push78=, 0
+	i64.store	0($2), $pop78
 	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.add 	$3=, $pop42, $pop4
+	i64.const	$push77=, 0
+	i64.store	0($3), $pop77
 	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.add 	$4=, $pop44, $pop5
+	i64.const	$push76=, 0
+	i64.store	0($4), $pop76
 	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.add 	$5=, $pop46, $pop6
+	i64.const	$push75=, 0
+	i64.store	0($5), $pop75
 	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
+	i32.add 	$6=, $pop48, $pop7
 	i64.const	$push74=, 0
-	i64.store	0($16), $pop74
+	i64.store	0($6), $pop74
+	i32.const	$push73=, 56
+	i32.add 	$7=, $16, $pop73
+	i64.const	$push72=, 0
+	i64.store	0($7), $pop72
+	i32.const	$push71=, 48
+	i32.add 	$8=, $16, $pop71
+	i64.const	$push70=, 0
+	i64.store	0($8), $pop70
+	i32.const	$push69=, 40
+	i32.add 	$9=, $16, $pop69
+	i64.const	$push68=, 0
+	i64.store	0($9), $pop68
+	i32.const	$push67=, 32
+	i32.add 	$10=, $16, $pop67
+	i64.const	$push66=, 0
+	i64.store	0($10), $pop66
+	i32.const	$push65=, 24
+	i32.add 	$11=, $16, $pop65
+	i64.const	$push64=, 0
+	i64.store	0($11), $pop64
+	i32.const	$push63=, 16
+	i32.add 	$12=, $16, $pop63
+	i64.const	$push62=, 0
+	i64.store	0($12), $pop62
+	i32.const	$push61=, 8
+	i32.add 	$13=, $16, $pop61
+	i64.const	$push60=, 0
+	i64.store	0($13), $pop60
+	i64.const	$push59=, 0
+	i64.store	64($16), $pop59
+	i64.const	$push58=, 0
+	i64.store	0($16), $pop58
 	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
+	i32.load	$14=, p($pop8)
 	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.store	0($14):p2align=2, $pop9
+	i32.const	$push57=, 56
+	i32.add 	$15=, $14, $pop57
 	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.store	0($15):p2align=2, $pop10
+	i32.const	$push56=, 48
+	i32.add 	$0=, $14, $pop56
 	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.store	0($0):p2align=2, $pop11
+	i32.const	$push55=, 40
+	i32.add 	$1=, $14, $pop55
 	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.store	0($1):p2align=2, $pop12
+	i32.const	$push54=, 32
+	i32.add 	$2=, $14, $pop54
 	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.store	0($2):p2align=2, $pop13
+	i32.const	$push53=, 24
+	i32.add 	$3=, $14, $pop53
 	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.store	0($3):p2align=2, $pop14
+	i32.const	$push52=, 16
+	i32.add 	$4=, $14, $pop52
 	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.store	0($4):p2align=2, $pop15
+	i32.const	$push51=, 8
+	i32.add 	$5=, $14, $pop51
 	i64.load	$push16=, 0($6)
-	i64.store	0($pop51):p2align=2, $pop16
+	i64.store	0($5):p2align=2, $pop16
 	i64.load	$push17=, 0($16)
 	i64.store	0($14):p2align=2, $pop17
 	i64.load	$push18=, 0($13)
@@ -182,7 +159,7 @@ test:                                   # @test
 	i32.const	$push25=, -1
 	i32.ne  	$push27=, $pop26, $pop25
 	br_if   	0, $pop27       # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push34=, 0
 	i32.const	$push32=, 128
 	i32.add 	$push33=, $16, $pop32
@@ -203,145 +180,122 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push30=, 0
+# %bb.0:                                # %entry
 	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.sub 	$16=, $pop27, $pop29
+	i32.const	$push30=, 0
+	i32.store	__stack_pointer($pop30), $16
 	i32.const	$push34=, 64
 	i32.add 	$push35=, $16, $pop34
 	i32.const	$push0=, 56
-	i32.add 	$push123=, $pop35, $pop0
-	tee_local	$push122=, $0=, $pop123
+	i32.add 	$0=, $pop35, $pop0
 	i64.const	$push1=, 0
-	i64.store	0($pop122), $pop1
+	i64.store	0($0), $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.add 	$1=, $pop37, $pop2
+	i64.const	$push79=, 0
+	i64.store	0($1), $pop79
 	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.add 	$2=, $pop39, $pop3
+	i64.const	$push78=, 0
+	i64.store	0($2), $pop78
 	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.add 	$3=, $pop41, $pop4
+	i64.const	$push77=, 0
+	i64.store	0($3), $pop77
 	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.add 	$4=, $pop43, $pop5
+	i64.const	$push76=, 0
+	i64.store	0($4), $pop76
 	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.add 	$5=, $pop45, $pop6
+	i64.const	$push75=, 0
+	i64.store	0($5), $pop75
 	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
+	i32.add 	$6=, $pop47, $pop7
 	i64.const	$push74=, 0
-	i64.store	0($16), $pop74
+	i64.store	0($6), $pop74
+	i32.const	$push73=, 56
+	i32.add 	$7=, $16, $pop73
+	i64.const	$push72=, 0
+	i64.store	0($7), $pop72
+	i32.const	$push71=, 48
+	i32.add 	$8=, $16, $pop71
+	i64.const	$push70=, 0
+	i64.store	0($8), $pop70
+	i32.const	$push69=, 40
+	i32.add 	$9=, $16, $pop69
+	i64.const	$push68=, 0
+	i64.store	0($9), $pop68
+	i32.const	$push67=, 32
+	i32.add 	$10=, $16, $pop67
+	i64.const	$push66=, 0
+	i64.store	0($10), $pop66
+	i32.const	$push65=, 24
+	i32.add 	$11=, $16, $pop65
+	i64.const	$push64=, 0
+	i64.store	0($11), $pop64
+	i32.const	$push63=, 16
+	i32.add 	$12=, $16, $pop63
+	i64.const	$push62=, 0
+	i64.store	0($12), $pop62
+	i32.const	$push61=, 8
+	i32.add 	$13=, $16, $pop61
+	i64.const	$push60=, 0
+	i64.store	0($13), $pop60
+	i64.const	$push59=, 0
+	i64.store	64($16), $pop59
+	i64.const	$push58=, 0
+	i64.store	0($16), $pop58
 	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
+	i32.const	$push57=, 0
+	i32.load	$14=, p($pop57)
 	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.store	0($14):p2align=2, $pop8
+	i32.const	$push56=, 56
+	i32.add 	$15=, $14, $pop56
 	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.store	0($15):p2align=2, $pop9
+	i32.const	$push55=, 48
+	i32.add 	$0=, $14, $pop55
 	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.store	0($0):p2align=2, $pop10
+	i32.const	$push54=, 40
+	i32.add 	$1=, $14, $pop54
 	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.store	0($1):p2align=2, $pop11
+	i32.const	$push53=, 32
+	i32.add 	$2=, $14, $pop53
 	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.store	0($2):p2align=2, $pop12
+	i32.const	$push52=, 24
+	i32.add 	$3=, $14, $pop52
 	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.store	0($3):p2align=2, $pop13
+	i32.const	$push51=, 16
+	i32.add 	$4=, $14, $pop51
 	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.store	0($4):p2align=2, $pop14
+	i32.const	$push50=, 8
+	i32.add 	$5=, $14, $pop50
 	i64.load	$push15=, 0($6)
-	i64.store	0($pop50):p2align=2, $pop15
+	i64.store	0($5):p2align=2, $pop15
 	i64.load	$push16=, 0($16)
 	i64.store	0($14):p2align=2, $pop16
 	i64.load	$push17=, 0($13)
@@ -363,13 +317,13 @@ main:                                   # @main
 	i32.const	$push24=, -1
 	i32.ne  	$push26=, $pop25, $pop24
 	br_if   	0, $pop26       # 0: down to label1
-# BB#1:                                 # %test.exit
+# %bb.1:                                # %test.exit
 	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
+	i32.const	$push80=, 0
+	return  	$pop80
 .LBB2_2:                                # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -388,5 +342,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr35800.c.s b/test/torture-s/pr35800.c.s
index 9f692be8e..b76eb2a84 100644
--- a/test/torture-s/pr35800.c.s
+++ b/test/torture-s/pr35800.c.s
@@ -8,22 +8,21 @@ stab_xcoff_builtin_type:                # @stab_xcoff_builtin_type
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 0
 	block   	
 	i32.const	$push0=, -34
 	i32.lt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
+	i32.const	$push2=, -2
+	i32.sub 	$0=, $pop2, $0
 	i32.const	$1=, .L.str
 	block   	
-	i32.const	$push2=, -2
-	i32.sub 	$push10=, $pop2, $0
-	tee_local	$push9=, $0=, $pop10
 	i32.const	$push3=, 32
-	i32.gt_u	$push4=, $pop9, $pop3
+	i32.gt_u	$push4=, $0, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %switch.lookup
+# %bb.2:                                # %switch.lookup
 	i32.const	$push5=, 2
 	i32.shl 	$push6=, $0, $pop5
 	i32.const	$push7=, .Lswitch.table.main
@@ -34,8 +33,8 @@ stab_xcoff_builtin_type:                # @stab_xcoff_builtin_type
 	i32.load8_s	$1=, 0($1)
 .LBB0_4:                                # %cleanup
 	end_block                       # label0:
-	copy_local	$push11=, $1
-                                        # fallthrough-return: $pop11
+	copy_local	$push9=, $1
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	stab_xcoff_builtin_type, .Lfunc_end0-stab_xcoff_builtin_type
@@ -47,45 +46,49 @@ stab_xcoff_builtin_type:                # @stab_xcoff_builtin_type
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %if.end12
-	i32.const	$2=, .Lswitch.table.main+8
-	i32.const	$1=, 2
-	i32.const	$0=, -3
+# %bb.0:                                # %if.end12
+	i32.const	$2=, -4
+	i32.const	$1=, 4
 .LBB1_1:                                # %if.end.i
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
+	i32.const	$push10=, 2147483646
+	i32.add 	$0=, $1, $pop10
 	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
+	i32.const	$push9=, 2147483647
+	i32.and 	$push0=, $0, $pop9
+	i32.const	$push8=, 32
+	i32.gt_u	$push1=, $pop0, $pop8
+	br_if   	0, $pop1        # 0: down to label4
+# %bb.2:                                # %switch.lookup
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.load	$3=, 0($2)
+	i32.const	$push12=, 2
+	i32.shl 	$push2=, $0, $pop12
+	i32.const	$push11=, .Lswitch.table.main
+	i32.add 	$push3=, $pop2, $pop11
+	i32.load	$3=, 0($pop3)
 .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#4:                                 # %for.cond
+	i32.load8_u	$push4=, 0($3)
+	i32.const	$push13=, 105
+	i32.ne  	$push5=, $pop4, $pop13
+	br_if   	1, $pop5        # 1: down to label2
+# %bb.4:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	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#5:                                 # %if.end21
+	i32.const	$push16=, -1
+	i32.add 	$2=, $2, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$1=, $1, $pop15
+	i32.const	$push14=, -34
+	i32.ge_u	$push6=, $2, $pop14
+	br_if   	0, $pop6        # 0: up to label3
+# %bb.5:                                # %if.end21
 	end_loop
-	i32.const	$push4=, 0
-	return  	$pop4
+	i32.const	$push7=, 0
+	return  	$pop7
 .LBB1_6:                                # %if.then16
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -150,5 +153,5 @@ main:                                   # @main
 	.size	.Lswitch.table.main, 132
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36034-1.c.s b/test/torture-s/pr36034-1.c.s
index 9a3488d99..85418b33c 100644
--- a/test/torture-s/pr36034-1.c.s
+++ b/test/torture-s/pr36034-1.c.s
@@ -5,7 +5,7 @@
 	.globl	test
 	.type	test,@function
 test:                                   # @test
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push89=, 0
 	i64.load	$push1=, x($pop89)
@@ -137,7 +137,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	test@FUNCTION
 	block   	
 	i32.const	$push62=, 0
@@ -145,181 +145,181 @@ main:                                   # @main
 	f64.const	$push61=, -0x1p0
 	f64.eq  	$push30=, $pop29, $pop61
 	br_if   	0, $pop30       # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push64=, 0
 	f64.load	$push0=, tmp+8($pop64)
 	f64.const	$push63=, -0x1p0
 	f64.eq  	$push31=, $pop0, $pop63
 	br_if   	0, $pop31       # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push66=, 0
 	f64.load	$push1=, tmp+16($pop66)
 	f64.const	$push65=, -0x1p0
 	f64.eq  	$push32=, $pop1, $pop65
 	br_if   	0, $pop32       # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push68=, 0
 	f64.load	$push2=, tmp+24($pop68)
 	f64.const	$push67=, -0x1p0
 	f64.eq  	$push33=, $pop2, $pop67
 	br_if   	0, $pop33       # 0: down to label0
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push70=, 0
 	f64.load	$push3=, tmp+32($pop70)
 	f64.const	$push69=, -0x1p0
 	f64.eq  	$push34=, $pop3, $pop69
 	br_if   	0, $pop34       # 0: down to label0
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.const	$push72=, 0
 	f64.load	$push4=, tmp+40($pop72)
 	f64.const	$push71=, -0x1p0
 	f64.eq  	$push35=, $pop4, $pop71
 	br_if   	0, $pop35       # 0: down to label0
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i32.const	$push74=, 0
 	f64.load	$push5=, tmp+48($pop74)
 	f64.const	$push73=, -0x1p0
 	f64.eq  	$push36=, $pop5, $pop73
 	br_if   	0, $pop36       # 0: down to label0
-# BB#7:                                 # %entry
+# %bb.7:                                # %entry
 	i32.const	$push76=, 0
 	f64.load	$push6=, tmp+56($pop76)
 	f64.const	$push75=, -0x1p0
 	f64.eq  	$push37=, $pop6, $pop75
 	br_if   	0, $pop37       # 0: down to label0
-# BB#8:                                 # %entry
+# %bb.8:                                # %entry
 	i32.const	$push78=, 0
 	f64.load	$push7=, tmp+64($pop78)
 	f64.const	$push77=, -0x1p0
 	f64.eq  	$push38=, $pop7, $pop77
 	br_if   	0, $pop38       # 0: down to label0
-# BB#9:                                 # %entry
+# %bb.9:                                # %entry
 	i32.const	$push80=, 0
 	f64.load	$push8=, tmp+72($pop80)
 	f64.const	$push79=, -0x1p0
 	f64.eq  	$push39=, $pop8, $pop79
 	br_if   	0, $pop39       # 0: down to label0
-# BB#10:                                # %entry
+# %bb.10:                               # %entry
 	i32.const	$push82=, 0
 	f64.load	$push9=, tmp+80($pop82)
 	f64.const	$push81=, -0x1p0
 	f64.eq  	$push40=, $pop9, $pop81
 	br_if   	0, $pop40       # 0: down to label0
-# BB#11:                                # %entry
+# %bb.11:                               # %entry
 	i32.const	$push84=, 0
 	f64.load	$push10=, tmp+88($pop84)
 	f64.const	$push83=, -0x1p0
 	f64.eq  	$push41=, $pop10, $pop83
 	br_if   	0, $pop41       # 0: down to label0
-# BB#12:                                # %entry
+# %bb.12:                               # %entry
 	i32.const	$push86=, 0
 	f64.load	$push11=, tmp+96($pop86)
 	f64.const	$push85=, -0x1p0
 	f64.eq  	$push42=, $pop11, $pop85
 	br_if   	0, $pop42       # 0: down to label0
-# BB#13:                                # %entry
+# %bb.13:                               # %entry
 	i32.const	$push88=, 0
 	f64.load	$push12=, tmp+104($pop88)
 	f64.const	$push87=, -0x1p0
 	f64.eq  	$push43=, $pop12, $pop87
 	br_if   	0, $pop43       # 0: down to label0
-# BB#14:                                # %entry
+# %bb.14:                               # %entry
 	i32.const	$push90=, 0
 	f64.load	$push13=, tmp+112($pop90)
 	f64.const	$push89=, -0x1p0
 	f64.eq  	$push44=, $pop13, $pop89
 	br_if   	0, $pop44       # 0: down to label0
-# BB#15:                                # %entry
+# %bb.15:                               # %entry
 	i32.const	$push92=, 0
 	f64.load	$push14=, tmp+120($pop92)
 	f64.const	$push91=, -0x1p0
 	f64.eq  	$push45=, $pop14, $pop91
 	br_if   	0, $pop45       # 0: down to label0
-# BB#16:                                # %entry
+# %bb.16:                               # %entry
 	i32.const	$push94=, 0
 	f64.load	$push15=, tmp+128($pop94)
 	f64.const	$push93=, -0x1p0
 	f64.eq  	$push46=, $pop15, $pop93
 	br_if   	0, $pop46       # 0: down to label0
-# BB#17:                                # %entry
+# %bb.17:                               # %entry
 	i32.const	$push96=, 0
 	f64.load	$push16=, tmp+136($pop96)
 	f64.const	$push95=, -0x1p0
 	f64.eq  	$push47=, $pop16, $pop95
 	br_if   	0, $pop47       # 0: down to label0
-# BB#18:                                # %entry
+# %bb.18:                               # %entry
 	i32.const	$push98=, 0
 	f64.load	$push17=, tmp+144($pop98)
 	f64.const	$push97=, -0x1p0
 	f64.eq  	$push48=, $pop17, $pop97
 	br_if   	0, $pop48       # 0: down to label0
-# BB#19:                                # %entry
+# %bb.19:                               # %entry
 	i32.const	$push100=, 0
 	f64.load	$push18=, tmp+152($pop100)
 	f64.const	$push99=, -0x1p0
 	f64.eq  	$push49=, $pop18, $pop99
 	br_if   	0, $pop49       # 0: down to label0
-# BB#20:                                # %entry
+# %bb.20:                               # %entry
 	i32.const	$push102=, 0
 	f64.load	$push19=, tmp+160($pop102)
 	f64.const	$push101=, -0x1p0
 	f64.eq  	$push50=, $pop19, $pop101
 	br_if   	0, $pop50       # 0: down to label0
-# BB#21:                                # %entry
+# %bb.21:                               # %entry
 	i32.const	$push104=, 0
 	f64.load	$push20=, tmp+168($pop104)
 	f64.const	$push103=, -0x1p0
 	f64.eq  	$push51=, $pop20, $pop103
 	br_if   	0, $pop51       # 0: down to label0
-# BB#22:                                # %entry
+# %bb.22:                               # %entry
 	i32.const	$push106=, 0
 	f64.load	$push21=, tmp+176($pop106)
 	f64.const	$push105=, -0x1p0
 	f64.eq  	$push52=, $pop21, $pop105
 	br_if   	0, $pop52       # 0: down to label0
-# BB#23:                                # %entry
+# %bb.23:                               # %entry
 	i32.const	$push108=, 0
 	f64.load	$push22=, tmp+184($pop108)
 	f64.const	$push107=, -0x1p0
 	f64.eq  	$push53=, $pop22, $pop107
 	br_if   	0, $pop53       # 0: down to label0
-# BB#24:                                # %entry
+# %bb.24:                               # %entry
 	i32.const	$push110=, 0
 	f64.load	$push23=, tmp+192($pop110)
 	f64.const	$push109=, -0x1p0
 	f64.eq  	$push54=, $pop23, $pop109
 	br_if   	0, $pop54       # 0: down to label0
-# BB#25:                                # %entry
+# %bb.25:                               # %entry
 	i32.const	$push112=, 0
 	f64.load	$push24=, tmp+200($pop112)
 	f64.const	$push111=, -0x1p0
 	f64.eq  	$push55=, $pop24, $pop111
 	br_if   	0, $pop55       # 0: down to label0
-# BB#26:                                # %entry
+# %bb.26:                               # %entry
 	i32.const	$push114=, 0
 	f64.load	$push25=, tmp+208($pop114)
 	f64.const	$push113=, -0x1p0
 	f64.eq  	$push56=, $pop25, $pop113
 	br_if   	0, $pop56       # 0: down to label0
-# BB#27:                                # %entry
+# %bb.27:                               # %entry
 	i32.const	$push116=, 0
 	f64.load	$push26=, tmp+216($pop116)
 	f64.const	$push115=, -0x1p0
 	f64.eq  	$push57=, $pop26, $pop115
 	br_if   	0, $pop57       # 0: down to label0
-# BB#28:                                # %entry
+# %bb.28:                               # %entry
 	i32.const	$push118=, 0
 	f64.load	$push27=, tmp+224($pop118)
 	f64.const	$push117=, -0x1p0
 	f64.eq  	$push58=, $pop27, $pop117
 	br_if   	0, $pop58       # 0: down to label0
-# BB#29:                                # %entry
+# %bb.29:                               # %entry
 	i32.const	$push120=, 0
 	f64.load	$push28=, tmp+232($pop120)
 	f64.const	$push119=, -0x1p0
 	f64.eq  	$push59=, $pop28, $pop119
 	br_if   	0, $pop59       # 0: down to label0
-# BB#30:                                # %for.cond1.5.4
+# %bb.30:                               # %for.cond1.5.4
 	i32.const	$push60=, 0
 	return  	$pop60
 .LBB1_31:                               # %if.then
@@ -398,5 +398,5 @@ tmp:
 	.size	tmp, 240
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36034-2.c.s b/test/torture-s/pr36034-2.c.s
index 2da2a0a25..7a8ec6684 100644
--- a/test/torture-s/pr36034-2.c.s
+++ b/test/torture-s/pr36034-2.c.s
@@ -5,7 +5,7 @@
 	.globl	test
 	.type	test,@function
 test:                                   # @test
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push89=, 0
 	i64.load	$push1=, x($pop89)
@@ -137,7 +137,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	test@FUNCTION
 	block   	
 	i32.const	$push62=, 0
@@ -145,181 +145,181 @@ main:                                   # @main
 	f64.const	$push61=, -0x1p0
 	f64.eq  	$push30=, $pop29, $pop61
 	br_if   	0, $pop30       # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push64=, 0
 	f64.load	$push0=, tmp+8($pop64)
 	f64.const	$push63=, -0x1p0
 	f64.eq  	$push31=, $pop0, $pop63
 	br_if   	0, $pop31       # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push66=, 0
 	f64.load	$push1=, tmp+16($pop66)
 	f64.const	$push65=, -0x1p0
 	f64.eq  	$push32=, $pop1, $pop65
 	br_if   	0, $pop32       # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.const	$push68=, 0
 	f64.load	$push2=, tmp+24($pop68)
 	f64.const	$push67=, -0x1p0
 	f64.eq  	$push33=, $pop2, $pop67
 	br_if   	0, $pop33       # 0: down to label0
-# BB#4:                                 # %entry
+# %bb.4:                                # %entry
 	i32.const	$push70=, 0
 	f64.load	$push3=, tmp+32($pop70)
 	f64.const	$push69=, -0x1p0
 	f64.eq  	$push34=, $pop3, $pop69
 	br_if   	0, $pop34       # 0: down to label0
-# BB#5:                                 # %entry
+# %bb.5:                                # %entry
 	i32.const	$push72=, 0
 	f64.load	$push4=, tmp+40($pop72)
 	f64.const	$push71=, -0x1p0
 	f64.eq  	$push35=, $pop4, $pop71
 	br_if   	0, $pop35       # 0: down to label0
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i32.const	$push74=, 0
 	f64.load	$push5=, tmp+48($pop74)
 	f64.const	$push73=, -0x1p0
 	f64.eq  	$push36=, $pop5, $pop73
 	br_if   	0, $pop36       # 0: down to label0
-# BB#7:                                 # %entry
+# %bb.7:                                # %entry
 	i32.const	$push76=, 0
 	f64.load	$push6=, tmp+56($pop76)
 	f64.const	$push75=, -0x1p0
 	f64.eq  	$push37=, $pop6, $pop75
 	br_if   	0, $pop37       # 0: down to label0
-# BB#8:                                 # %entry
+# %bb.8:                                # %entry
 	i32.const	$push78=, 0
 	f64.load	$push7=, tmp+64($pop78)
 	f64.const	$push77=, -0x1p0
 	f64.eq  	$push38=, $pop7, $pop77
 	br_if   	0, $pop38       # 0: down to label0
-# BB#9:                                 # %entry
+# %bb.9:                                # %entry
 	i32.const	$push80=, 0
 	f64.load	$push8=, tmp+72($pop80)
 	f64.const	$push79=, -0x1p0
 	f64.eq  	$push39=, $pop8, $pop79
 	br_if   	0, $pop39       # 0: down to label0
-# BB#10:                                # %entry
+# %bb.10:                               # %entry
 	i32.const	$push82=, 0
 	f64.load	$push9=, tmp+80($pop82)
 	f64.const	$push81=, -0x1p0
 	f64.eq  	$push40=, $pop9, $pop81
 	br_if   	0, $pop40       # 0: down to label0
-# BB#11:                                # %entry
+# %bb.11:                               # %entry
 	i32.const	$push84=, 0
 	f64.load	$push10=, tmp+88($pop84)
 	f64.const	$push83=, -0x1p0
 	f64.eq  	$push41=, $pop10, $pop83
 	br_if   	0, $pop41       # 0: down to label0
-# BB#12:                                # %entry
+# %bb.12:                               # %entry
 	i32.const	$push86=, 0
 	f64.load	$push11=, tmp+96($pop86)
 	f64.const	$push85=, -0x1p0
 	f64.eq  	$push42=, $pop11, $pop85
 	br_if   	0, $pop42       # 0: down to label0
-# BB#13:                                # %entry
+# %bb.13:                               # %entry
 	i32.const	$push88=, 0
 	f64.load	$push12=, tmp+104($pop88)
 	f64.const	$push87=, -0x1p0
 	f64.eq  	$push43=, $pop12, $pop87
 	br_if   	0, $pop43       # 0: down to label0
-# BB#14:                                # %entry
+# %bb.14:                               # %entry
 	i32.const	$push90=, 0
 	f64.load	$push13=, tmp+112($pop90)
 	f64.const	$push89=, -0x1p0
 	f64.eq  	$push44=, $pop13, $pop89
 	br_if   	0, $pop44       # 0: down to label0
-# BB#15:                                # %entry
+# %bb.15:                               # %entry
 	i32.const	$push92=, 0
 	f64.load	$push14=, tmp+120($pop92)
 	f64.const	$push91=, -0x1p0
 	f64.eq  	$push45=, $pop14, $pop91
 	br_if   	0, $pop45       # 0: down to label0
-# BB#16:                                # %entry
+# %bb.16:                               # %entry
 	i32.const	$push94=, 0
 	f64.load	$push15=, tmp+128($pop94)
 	f64.const	$push93=, -0x1p0
 	f64.eq  	$push46=, $pop15, $pop93
 	br_if   	0, $pop46       # 0: down to label0
-# BB#17:                                # %entry
+# %bb.17:                               # %entry
 	i32.const	$push96=, 0
 	f64.load	$push16=, tmp+136($pop96)
 	f64.const	$push95=, -0x1p0
 	f64.eq  	$push47=, $pop16, $pop95
 	br_if   	0, $pop47       # 0: down to label0
-# BB#18:                                # %entry
+# %bb.18:                               # %entry
 	i32.const	$push98=, 0
 	f64.load	$push17=, tmp+144($pop98)
 	f64.const	$push97=, -0x1p0
 	f64.eq  	$push48=, $pop17, $pop97
 	br_if   	0, $pop48       # 0: down to label0
-# BB#19:                                # %entry
+# %bb.19:                               # %entry
 	i32.const	$push100=, 0
 	f64.load	$push18=, tmp+152($pop100)
 	f64.const	$push99=, -0x1p0
 	f64.eq  	$push49=, $pop18, $pop99
 	br_if   	0, $pop49       # 0: down to label0
-# BB#20:                                # %entry
+# %bb.20:                               # %entry
 	i32.const	$push102=, 0
 	f64.load	$push19=, tmp+160($pop102)
 	f64.const	$push101=, -0x1p0
 	f64.eq  	$push50=, $pop19, $pop101
 	br_if   	0, $pop50       # 0: down to label0
-# BB#21:                                # %entry
+# %bb.21:                               # %entry
 	i32.const	$push104=, 0
 	f64.load	$push20=, tmp+168($pop104)
 	f64.const	$push103=, -0x1p0
 	f64.eq  	$push51=, $pop20, $pop103
 	br_if   	0, $pop51       # 0: down to label0
-# BB#22:                                # %entry
+# %bb.22:                               # %entry
 	i32.const	$push106=, 0
 	f64.load	$push21=, tmp+176($pop106)
 	f64.const	$push105=, -0x1p0
 	f64.eq  	$push52=, $pop21, $pop105
 	br_if   	0, $pop52       # 0: down to label0
-# BB#23:                                # %entry
+# %bb.23:                               # %entry
 	i32.const	$push108=, 0
 	f64.load	$push22=, tmp+184($pop108)
 	f64.const	$push107=, -0x1p0
 	f64.eq  	$push53=, $pop22, $pop107
 	br_if   	0, $pop53       # 0: down to label0
-# BB#24:                                # %entry
+# %bb.24:                               # %entry
 	i32.const	$push110=, 0
 	f64.load	$push23=, tmp+192($pop110)
 	f64.const	$push109=, -0x1p0
 	f64.eq  	$push54=, $pop23, $pop109
 	br_if   	0, $pop54       # 0: down to label0
-# BB#25:                                # %entry
+# %bb.25:                               # %entry
 	i32.const	$push112=, 0
 	f64.load	$push24=, tmp+200($pop112)
 	f64.const	$push111=, -0x1p0
 	f64.eq  	$push55=, $pop24, $pop111
 	br_if   	0, $pop55       # 0: down to label0
-# BB#26:                                # %entry
+# %bb.26:                               # %entry
 	i32.const	$push114=, 0
 	f64.load	$push25=, tmp+208($pop114)
 	f64.const	$push113=, -0x1p0
 	f64.eq  	$push56=, $pop25, $pop113
 	br_if   	0, $pop56       # 0: down to label0
-# BB#27:                                # %entry
+# %bb.27:                               # %entry
 	i32.const	$push116=, 0
 	f64.load	$push26=, tmp+216($pop116)
 	f64.const	$push115=, -0x1p0
 	f64.eq  	$push57=, $pop26, $pop115
 	br_if   	0, $pop57       # 0: down to label0
-# BB#28:                                # %entry
+# %bb.28:                               # %entry
 	i32.const	$push118=, 0
 	f64.load	$push27=, tmp+224($pop118)
 	f64.const	$push117=, -0x1p0
 	f64.eq  	$push58=, $pop27, $pop117
 	br_if   	0, $pop58       # 0: down to label0
-# BB#29:                                # %entry
+# %bb.29:                               # %entry
 	i32.const	$push120=, 0
 	f64.load	$push28=, tmp+232($pop120)
 	f64.const	$push119=, -0x1p0
 	f64.eq  	$push59=, $pop28, $pop119
 	br_if   	0, $pop59       # 0: down to label0
-# BB#30:                                # %for.cond1.5.4
+# %bb.30:                               # %for.cond1.5.4
 	i32.const	$push60=, 0
 	return  	$pop60
 .LBB1_31:                               # %if.then
@@ -398,5 +398,5 @@ tmp:
 	.size	tmp, 240
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36038.c.s b/test/torture-s/pr36038.c.s
index d3460ac04..a34b56dae 100644
--- a/test/torture-s/pr36038.c.s
+++ b/test/torture-s/pr36038.c.s
@@ -6,30 +6,28 @@
 	.type	doit,@function
 doit:                                   # @doit
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	block   	
-	i32.const	$push19=, 0
-	i32.load	$push18=, markstack_ptr($pop19)
-	tee_local	$push17=, $0=, $pop18
+# %bb.0:                                # %entry
+	i32.const	$push15=, 0
+	i32.load	$0=, markstack_ptr($pop15)
 	i32.const	$push2=, -4
-	i32.add 	$push3=, $pop17, $pop2
-	i32.load	$push16=, 0($pop3)
-	tee_local	$push15=, $1=, $pop16
+	i32.add 	$push3=, $0, $pop2
+	i32.load	$1=, 0($pop3)
+	block   	
 	i32.const	$push4=, 6
-	i32.eq  	$push5=, $pop15, $pop4
+	i32.eq  	$push5=, $1, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push22=, 0
-	i32.load	$push0=, stack_base($pop22)
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push18=, 0
+	i32.load	$push0=, stack_base($pop18)
 	i32.const	$push1=, 40
 	i32.add 	$2=, $pop0, $pop1
-	i32.const	$push21=, -8
-	i32.add 	$push8=, $0, $pop21
+	i32.const	$push17=, -8
+	i32.add 	$push8=, $0, $pop17
 	i32.load	$push9=, 0($pop8)
 	i32.const	$push6=, 3
 	i32.shl 	$push10=, $pop9, $pop6
-	i32.const	$push20=, 3
-	i32.shl 	$push7=, $1, $pop20
+	i32.const	$push16=, 3
+	i32.shl 	$push7=, $1, $pop16
 	i32.sub 	$0=, $pop10, $pop7
 	i32.const	$push11=, -6
 	i32.add 	$1=, $1, $pop11
@@ -37,16 +35,15 @@ doit:                                   # @doit
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.add 	$push12=, $2, $0
-	i32.const	$push27=, 16
-	i32.add 	$push13=, $pop12, $pop27
+	i32.const	$push21=, 16
+	i32.add 	$push13=, $pop12, $pop21
 	i64.load	$push14=, 0($2)
 	i64.store	0($pop13), $pop14
-	i32.const	$push26=, -8
-	i32.add 	$2=, $2, $pop26
-	i32.const	$push25=, 1
-	i32.add 	$push24=, $1, $pop25
-	tee_local	$push23=, $1=, $pop24
-	br_if   	0, $pop23       # 0: up to label1
+	i32.const	$push20=, 1
+	i32.add 	$1=, $1, $pop20
+	i32.const	$push19=, -8
+	i32.add 	$2=, $2, $pop19
+	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %while.end
 	end_loop
 	end_block                       # label0:
@@ -61,7 +58,7 @@ doit:                                   # @doit
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push29=, 0
 	i64.const	$push0=, 1
 	i64.store	list+8($pop29), $pop0
@@ -107,7 +104,7 @@ main:                                   # @main
 	i32.const	$push12=, 80
 	i32.call	$push15=, memcmp@FUNCTION, $pop14, $pop13, $pop12
 	br_if   	0, $pop15       # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push30=, 0
 	return  	$pop30
 .LBB1_2:                                # %if.then
@@ -173,6 +170,6 @@ indices:
 	.size	indices, 40
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 74b145d26..f6423bf34 100644
--- a/test/torture-s/pr36077.c.s
+++ b/test/torture-s/pr36077.c.s
@@ -7,7 +7,7 @@
 test:                                   # @test
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -28,4 +28,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr36093.c.s b/test/torture-s/pr36093.c.s
index c0359489d..5a042db70 100644
--- a/test/torture-s/pr36093.c.s
+++ b/test/torture-s/pr36093.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push2=, foo
 	i32.const	$push1=, 97
 	i32.const	$push0=, 129
@@ -39,4 +39,4 @@ foo:
 	.size	foo, 2560
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr36321.c.s b/test/torture-s/pr36321.c.s
index 3f7715618..e41093614 100644
--- a/test/torture-s/pr36321.c.s
+++ b/test/torture-s/pr36321.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -19,7 +19,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$drop=, argp($pop0)
 	i32.const	$push1=, 0
@@ -42,4 +42,4 @@ argp:
 	.size	.L.str, 10
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr36339.c.s b/test/torture-s/pr36339.c.s
index ee11dfba4..89341e823 100644
--- a/test/torture-s/pr36339.c.s
+++ b/test/torture-s/pr36339.c.s
@@ -8,14 +8,13 @@ try_a:                                  # @try_a
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push13=, $pop3, $pop5
-	tee_local	$push12=, $1=, $pop13
-	i32.store	__stack_pointer($pop6), $pop12
+	i32.sub 	$1=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $1
 	i32.const	$push0=, 0
 	i32.store	12($1), $pop0
 	i32.store	8($1), $0
@@ -28,8 +27,8 @@ try_a:                                  # @try_a
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $1, $pop7
 	i32.store	__stack_pointer($pop9), $pop8
-	copy_local	$push14=, $0
-                                        # fallthrough-return: $pop14
+	copy_local	$push12=, $0
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end0:
 	.size	try_a, .Lfunc_end0-try_a
@@ -41,7 +40,7 @@ try_a:                                  # @try_a
 check_a:                                # @check_a
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push6=, -1
@@ -50,7 +49,7 @@ check_a:                                # @check_a
 	i32.const	$push2=, 42
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %land.lhs.true
+# %bb.1:                                # %land.lhs.true
 	i32.load	$push4=, 3($0)
 	i32.eqz 	$push8=, $pop4
 	br_if   	1, $pop8        # 1: down to label0
@@ -72,14 +71,14 @@ check_a:                                # @check_a
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 42
 	i32.call	$push1=, try_a@FUNCTION, $pop0
 	i32.const	$push2=, -1
 	i32.le_s	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB2_2:                                # %if.then
@@ -91,5 +90,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36343.c.s b/test/torture-s/pr36343.c.s
index 7929193c9..566c78f6c 100644
--- a/test/torture-s/pr36343.c.s
+++ b/test/torture-s/pr36343.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
                                         # fallthrough-return
@@ -22,14 +22,13 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	f32
 	.local  	i32, f32, i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push18=, $pop4, $pop6
-	tee_local	$push17=, $3=, $pop18
-	i32.store	__stack_pointer($pop7), $pop17
+	i32.sub 	$3=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $3
 	i32.const	$push0=, 0
 	i32.store	12($3), $pop0
 	i32.const	$push1=, 1065353216
@@ -38,14 +37,13 @@ foo:                                    # @foo
 	i32.add 	$push12=, $3, $pop11
 	i32.const	$push13=, 8
 	i32.add 	$push14=, $3, $pop13
-	i32.select	$push16=, $pop12, $pop14, $0
-	tee_local	$push15=, $1=, $pop16
-	call    	bar@FUNCTION, $pop15
+	i32.select	$1=, $pop12, $pop14, $0
+	call    	bar@FUNCTION, $1
 	block   	
 	block   	
-	i32.eqz 	$push19=, $0
-	br_if   	0, $pop19       # 0: down to label1
-# BB#1:                                 # %if.then2
+	i32.eqz 	$push15=, $0
+	br_if   	0, $pop15       # 0: down to label1
+# %bb.1:                                # %if.then2
 	i32.load	$push2=, 0($1)
 	i32.load	$push3=, 0($pop2)
 	f32.convert_s/i32	$2=, $pop3
@@ -59,8 +57,8 @@ foo:                                    # @foo
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $3, $pop8
 	i32.store	__stack_pointer($pop10), $pop9
-	copy_local	$push20=, $2
-                                        # fallthrough-return: $pop20
+	copy_local	$push16=, $2
+                                        # fallthrough-return: $pop16
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -71,14 +69,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	f32.call	$push0=, foo@FUNCTION, $pop3
 	f32.const	$push1=, 0x0p0
 	f32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB2_2:                                # %if.then
@@ -90,5 +88,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr36691.c.s b/test/torture-s/pr36691.c.s
index 4b1f361c2..2d459b88f 100644
--- a/test/torture-s/pr36691.c.s
+++ b/test/torture-s/pr36691.c.s
@@ -5,7 +5,7 @@
 	.globl	func_1
 	.type	func_1,@function
 func_1:                                 # @func_1
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push1=, 0
 	i32.store8	g_5($pop0), $pop1
@@ -20,7 +20,7 @@ func_1:                                 # @func_1
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store8	g_5($pop0), $pop2
@@ -39,4 +39,4 @@ g_5:
 	.size	g_5, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr36765.c.s b/test/torture-s/pr36765.c.s
index dc45b565a..45c730b16 100644
--- a/test/torture-s/pr36765.c.s
+++ b/test/torture-s/pr36765.c.s
@@ -8,12 +8,11 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
-	i32.call	$push8=, __builtin_malloc@FUNCTION, $pop0
-	tee_local	$push7=, $1=, $pop8
+	i32.call	$1=, __builtin_malloc@FUNCTION, $pop0
 	i32.const	$push1=, 0
-	i32.store	0($pop7), $pop1
+	i32.store	0($1), $pop1
 	i32.const	$push2=, 2
 	i32.shl 	$push3=, $0, $pop2
 	i32.add 	$push4=, $1, $pop3
@@ -31,14 +30,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.call	$push0=, foo@FUNCTION, $pop3
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -50,6 +49,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	__builtin_malloc, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr37102.c.s b/test/torture-s/pr37102.c.s
index 4cd6203ff..6a5db708e 100644
--- a/test/torture-s/pr37102.c.s
+++ b/test/torture-s/pr37102.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 5
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,7 +28,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$0=, b($pop9)
 	block   	
@@ -36,7 +36,7 @@ main:                                   # @main
 	i32.load	$push0=, c($pop8)
 	i32.eqz 	$push14=, $pop0
 	br_if   	0, $pop14       # 0: down to label1
-# BB#1:                                 # %if.then.3
+# %bb.1:                                # %if.then.3
 	i32.const	$push10=, 0
 	i32.store	a($pop10), $0
 .LBB1_2:                                # %for.inc.3
@@ -86,5 +86,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr37125.c.s b/test/torture-s/pr37125.c.s
index 24f45f5d4..3e30e55b6 100644
--- a/test/torture-s/pr37125.c.s
+++ b/test/torture-s/pr37125.c.s
@@ -6,19 +6,18 @@
 	.type	func_44,@function
 func_44:                                # @func_44
 	.param  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, -9
-	i32.mul 	$push7=, $0, $pop0
-	tee_local	$push6=, $0=, $pop7
+	i32.mul 	$0=, $0, $pop0
+	block   	
 	i32.const	$push2=, 9
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push5=, -9
 	i32.lt_u	$push1=, $0, $pop5
-	i32.select	$push4=, $pop6, $pop3, $pop1
-	i32.eqz 	$push8=, $pop4
-	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.end
+	i32.select	$push4=, $0, $pop3, $pop1
+	i32.eqz 	$push6=, $pop4
+	br_if   	0, $pop6        # 0: down to label0
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -34,7 +33,7 @@ func_44:                                # @func_44
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -42,5 +41,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr37573.c.s b/test/torture-s/pr37573.c.s
index a5294bdc8..3e0bd2f66 100644
--- a/test/torture-s/pr37573.c.s
+++ b/test/torture-s/pr37573.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	bar@FUNCTION
 	block   	
 	i32.const	$push2=, p
@@ -14,7 +14,7 @@ main:                                   # @main
 	i32.const	$push0=, 23
 	i32.call	$push3=, memcmp@FUNCTION, $pop2, $pop1, $pop0
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -29,14 +29,13 @@ main:                                   # @main
 	.type	bar,@function           # -- Begin function bar
 bar:                                    # @bar
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push79=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop76, $pop78
+	i32.const	$push79=, 0
+	i32.store	__stack_pointer($pop79), $3
 	i32.const	$1=, 41589
 	i32.const	$push129=, 41589
 	i32.store	16($3), $pop129
@@ -46,23 +45,21 @@ bar:                                    # @bar
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push140=, 30
-	i32.shr_u	$push1=, $1, $pop140
+	i32.const	$push134=, 30
+	i32.shr_u	$push1=, $1, $pop134
 	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
+	i32.const	$push133=, 1812433253
+	i32.mul 	$push3=, $pop2, $pop133
+	i32.add 	$1=, $pop3, $2
+	i32.store	0($0), $1
+	i32.const	$push132=, 4
+	i32.add 	$0=, $0, $pop132
+	i32.const	$push131=, 1
+	i32.add 	$2=, $2, $pop131
+	i32.const	$push130=, 624
+	i32.ne  	$push4=, $2, $pop130
 	br_if   	0, $pop4        # 0: up to label1
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push5=, 1
 	i32.store	12($3), $pop5
@@ -70,186 +67,186 @@ bar:                                    # @bar
 	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.const	$push179=, 0
+	i32.load8_u	$push8=, p($pop179)
 	i32.xor 	$push9=, $pop6, $pop8
 	i32.store8	p($pop7), $pop9
-	i32.const	$push184=, 0
+	i32.const	$push178=, 0
 	i32.const	$push85=, 8
 	i32.add 	$push86=, $3, $pop85
 	i32.call	$push10=, foo@FUNCTION, $pop86
-	i32.const	$push183=, 0
-	i32.load8_u	$push11=, p+1($pop183)
+	i32.const	$push177=, 0
+	i32.load8_u	$push11=, p+1($pop177)
 	i32.xor 	$push12=, $pop10, $pop11
-	i32.store8	p+1($pop184), $pop12
-	i32.const	$push182=, 0
+	i32.store8	p+1($pop178), $pop12
+	i32.const	$push176=, 0
 	i32.const	$push87=, 8
 	i32.add 	$push88=, $3, $pop87
 	i32.call	$push13=, foo@FUNCTION, $pop88
-	i32.const	$push181=, 0
-	i32.load8_u	$push14=, p+2($pop181)
+	i32.const	$push175=, 0
+	i32.load8_u	$push14=, p+2($pop175)
 	i32.xor 	$push15=, $pop13, $pop14
-	i32.store8	p+2($pop182), $pop15
-	i32.const	$push180=, 0
+	i32.store8	p+2($pop176), $pop15
+	i32.const	$push174=, 0
 	i32.const	$push89=, 8
 	i32.add 	$push90=, $3, $pop89
 	i32.call	$push16=, foo@FUNCTION, $pop90
-	i32.const	$push179=, 0
-	i32.load8_u	$push17=, p+3($pop179)
+	i32.const	$push173=, 0
+	i32.load8_u	$push17=, p+3($pop173)
 	i32.xor 	$push18=, $pop16, $pop17
-	i32.store8	p+3($pop180), $pop18
-	i32.const	$push178=, 0
+	i32.store8	p+3($pop174), $pop18
+	i32.const	$push172=, 0
 	i32.const	$push91=, 8
 	i32.add 	$push92=, $3, $pop91
 	i32.call	$push19=, foo@FUNCTION, $pop92
-	i32.const	$push177=, 0
-	i32.load8_u	$push20=, p+4($pop177)
+	i32.const	$push171=, 0
+	i32.load8_u	$push20=, p+4($pop171)
 	i32.xor 	$push21=, $pop19, $pop20
-	i32.store8	p+4($pop178), $pop21
-	i32.const	$push176=, 0
+	i32.store8	p+4($pop172), $pop21
+	i32.const	$push170=, 0
 	i32.const	$push93=, 8
 	i32.add 	$push94=, $3, $pop93
 	i32.call	$push22=, foo@FUNCTION, $pop94
-	i32.const	$push175=, 0
-	i32.load8_u	$push23=, p+5($pop175)
+	i32.const	$push169=, 0
+	i32.load8_u	$push23=, p+5($pop169)
 	i32.xor 	$push24=, $pop22, $pop23
-	i32.store8	p+5($pop176), $pop24
-	i32.const	$push174=, 0
+	i32.store8	p+5($pop170), $pop24
+	i32.const	$push168=, 0
 	i32.const	$push95=, 8
 	i32.add 	$push96=, $3, $pop95
 	i32.call	$push25=, foo@FUNCTION, $pop96
-	i32.const	$push173=, 0
-	i32.load8_u	$push26=, p+6($pop173)
+	i32.const	$push167=, 0
+	i32.load8_u	$push26=, p+6($pop167)
 	i32.xor 	$push27=, $pop25, $pop26
-	i32.store8	p+6($pop174), $pop27
-	i32.const	$push172=, 0
+	i32.store8	p+6($pop168), $pop27
+	i32.const	$push166=, 0
 	i32.const	$push97=, 8
 	i32.add 	$push98=, $3, $pop97
 	i32.call	$push28=, foo@FUNCTION, $pop98
-	i32.const	$push171=, 0
-	i32.load8_u	$push29=, p+7($pop171)
+	i32.const	$push165=, 0
+	i32.load8_u	$push29=, p+7($pop165)
 	i32.xor 	$push30=, $pop28, $pop29
-	i32.store8	p+7($pop172), $pop30
-	i32.const	$push170=, 0
+	i32.store8	p+7($pop166), $pop30
+	i32.const	$push164=, 0
 	i32.const	$push99=, 8
 	i32.add 	$push100=, $3, $pop99
 	i32.call	$push31=, foo@FUNCTION, $pop100
-	i32.const	$push169=, 0
-	i32.load8_u	$push32=, p+8($pop169)
+	i32.const	$push163=, 0
+	i32.load8_u	$push32=, p+8($pop163)
 	i32.xor 	$push33=, $pop31, $pop32
-	i32.store8	p+8($pop170), $pop33
-	i32.const	$push168=, 0
+	i32.store8	p+8($pop164), $pop33
+	i32.const	$push162=, 0
 	i32.const	$push101=, 8
 	i32.add 	$push102=, $3, $pop101
 	i32.call	$push34=, foo@FUNCTION, $pop102
-	i32.const	$push167=, 0
-	i32.load8_u	$push35=, p+9($pop167)
+	i32.const	$push161=, 0
+	i32.load8_u	$push35=, p+9($pop161)
 	i32.xor 	$push36=, $pop34, $pop35
-	i32.store8	p+9($pop168), $pop36
-	i32.const	$push166=, 0
+	i32.store8	p+9($pop162), $pop36
+	i32.const	$push160=, 0
 	i32.const	$push103=, 8
 	i32.add 	$push104=, $3, $pop103
 	i32.call	$push37=, foo@FUNCTION, $pop104
-	i32.const	$push165=, 0
-	i32.load8_u	$push38=, p+10($pop165)
+	i32.const	$push159=, 0
+	i32.load8_u	$push38=, p+10($pop159)
 	i32.xor 	$push39=, $pop37, $pop38
-	i32.store8	p+10($pop166), $pop39
-	i32.const	$push164=, 0
+	i32.store8	p+10($pop160), $pop39
+	i32.const	$push158=, 0
 	i32.const	$push105=, 8
 	i32.add 	$push106=, $3, $pop105
 	i32.call	$push40=, foo@FUNCTION, $pop106
-	i32.const	$push163=, 0
-	i32.load8_u	$push41=, p+11($pop163)
+	i32.const	$push157=, 0
+	i32.load8_u	$push41=, p+11($pop157)
 	i32.xor 	$push42=, $pop40, $pop41
-	i32.store8	p+11($pop164), $pop42
-	i32.const	$push162=, 0
+	i32.store8	p+11($pop158), $pop42
+	i32.const	$push156=, 0
 	i32.const	$push107=, 8
 	i32.add 	$push108=, $3, $pop107
 	i32.call	$push43=, foo@FUNCTION, $pop108
-	i32.const	$push161=, 0
-	i32.load8_u	$push44=, p+12($pop161)
+	i32.const	$push155=, 0
+	i32.load8_u	$push44=, p+12($pop155)
 	i32.xor 	$push45=, $pop43, $pop44
-	i32.store8	p+12($pop162), $pop45
-	i32.const	$push160=, 0
+	i32.store8	p+12($pop156), $pop45
+	i32.const	$push154=, 0
 	i32.const	$push109=, 8
 	i32.add 	$push110=, $3, $pop109
 	i32.call	$push46=, foo@FUNCTION, $pop110
-	i32.const	$push159=, 0
-	i32.load8_u	$push47=, p+13($pop159)
+	i32.const	$push153=, 0
+	i32.load8_u	$push47=, p+13($pop153)
 	i32.xor 	$push48=, $pop46, $pop47
-	i32.store8	p+13($pop160), $pop48
-	i32.const	$push158=, 0
+	i32.store8	p+13($pop154), $pop48
+	i32.const	$push152=, 0
 	i32.const	$push111=, 8
 	i32.add 	$push112=, $3, $pop111
 	i32.call	$push49=, foo@FUNCTION, $pop112
-	i32.const	$push157=, 0
-	i32.load8_u	$push50=, p+14($pop157)
+	i32.const	$push151=, 0
+	i32.load8_u	$push50=, p+14($pop151)
 	i32.xor 	$push51=, $pop49, $pop50
-	i32.store8	p+14($pop158), $pop51
-	i32.const	$push156=, 0
+	i32.store8	p+14($pop152), $pop51
+	i32.const	$push150=, 0
 	i32.const	$push113=, 8
 	i32.add 	$push114=, $3, $pop113
 	i32.call	$push52=, foo@FUNCTION, $pop114
-	i32.const	$push155=, 0
-	i32.load8_u	$push53=, p+15($pop155)
+	i32.const	$push149=, 0
+	i32.load8_u	$push53=, p+15($pop149)
 	i32.xor 	$push54=, $pop52, $pop53
-	i32.store8	p+15($pop156), $pop54
-	i32.const	$push154=, 0
+	i32.store8	p+15($pop150), $pop54
+	i32.const	$push148=, 0
 	i32.const	$push115=, 8
 	i32.add 	$push116=, $3, $pop115
 	i32.call	$push55=, foo@FUNCTION, $pop116
-	i32.const	$push153=, 0
-	i32.load8_u	$push56=, p+16($pop153)
+	i32.const	$push147=, 0
+	i32.load8_u	$push56=, p+16($pop147)
 	i32.xor 	$push57=, $pop55, $pop56
-	i32.store8	p+16($pop154), $pop57
-	i32.const	$push152=, 0
+	i32.store8	p+16($pop148), $pop57
+	i32.const	$push146=, 0
 	i32.const	$push117=, 8
 	i32.add 	$push118=, $3, $pop117
 	i32.call	$push58=, foo@FUNCTION, $pop118
-	i32.const	$push151=, 0
-	i32.load8_u	$push59=, p+17($pop151)
+	i32.const	$push145=, 0
+	i32.load8_u	$push59=, p+17($pop145)
 	i32.xor 	$push60=, $pop58, $pop59
-	i32.store8	p+17($pop152), $pop60
-	i32.const	$push150=, 0
+	i32.store8	p+17($pop146), $pop60
+	i32.const	$push144=, 0
 	i32.const	$push119=, 8
 	i32.add 	$push120=, $3, $pop119
 	i32.call	$push61=, foo@FUNCTION, $pop120
-	i32.const	$push149=, 0
-	i32.load8_u	$push62=, p+18($pop149)
+	i32.const	$push143=, 0
+	i32.load8_u	$push62=, p+18($pop143)
 	i32.xor 	$push63=, $pop61, $pop62
-	i32.store8	p+18($pop150), $pop63
-	i32.const	$push148=, 0
+	i32.store8	p+18($pop144), $pop63
+	i32.const	$push142=, 0
 	i32.const	$push121=, 8
 	i32.add 	$push122=, $3, $pop121
 	i32.call	$push64=, foo@FUNCTION, $pop122
-	i32.const	$push147=, 0
-	i32.load8_u	$push65=, p+19($pop147)
+	i32.const	$push141=, 0
+	i32.load8_u	$push65=, p+19($pop141)
 	i32.xor 	$push66=, $pop64, $pop65
-	i32.store8	p+19($pop148), $pop66
-	i32.const	$push146=, 0
+	i32.store8	p+19($pop142), $pop66
+	i32.const	$push140=, 0
 	i32.const	$push123=, 8
 	i32.add 	$push124=, $3, $pop123
 	i32.call	$push67=, foo@FUNCTION, $pop124
-	i32.const	$push145=, 0
-	i32.load8_u	$push68=, p+20($pop145)
+	i32.const	$push139=, 0
+	i32.load8_u	$push68=, p+20($pop139)
 	i32.xor 	$push69=, $pop67, $pop68
-	i32.store8	p+20($pop146), $pop69
-	i32.const	$push144=, 0
+	i32.store8	p+20($pop140), $pop69
+	i32.const	$push138=, 0
 	i32.const	$push125=, 8
 	i32.add 	$push126=, $3, $pop125
 	i32.call	$push70=, foo@FUNCTION, $pop126
-	i32.const	$push143=, 0
-	i32.load8_u	$push71=, p+21($pop143)
+	i32.const	$push137=, 0
+	i32.load8_u	$push71=, p+21($pop137)
 	i32.xor 	$push72=, $pop70, $pop71
-	i32.store8	p+21($pop144), $pop72
-	i32.const	$push142=, 0
+	i32.store8	p+21($pop138), $pop72
+	i32.const	$push136=, 0
 	i32.const	$push127=, 8
 	i32.add 	$push128=, $3, $pop127
 	i32.call	$push73=, foo@FUNCTION, $pop128
-	i32.const	$push141=, 0
-	i32.load8_u	$push74=, p+22($pop141)
+	i32.const	$push135=, 0
+	i32.load8_u	$push74=, p+22($pop135)
 	i32.xor 	$push75=, $pop73, $pop74
-	i32.store8	p+22($pop142), $pop75
+	i32.store8	p+22($pop136), $pop75
 	i32.const	$push82=, 0
 	i32.const	$push80=, 2512
 	i32.add 	$push81=, $3, $pop80
@@ -265,62 +262,57 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($0)
 	i32.const	$push1=, -1
-	i32.add 	$push37=, $pop0, $pop1
-	tee_local	$push36=, $4=, $pop37
-	i32.store	4($0), $pop36
+	i32.add 	$3=, $pop0, $pop1
+	i32.store	4($0), $3
 	block   	
 	block   	
-	i32.eqz 	$push63=, $4
-	br_if   	0, $pop63       # 0: down to label3
-# BB#1:                                 # %entry.if.end_crit_edge
+	i32.eqz 	$push47=, $3
+	br_if   	0, $pop47       # 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.const	$push36=, 8
+	i32.add 	$5=, $0, $pop36
+	i32.store	0($0), $5
 	i32.load	$4=, 8($0)
 	i32.const	$3=, 0
 .LBB2_3:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	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.add 	$2=, $0, $3
+	i32.const	$push46=, 12
+	i32.add 	$push2=, $2, $pop46
+	i32.load	$1=, 0($pop2)
+	i32.const	$push45=, 8
+	i32.add 	$push14=, $2, $pop45
+	i32.const	$push44=, 0
+	i32.const	$push43=, 1
+	i32.and 	$push3=, $1, $pop43
+	i32.sub 	$push4=, $pop44, $pop3
+	i32.const	$push42=, -1727483681
+	i32.and 	$push5=, $pop4, $pop42
+	i32.const	$push41=, 1596
+	i32.add 	$push6=, $2, $pop41
 	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.const	$push40=, 2147483646
+	i32.and 	$push10=, $pop9, $pop40
 	i32.xor 	$push11=, $pop10, $4
-	i32.const	$push45=, 1
-	i32.shr_u	$push12=, $pop11, $pop45
+	i32.const	$push39=, 1
+	i32.shr_u	$push12=, $pop11, $pop39
 	i32.xor 	$push13=, $pop8, $pop12
 	i32.store	0($pop14), $pop13
+	i32.const	$push38=, 4
+	i32.add 	$3=, $3, $pop38
 	copy_local	$4=, $1
-	i32.const	$push44=, 4
-	i32.add 	$push43=, $3, $pop44
-	tee_local	$push42=, $3=, $pop43
-	i32.const	$push41=, 908
-	i32.ne  	$push15=, $pop42, $pop41
+	i32.const	$push37=, 908
+	i32.ne  	$push15=, $3, $pop37
 	br_if   	0, $pop15       # 0: up to label4
 .LBB2_4:                                # %if.end
 	end_loop
@@ -328,26 +320,23 @@ foo:                                    # @foo
 	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.load	$3=, 0($5)
 	i32.const	$push18=, 11
-	i32.shr_u	$push19=, $pop61, $pop18
-	i32.xor 	$push60=, $pop19, $4
-	tee_local	$push59=, $4=, $pop60
+	i32.shr_u	$push19=, $3, $pop18
+	i32.xor 	$3=, $pop19, $3
 	i32.const	$push20=, 7
-	i32.shl 	$push21=, $pop59, $pop20
+	i32.shl 	$push21=, $3, $pop20
 	i32.const	$push22=, -1658038656
 	i32.and 	$push23=, $pop21, $pop22
-	i32.xor 	$push58=, $pop23, $4
-	tee_local	$push57=, $4=, $pop58
+	i32.xor 	$3=, $pop23, $3
 	i32.const	$push24=, 15
-	i32.shl 	$push25=, $pop57, $pop24
+	i32.shl 	$push25=, $3, $pop24
 	i32.const	$push26=, 130023424
 	i32.and 	$push27=, $pop25, $pop26
-	i32.xor 	$push28=, $pop27, $4
+	i32.xor 	$push28=, $pop27, $3
 	i32.const	$push29=, 18
 	i32.shr_u	$push30=, $pop28, $pop29
-	i32.xor 	$push31=, $pop30, $4
+	i32.xor 	$push31=, $pop30, $3
 	i32.const	$push32=, 1
 	i32.shr_u	$push33=, $pop31, $pop32
 	i32.const	$push34=, 255
@@ -372,6 +361,6 @@ q:
 	.size	q, 23
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 46aa7cb5f..5bdb6ca7a 100644
--- a/test/torture-s/pr37882.c.s
+++ b/test/torture-s/pr37882.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i32.load8_u	$push1=, s($pop7)
@@ -30,4 +30,4 @@ s:
 	.size	s, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr37924.c.s b/test/torture-s/pr37924.c.s
index b38825448..ea16d4c32 100644
--- a/test/torture-s/pr37924.c.s
+++ b/test/torture-s/pr37924.c.s
@@ -6,7 +6,7 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, a($pop0)
 	i32.const	$push2=, -1
@@ -24,7 +24,7 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8388607
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -37,7 +37,7 @@ test2:                                  # @test2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end21
+# %bb.0:                                # %if.end21
 	i32.const	$push1=, 0
 	i32.const	$push0=, 255
 	i32.store8	b($pop1), $pop0
@@ -67,4 +67,4 @@ b:
 	.size	b, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr37931.c.s b/test/torture-s/pr37931.c.s
index 7989abac9..9538f191a 100644
--- a/test/torture-s/pr37931.c.s
+++ b/test/torture-s/pr37931.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.and 	$push0=, $1, $0
 	i32.const	$push1=, 1
 	i32.or  	$push2=, $pop0, $pop1
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end12
+# %bb.0:                                # %if.end12
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -30,4 +30,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr38048-1.c.s b/test/torture-s/pr38048-1.c.s
index 4373bec0a..08db16d1e 100644
--- a/test/torture-s/pr38048-1.c.s
+++ b/test/torture-s/pr38048-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr38048-2.c.s b/test/torture-s/pr38048-2.c.s
index 03845759c..247b2104b 100644
--- a/test/torture-s/pr38048-2.c.s
+++ b/test/torture-s/pr38048-2.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 15
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -27,4 +27,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr38051.c.s b/test/torture-s/pr38051.c.s
index 61d0a7860..1316b2f1c 100644
--- a/test/torture-s/pr38051.c.s
+++ b/test/torture-s/pr38051.c.s
@@ -8,11 +8,11 @@ mymemcmp:                               # @mymemcmp
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push105=, 0
-	i32.load	$push104=, __stack_pointer($pop105)
-	i32.const	$push106=, 16
-	i32.sub 	$6=, $pop104, $pop106
+# %bb.0:                                # %entry
+	i32.const	$push104=, 0
+	i32.load	$push103=, __stack_pointer($pop104)
+	i32.const	$push105=, 16
+	i32.sub 	$10=, $pop103, $pop105
 	i32.const	$push26=, 2
 	i32.shr_u	$2=, $2, $pop26
 	block   	
@@ -29,152 +29,148 @@ mymemcmp:                               # @mymemcmp
 	block   	
 	block   	
 	block   	
-	i32.const	$push147=, 3
-	i32.and 	$push27=, $0, $pop147
-	i32.eqz 	$push223=, $pop27
-	br_if   	0, $pop223      # 0: down to label13
-# BB#1:                                 # %if.else
+	block   	
+	i32.const	$push146=, 3
+	i32.and 	$push27=, $0, $pop146
+	i32.eqz 	$push178=, $pop27
+	br_if   	0, $pop178      # 0: down to label14
+# %bb.1:                                # %if.else
+	i32.const	$push148=, 3
+	i32.and 	$8=, $2, $pop148
 	i32.const	$push28=, -4
 	i32.and 	$4=, $0, $pop28
-	i32.const	$push31=, 32
-	i32.const	$push153=, 3
-	i32.shl 	$push29=, $0, $pop153
+	i32.const	$push147=, 3
+	i32.shl 	$push29=, $0, $pop147
 	i32.const	$push30=, 24
-	i32.and 	$push152=, $pop29, $pop30
-	tee_local	$push151=, $0=, $pop152
-	i32.sub 	$3=, $pop31, $pop151
-	i32.const	$push150=, 3
-	i32.and 	$push149=, $2, $pop150
-	tee_local	$push148=, $5=, $pop149
-	i32.eqz 	$push224=, $pop148
-	br_if   	1, $pop224      # 1: down to label12
-# BB#2:                                 # %if.else
+	i32.and 	$0=, $pop29, $pop30
+	i32.const	$push31=, 32
+	i32.sub 	$3=, $pop31, $0
+	i32.eqz 	$push179=, $8
+	br_if   	1, $pop179      # 1: down to label13
+# %bb.2:                                # %if.else
 	i32.const	$push32=, 1
-	i32.eq  	$push33=, $5, $pop32
-	br_if   	2, $pop33       # 2: down to label11
-# BB#3:                                 # %if.else
+	i32.eq  	$push33=, $8, $pop32
+	br_if   	2, $pop33       # 2: down to label12
+# %bb.3:                                # %if.else
 	i32.const	$push34=, 3
-	i32.ne  	$push35=, $5, $pop34
-	br_if   	3, $pop35       # 3: down to label10
-# BB#4:                                 # %sw.bb6.i
+	i32.ne  	$push35=, $8, $pop34
+	br_if   	3, $pop35       # 3: down to label11
+# %bb.4:                                # %sw.bb6.i
 	i32.const	$push40=, 1
 	i32.add 	$2=, $2, $pop40
 	i32.const	$push41=, -4
-	i32.add 	$9=, $1, $pop41
-	i32.load	$8=, 0($4)
-	br      	8               # 8: down to label5
+	i32.add 	$8=, $1, $pop41
+	i32.load	$7=, 0($4)
+	br      	8               # 8: down to label6
 .LBB0_5:                                # %if.then
-	end_block                       # label13:
-	i32.const	$push156=, 3
-	i32.and 	$push155=, $2, $pop156
-	tee_local	$push154=, $4=, $pop155
-	i32.eqz 	$push225=, $pop154
-	br_if   	10, $pop225     # 10: down to label2
-# BB#6:                                 # %if.then
+	end_block                       # label14:
+	i32.const	$push149=, 3
+	i32.and 	$4=, $2, $pop149
+	i32.eqz 	$push180=, $4
+	br_if   	10, $pop180     # 10: down to label3
+# %bb.6:                                # %if.then
 	i32.const	$push70=, 1
 	i32.eq  	$push71=, $4, $pop70
-	br_if   	3, $pop71       # 3: down to label9
-# BB#7:                                 # %if.then
+	br_if   	3, $pop71       # 3: down to label10
+# %bb.7:                                # %if.then
 	i32.const	$push72=, 3
 	i32.ne  	$push73=, $4, $pop72
-	br_if   	4, $pop73       # 4: down to label8
-# BB#8:                                 # %sw.bb3.i
+	br_if   	4, $pop73       # 4: down to label9
+# %bb.8:                                # %sw.bb3.i
 	i32.const	$push76=, 1
 	i32.add 	$2=, $2, $pop76
 	i32.const	$push77=, -4
 	i32.add 	$4=, $1, $pop77
-	i32.const	$push157=, -4
-	i32.add 	$3=, $0, $pop157
-	br      	11              # 11: down to label1
+	i32.const	$push150=, -4
+	i32.add 	$3=, $0, $pop150
+	br      	11              # 11: down to label2
 .LBB0_9:                                # %sw.bb12.i18
-	end_block                       # label12:
+	end_block                       # label13:
 	i32.const	$push39=, 4
-	i32.add 	$7=, $4, $pop39
-	i32.load	$5=, 0($4)
-	br      	5               # 5: down to label6
+	i32.add 	$6=, $4, $pop39
+	i32.load	$9=, 0($4)
+	br      	5               # 5: down to label7
 .LBB0_10:                               # %sw.bb17.i
-	end_block                       # label11:
+	end_block                       # label12:
 	i32.const	$push36=, -1
 	i32.add 	$2=, $2, $pop36
 	i32.const	$push38=, 8
-	i32.add 	$7=, $4, $pop38
-	i32.load	$8=, 0($1)
-	i32.load	$5=, 4($4)
+	i32.add 	$6=, $4, $pop38
+	i32.load	$5=, 0($1)
+	i32.load	$9=, 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 label7
+	br      	3               # 3: down to label8
 .LBB0_11:                               # %sw.bb.i16
-	end_block                       # label10:
+	end_block                       # label11:
 	i32.const	$push42=, 2
 	i32.add 	$2=, $2, $pop42
 	i32.const	$push43=, -8
-	i32.add 	$9=, $1, $pop43
+	i32.add 	$8=, $1, $pop43
 	i32.const	$push44=, -4
-	i32.add 	$10=, $4, $pop44
+	i32.add 	$7=, $4, $pop44
 	i32.const	$push45=, 4
-	i32.add 	$7=, $4, $pop45
-	i32.load	$5=, 0($4)
-	br      	5               # 5: down to label4
+	i32.add 	$6=, $4, $pop45
+	i32.load	$9=, 0($4)
+	br      	5               # 5: down to label5
 .LBB0_12:                               # %sw.bb12.i
-	end_block                       # label9:
+	end_block                       # label10:
 	i32.const	$push74=, -1
 	i32.add 	$2=, $2, $pop74
-	i32.load	$5=, 0($1)
+	i32.load	$8=, 0($1)
 	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
+	i32.const	$push151=, 4
+	i32.add 	$push1=, $1, $pop151
 	copy_local	$1=, $pop1
-	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:
+	br      	5               # 5: down to label4
+.LBB0_13:                               # %sw.bb.i
+	end_block                       # label9:
 	i32.const	$push78=, 2
 	i32.add 	$2=, $2, $pop78
 	i32.const	$push79=, -8
 	i32.add 	$4=, $1, $pop79
-	i32.const	$push169=, -8
-	i32.add 	$3=, $0, $pop169
-# BB#15:
-	i32.const	$11=, 39
+	i32.const	$push152=, -8
+	i32.add 	$3=, $0, $pop152
+	br      	7               # 7: down to label1
+.LBB0_14:
+	end_block                       # label8:
+	i32.const	$11=, 0
 	br      	7               # 7: down to label0
-.LBB0_16:
+.LBB0_15:
 	end_block                       # label7:
-	i32.const	$11=, 0
+	i32.const	$11=, 4
 	br      	6               # 6: down to label0
-.LBB0_17:
+.LBB0_16:
 	end_block                       # label6:
-	i32.const	$11=, 4
+	i32.const	$11=, 9
 	br      	5               # 5: down to label0
-.LBB0_18:
+.LBB0_17:
 	end_block                       # label5:
-	i32.const	$11=, 9
+	i32.const	$11=, 14
 	br      	4               # 4: down to label0
-.LBB0_19:
+.LBB0_18:
 	end_block                       # label4:
-	i32.const	$11=, 14
+	i32.const	$11=, 25
 	br      	3               # 3: down to label0
-.LBB0_20:
+.LBB0_19:
 	end_block                       # label3:
-	i32.const	$11=, 26
+	i32.const	$11=, 29
 	br      	2               # 2: down to label0
-.LBB0_21:
+.LBB0_20:
 	end_block                       # label2:
-	i32.const	$11=, 29
+	i32.const	$11=, 34
 	br      	1               # 1: down to label0
-.LBB0_22:
+.LBB0_21:
 	end_block                       # label1:
-	i32.const	$11=, 34
-.LBB0_23:                               # =>This Inner Loop Header: Depth=1
+	i32.const	$11=, 39
+.LBB0_22:                               # =>This Inner Loop Header: Depth=1
 	end_block                       # label0:
-	loop    	i32             # label14:
+	loop    	i32             # label15:
 	block   	
 	block   	
 	block   	
@@ -247,701 +243,690 @@ mymemcmp:                               # @mymemcmp
 	block   	
 	block   	
 	block   	
-	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	$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
+	block   	
+	br_table 	$11, 24, 32, 33, 34, 25, 35, 36, 37, 26, 27, 38, 39, 40, 28, 29, 41, 42, 43, 30, 31, 44, 45, 46, 47, 48, 0, 8, 9, 10, 1, 11, 12, 13, 2, 3, 14, 15, 16, 4, 5, 17, 18, 19, 6, 7, 20, 21, 22, 23, 23 # 24: down to label64
+                                        # 32: down to label56
+                                        # 33: down to label55
+                                        # 34: down to label54
+                                        # 25: down to label63
+                                        # 35: down to label53
+                                        # 36: down to label52
+                                        # 37: down to label51
+                                        # 26: down to label62
+                                        # 27: down to label61
+                                        # 38: down to label50
+                                        # 39: down to label49
+                                        # 40: down to label48
+                                        # 28: down to label60
+                                        # 29: down to label59
+                                        # 41: down to label47
+                                        # 42: down to label46
+                                        # 43: down to label45
+                                        # 30: down to label58
+                                        # 31: down to label57
+                                        # 44: down to label44
+                                        # 45: down to label43
+                                        # 46: down to label42
+                                        # 47: down to label41
+                                        # 48: down to label40
+                                        # 0: down to label88
+                                        # 8: down to label80
+                                        # 9: down to label79
+                                        # 10: down to label78
+                                        # 1: down to label87
+                                        # 11: down to label77
+                                        # 12: down to label76
+                                        # 13: down to label75
+                                        # 2: down to label86
+                                        # 3: down to label85
+                                        # 14: down to label74
+                                        # 15: down to label73
+                                        # 16: down to label72
+                                        # 4: down to label84
+                                        # 5: down to label83
+                                        # 17: down to label71
+                                        # 18: down to label70
+                                        # 19: down to label69
+                                        # 6: down to label82
+                                        # 7: down to label81
+                                        # 20: down to label68
+                                        # 21: down to label67
+                                        # 22: down to label66
+                                        # 23: down to label65
+.LBB0_23:                               # %do.body.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label88:
+	i32.ne  	$push84=, $7, $8
+	br_if   	48, $pop84      # 48: down to label39
+# %bb.24:                               #   in Loop: Header=BB0_22 Depth=1
+	i32.const	$11=, 29
+	br      	72              # 72: up to label15
+.LBB0_25:                               # %do3.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label87:
+	i32.load	$4=, 0($1)
+	i32.load	$3=, 0($0)
+	i32.ne  	$push87=, $3, $4
+	br_if   	63, $pop87      # 63: down to label23
+# %bb.26:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 33
-	br      	71              # 71: up to label14
-.LBB0_26:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label85:
+	br      	71              # 71: up to label15
+.LBB0_27:                               #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label86:
 	copy_local	$3=, $0
 	copy_local	$4=, $1
-	i32.const	$push87=, 4
-	i32.add 	$push4=, $0, $pop87
+	i32.const	$push86=, 4
+	i32.add 	$push4=, $0, $pop86
 	copy_local	$0=, $pop4
-	i32.const	$push163=, 4
-	i32.add 	$push5=, $1, $pop163
+	i32.const	$push153=, 4
+	i32.add 	$push5=, $1, $pop153
 	copy_local	$1=, $pop5
-# BB#27:                                #   in Loop: Header=BB0_23 Depth=1
+# %bb.28:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 34
-	br      	70              # 70: up to label14
-.LBB0_28:                               # %do2.i
-                                        #   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
+	br      	70              # 70: up to label15
+.LBB0_29:                               # %do2.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label85:
+	i32.load	$1=, 0($1)
+	i32.load	$0=, 0($0)
+	i32.ne  	$push89=, $0, $1
+	br_if   	63, $pop89      # 63: down to label21
+# %bb.30:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 38
-	br      	69              # 69: up to label14
-.LBB0_30:                               # %if.end31.i
-                                        #   in Loop: Header=BB0_23 Depth=1
+	br      	69              # 69: up to label15
+.LBB0_31:                               # %if.end31.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label84:
+	i32.const	$push91=, 8
+	i32.add 	$0=, $3, $pop91
+	i32.const	$push154=, 8
+	i32.add 	$1=, $4, $pop154
+# %bb.32:                               #   in Loop: Header=BB0_22 Depth=1
+	i32.const	$11=, 39
+	br      	68              # 68: up to label15
+.LBB0_33:                               # %do1.i
+                                        #   in Loop: Header=BB0_22 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.load	$1=, 0($1)
+	i32.load	$0=, 0($0)
+	i32.ne  	$push80=, $0, $1
+	br_if   	63, $pop80      # 63: down to label19
+# %bb.34:                               #   in Loop: Header=BB0_22 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)
+	br      	67              # 67: up to label15
+.LBB0_35:                               # %if.end37.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label82:
+	i32.load	$8=, 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.add 	$2=, $2, $pop82
+	i32.eqz 	$push181=, $2
+	br_if   	64, $pop181     # 64: down to label17
+# %bb.36:                               #   in Loop: Header=BB0_22 Depth=1
+	i32.const	$11=, 44
+	br      	66              # 66: up to label15
+.LBB0_37:                               #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label81:
 	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.store	8($6), $5
-	i32.store	12($6), $7
-	i32.const	$push111=, 8
-	i32.add 	$push112=, $6, $pop111
-	copy_local	$1=, $pop112
-	i32.const	$push113=, 12
-	i32.add 	$push114=, $6, $pop113
-	copy_local	$6=, $pop114
-# BB#38:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push155=, 16
+	i32.add 	$0=, $3, $pop155
+	br      	55              # 55: down to label25
+.LBB0_38:                               # %if.then.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label80:
+	i32.store	8($10), $8
+	i32.store	12($10), $7
+	i32.const	$push110=, 8
+	i32.add 	$push111=, $10, $pop110
+	copy_local	$1=, $pop111
+	i32.const	$push112=, 12
+	i32.add 	$push113=, $10, $pop112
+	copy_local	$0=, $pop113
+# %bb.39:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 27
-	br      	64              # 64: up to label14
-.LBB0_39:                               # %do.body.i.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label78:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push178=, 1
-	i32.add 	$push3=, $1, $pop178
+	br      	64              # 64: up to label15
+.LBB0_40:                               # %do.body.i.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label79:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push157=, 1
+	i32.add 	$push3=, $1, $pop157
 	copy_local	$1=, $pop3
-	i32.const	$push177=, 1
-	i32.add 	$push2=, $6, $pop177
-	copy_local	$6=, $pop2
-	i32.eq  	$push86=, $2, $0
-	br_if   	54, $pop86      # 54: down to label23
-# BB#40:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push156=, 1
+	i32.add 	$push2=, $0, $pop156
+	copy_local	$0=, $pop2
+	i32.eq  	$push85=, $4, $2
+	br_if   	54, $pop85      # 54: down to label24
+# %bb.41:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 28
-	br      	63              # 63: up to label14
-.LBB0_41:                               # %mymemcmp1.exit.i
+	br      	63              # 63: up to label15
+.LBB0_42:                               # %mymemcmp1.exit.i
+	end_block                       # label78:
+	i32.sub 	$push102=, $4, $2
+	return  	$pop102
+.LBB0_43:                               # %if.then23.i
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label77:
-	i32.sub 	$push103=, $2, $0
-	return  	$pop103
-.LBB0_42:                               # %if.then23.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label76:
-	i32.store	8($6), $3
-	i32.store	12($6), $4
-	i32.const	$push123=, 8
-	i32.add 	$push124=, $6, $pop123
-	copy_local	$1=, $pop124
-	i32.const	$push125=, 12
-	i32.add 	$push126=, $6, $pop125
-	copy_local	$6=, $pop126
-# BB#43:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.store	8($10), $4
+	i32.store	12($10), $3
+	i32.const	$push122=, 8
+	i32.add 	$push123=, $10, $pop122
+	copy_local	$1=, $pop123
+	i32.const	$push124=, 12
+	i32.add 	$push125=, $10, $pop124
+	copy_local	$0=, $pop125
+# %bb.44:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 31
-	br      	61              # 61: up to label14
-.LBB0_44:                               # %do.body.i140.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label75:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push180=, 1
-	i32.add 	$push7=, $1, $pop180
+	br      	61              # 61: up to label15
+.LBB0_45:                               # %do.body.i140.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label76:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push159=, 1
+	i32.add 	$push7=, $1, $pop159
 	copy_local	$1=, $pop7
-	i32.const	$push179=, 1
-	i32.add 	$push6=, $6, $pop179
-	copy_local	$6=, $pop6
-	i32.eq  	$push89=, $2, $0
-	br_if   	53, $pop89      # 53: down to label21
-# BB#45:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push158=, 1
+	i32.add 	$push6=, $0, $pop158
+	copy_local	$0=, $pop6
+	i32.eq  	$push88=, $4, $2
+	br_if   	53, $pop88      # 53: down to label22
+# %bb.46:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 32
-	br      	60              # 60: up to label14
-.LBB0_46:                               # %mymemcmp1.exit144.i
+	br      	60              # 60: up to label15
+.LBB0_47:                               # %mymemcmp1.exit144.i
+	end_block                       # label75:
+	i32.sub 	$push101=, $4, $2
+	return  	$pop101
+.LBB0_48:                               # %if.then29.i
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label74:
-	i32.sub 	$push102=, $2, $0
-	return  	$pop102
-.LBB0_47:                               # %if.then29.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label73:
-	i32.store	8($6), $1
-	i32.store	12($6), $0
-	i32.const	$push119=, 8
-	i32.add 	$push120=, $6, $pop119
-	copy_local	$1=, $pop120
-	i32.const	$push121=, 12
-	i32.add 	$push122=, $6, $pop121
-	copy_local	$6=, $pop122
-# BB#48:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.store	8($10), $1
+	i32.store	12($10), $0
+	i32.const	$push118=, 8
+	i32.add 	$push119=, $10, $pop118
+	copy_local	$1=, $pop119
+	i32.const	$push120=, 12
+	i32.add 	$push121=, $10, $pop120
+	copy_local	$0=, $pop121
+# %bb.49:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 36
-	br      	58              # 58: up to label14
-.LBB0_49:                               # %do.body.i128.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label72:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push182=, 1
-	i32.add 	$push9=, $1, $pop182
+	br      	58              # 58: up to label15
+.LBB0_50:                               # %do.body.i128.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label73:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push161=, 1
+	i32.add 	$push9=, $1, $pop161
 	copy_local	$1=, $pop9
-	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	$push160=, 1
+	i32.add 	$push8=, $0, $pop160
+	copy_local	$0=, $pop8
+	i32.eq  	$push90=, $4, $2
+	br_if   	52, $pop90      # 52: down to label20
+# %bb.51:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 37
-	br      	57              # 57: up to label14
-.LBB0_51:                               # %mymemcmp1.exit132.i
+	br      	57              # 57: up to label15
+.LBB0_52:                               # %mymemcmp1.exit132.i
+	end_block                       # label72:
+	i32.sub 	$push100=, $4, $2
+	return  	$pop100
+.LBB0_53:                               # %if.then35.i
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label71:
-	i32.sub 	$push101=, $2, $0
-	return  	$pop101
-.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.store	8($10), $1
+	i32.store	12($10), $0
+	i32.const	$push114=, 8
+	i32.add 	$push115=, $10, $pop114
+	copy_local	$1=, $pop115
+	i32.const	$push116=, 12
+	i32.add 	$push117=, $10, $pop116
+	copy_local	$0=, $pop117
+# %bb.54:                               #   in Loop: Header=BB0_22 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
+	br      	55              # 55: up to label15
+.LBB0_55:                               # %do.body.i116.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label70:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push163=, 1
+	i32.add 	$push11=, $1, $pop163
 	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	$push162=, 1
+	i32.add 	$push10=, $0, $pop162
+	copy_local	$0=, $pop10
+	i32.eq  	$push81=, $4, $2
+	br_if   	51, $pop81      # 51: down to label18
+# %bb.56:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 42
-	br      	54              # 54: up to label14
-.LBB0_56:                               # %mymemcmp1.exit120.i
+	br      	54              # 54: up to label15
+.LBB0_57:                               # %mymemcmp1.exit120.i
+	end_block                       # label69:
+	i32.sub 	$push99=, $4, $2
+	return  	$pop99
+.LBB0_58:                               # %do0.i
+                                        #   in Loop: Header=BB0_22 Depth=1
 	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=, $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 label14
-.LBB0_59:                               # %if.then43.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label66:
-	i32.store	8($6), $5
-	i32.store	12($6), $7
-	i32.const	$push107=, 8
-	i32.add 	$push108=, $6, $pop107
-	copy_local	$1=, $pop108
-	i32.const	$push109=, 12
-	i32.add 	$push110=, $6, $pop109
-	copy_local	$6=, $pop110
-# BB#60:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.eq  	$push92=, $7, $8
+	br_if   	41, $pop92      # 41: down to label26
+# %bb.59:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 46
-	br      	51              # 51: up to label14
-.LBB0_61:                               # %do.body.i104.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label65:
-	i32.load8_u	$0=, 0($1)
-	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=, $6, $pop185
-	copy_local	$6=, $pop12
-	i32.eq  	$push94=, $2, $0
-	br_if   	49, $pop94      # 49: down to label15
-# BB#62:                                #   in Loop: Header=BB0_23 Depth=1
+	br      	52              # 52: up to label15
+.LBB0_60:                               # %if.then43.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label67:
+	i32.store	8($10), $8
+	i32.store	12($10), $7
+	i32.const	$push106=, 8
+	i32.add 	$push107=, $10, $pop106
+	copy_local	$1=, $pop107
+	i32.const	$push108=, 12
+	i32.add 	$push109=, $10, $pop108
+	copy_local	$0=, $pop109
+# %bb.61:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 47
-	br      	50              # 50: up to label14
-.LBB0_63:                               # %mymemcmp1.exit108.i
+	br      	51              # 51: up to label15
+.LBB0_62:                               # %do.body.i104.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label66:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push165=, 1
+	i32.add 	$push13=, $1, $pop165
+	copy_local	$1=, $pop13
+	i32.const	$push164=, 1
+	i32.add 	$push12=, $0, $pop164
+	copy_local	$0=, $pop12
+	i32.eq  	$push93=, $4, $2
+	br_if   	49, $pop93      # 49: down to label16
+# %bb.63:                               #   in Loop: Header=BB0_22 Depth=1
+	i32.const	$11=, 48
+	br      	50              # 50: up to label15
+.LBB0_64:                               # %mymemcmp1.exit108.i
+	end_block                       # label65:
+	i32.sub 	$push98=, $4, $2
+	return  	$pop98
+.LBB0_65:                               # %do.body.i23
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label64:
-	i32.sub 	$push99=, $2, $0
-	return  	$pop99
-.LBB0_64:                               # %do.body.i23
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label63:
-	i32.shl 	$push53=, $5, $3
+	i32.shl 	$push53=, $9, $3
 	i32.shr_u	$push52=, $4, $0
-	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.or  	$4=, $pop53, $pop52
+	i32.ne  	$push54=, $4, $5
+	br_if   	25, $pop54      # 25: down to label38
+# %bb.66:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 4
-	br      	48              # 48: up to label14
-.LBB0_66:                               # %do3.i42
-                                        #   in Loop: Header=BB0_23 Depth=1
-	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  	$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
+	br      	48              # 48: up to label15
+.LBB0_67:                               # %do3.i42
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label63:
+	i32.load	$7=, 0($6)
+	i32.shl 	$push57=, $7, $3
+	i32.shr_u	$push56=, $9, $0
+	i32.or  	$4=, $pop57, $pop56
+	i32.load	$8=, 0($1)
+	i32.ne  	$push58=, $4, $8
+	br_if   	27, $pop58      # 27: down to label35
+# %bb.68:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 8
-	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
+	br      	47              # 47: up to label15
+.LBB0_69:                               #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label62:
+	copy_local	$8=, $1
+	copy_local	$4=, $6
 	i32.const	$push59=, 4
 	i32.add 	$push17=, $1, $pop59
 	copy_local	$1=, $pop17
-# BB#69:                                #   in Loop: Header=BB0_23 Depth=1
+# %bb.70:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 9
-	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
+	br      	46              # 46: up to label15
+.LBB0_71:                               # %do2.i50
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label61:
+	i32.load	$9=, 4($4)
+	i32.shl 	$push62=, $9, $3
+	i32.shr_u	$push61=, $7, $0
+	i32.or  	$7=, $pop62, $pop61
+	i32.load	$1=, 0($1)
+	i32.ne  	$push63=, $7, $1
+	br_if   	27, $pop63      # 27: down to label33
+# %bb.72:                               #   in Loop: Header=BB0_22 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:
+	br      	45              # 45: up to label15
+.LBB0_73:                               # %if.end45.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label60:
 	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.add 	$6=, $4, $pop65
+	i32.const	$push166=, 8
+	i32.add 	$1=, $8, $pop166
+	copy_local	$7=, $4
+# %bb.74:                               #   in Loop: Header=BB0_22 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	$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
+	br      	44              # 44: up to label15
+.LBB0_75:                               # %do1.i56
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label59:
+	i32.load	$4=, 0($6)
+	i32.shl 	$push47=, $4, $3
+	i32.shr_u	$push46=, $9, $0
+	i32.or  	$9=, $pop47, $pop46
+	i32.load	$1=, 0($1)
+	i32.ne  	$push48=, $9, $1
+	br_if   	27, $pop48      # 27: down to label31
+# %bb.76:                               #   in Loop: Header=BB0_22 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)
+	br      	43              # 43: up to label15
+.LBB0_77:                               # %if.end54.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label58:
+	i32.load	$5=, 12($8)
+	i32.load	$9=, 12($7)
 	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.add 	$2=, $2, $pop50
+	i32.eqz 	$push182=, $2
+	br_if   	28, $pop182     # 28: down to label29
+# %bb.78:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 19
-	br      	42              # 42: up to label14
-.LBB0_78:                               #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label56:
+	br      	42              # 42: up to label15
+.LBB0_79:                               #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label57:
 	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.store	8($6), $8
-	i32.store	12($6), $4
-	i32.const	$push131=, 8
-	i32.add 	$push132=, $6, $pop131
-	copy_local	$1=, $pop132
-	i32.const	$push133=, 12
-	i32.add 	$push134=, $6, $pop133
-	copy_local	$6=, $pop134
-# BB#80:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.add 	$1=, $8, $pop51
+	i32.const	$push167=, 16
+	i32.add 	$6=, $7, $pop167
+	br      	19              # 19: down to label37
+.LBB0_80:                               # %if.then.i24
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label56:
+	i32.store	8($10), $5
+	i32.store	12($10), $4
+	i32.const	$push130=, 8
+	i32.add 	$push131=, $10, $pop130
+	copy_local	$1=, $pop131
+	i32.const	$push132=, 12
+	i32.add 	$push133=, $10, $pop132
+	copy_local	$0=, $pop133
+# %bb.81:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 2
-	br      	40              # 40: up to label14
-.LBB0_81:                               # %do.body.i.i30
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label54:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push212=, 1
-	i32.add 	$push16=, $1, $pop212
+	br      	40              # 40: up to label15
+.LBB0_82:                               # %do.body.i.i30
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label55:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push169=, 1
+	i32.add 	$push16=, $1, $pop169
 	copy_local	$1=, $pop16
-	i32.const	$push211=, 1
-	i32.add 	$push15=, $6, $pop211
-	copy_local	$6=, $pop15
-	i32.eq  	$push55=, $2, $0
-	br_if   	18, $pop55      # 18: down to label35
-# BB#82:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push168=, 1
+	i32.add 	$push15=, $0, $pop168
+	copy_local	$0=, $pop15
+	i32.eq  	$push55=, $4, $2
+	br_if   	18, $pop55      # 18: down to label36
+# %bb.83:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 3
-	br      	39              # 39: up to label14
-.LBB0_83:                               # %mymemcmp1.exit.i34
+	br      	39              # 39: up to label15
+.LBB0_84:                               # %mymemcmp1.exit.i34
+	end_block                       # label54:
+	i32.sub 	$push97=, $4, $2
+	return  	$pop97
+.LBB0_85:                               # %if.then34.i
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label53:
-	i32.sub 	$push98=, $2, $0
-	return  	$pop98
-.LBB0_84:                               # %if.then34.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label52:
-	i32.store	8($6), $5
-	i32.store	12($6), $4
-	i32.const	$push143=, 8
-	i32.add 	$push144=, $6, $pop143
-	copy_local	$1=, $pop144
-	i32.const	$push145=, 12
-	i32.add 	$push146=, $6, $pop145
-	copy_local	$6=, $pop146
-# BB#85:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.store	8($10), $8
+	i32.store	12($10), $4
+	i32.const	$push142=, 8
+	i32.add 	$push143=, $10, $pop142
+	copy_local	$1=, $pop143
+	i32.const	$push144=, 12
+	i32.add 	$push145=, $10, $pop144
+	copy_local	$0=, $pop145
+# %bb.86:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 6
-	br      	37              # 37: up to label14
-.LBB0_86:                               # %do.body.i194.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label51:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push214=, 1
-	i32.add 	$push19=, $1, $pop214
+	br      	37              # 37: up to label15
+.LBB0_87:                               # %do.body.i194.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label52:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push171=, 1
+	i32.add 	$push19=, $1, $pop171
 	copy_local	$1=, $pop19
-	i32.const	$push213=, 1
-	i32.add 	$push18=, $6, $pop213
-	copy_local	$6=, $pop18
-	i32.eq  	$push60=, $2, $0
-	br_if   	17, $pop60      # 17: down to label33
-# BB#87:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push170=, 1
+	i32.add 	$push18=, $0, $pop170
+	copy_local	$0=, $pop18
+	i32.eq  	$push60=, $4, $2
+	br_if   	17, $pop60      # 17: down to label34
+# %bb.88:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 7
-	br      	36              # 36: up to label14
-.LBB0_88:                               # %mymemcmp1.exit198.i
+	br      	36              # 36: up to label15
+.LBB0_89:                               # %mymemcmp1.exit198.i
+	end_block                       # label51:
+	i32.sub 	$push96=, $4, $2
+	return  	$pop96
+.LBB0_90:                               # %if.then43.i51
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label50:
-	i32.sub 	$push97=, $2, $0
-	return  	$pop97
-.LBB0_89:                               # %if.then43.i51
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label49:
-	i32.store	8($6), $1
-	i32.store	12($6), $7
-	i32.const	$push139=, 8
-	i32.add 	$push140=, $6, $pop139
-	copy_local	$1=, $pop140
-	i32.const	$push141=, 12
-	i32.add 	$push142=, $6, $pop141
-	copy_local	$6=, $pop142
-# BB#90:                                #   in Loop: Header=BB0_23 Depth=1
+	i32.store	8($10), $1
+	i32.store	12($10), $7
+	i32.const	$push138=, 8
+	i32.add 	$push139=, $10, $pop138
+	copy_local	$1=, $pop139
+	i32.const	$push140=, 12
+	i32.add 	$push141=, $10, $pop140
+	copy_local	$0=, $pop141
+# %bb.91:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 11
-	br      	34              # 34: up to label14
-.LBB0_91:                               # %do.body.i182.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label48:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push216=, 1
-	i32.add 	$push21=, $1, $pop216
+	br      	34              # 34: up to label15
+.LBB0_92:                               # %do.body.i182.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label49:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push173=, 1
+	i32.add 	$push21=, $1, $pop173
 	copy_local	$1=, $pop21
-	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	$push172=, 1
+	i32.add 	$push20=, $0, $pop172
+	copy_local	$0=, $pop20
+	i32.eq  	$push64=, $4, $2
+	br_if   	16, $pop64      # 16: down to label32
+# %bb.93:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 12
-	br      	33              # 33: up to label14
-.LBB0_93:                               # %mymemcmp1.exit186.i
+	br      	33              # 33: up to label15
+.LBB0_94:                               # %mymemcmp1.exit186.i
+	end_block                       # label48:
+	i32.sub 	$push95=, $4, $2
+	return  	$pop95
+.LBB0_95:                               # %if.then52.i
+                                        #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label47:
-	i32.sub 	$push96=, $2, $0
-	return  	$pop96
-.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.store	8($10), $1
+	i32.store	12($10), $9
+	i32.const	$push134=, 8
+	i32.add 	$push135=, $10, $pop134
+	copy_local	$1=, $pop135
+	i32.const	$push136=, 12
+	i32.add 	$push137=, $10, $pop136
+	copy_local	$0=, $pop137
+# %bb.96:                               #   in Loop: Header=BB0_22 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
+	br      	31              # 31: up to label15
+.LBB0_97:                               # %do.body.i170.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label46:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push175=, 1
+	i32.add 	$push23=, $1, $pop175
 	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	$push174=, 1
+	i32.add 	$push22=, $0, $pop174
+	copy_local	$0=, $pop22
+	i32.eq  	$push49=, $4, $2
+	br_if   	15, $pop49      # 15: down to label30
+# %bb.98:                               #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 17
-	br      	30              # 30: up to label14
-.LBB0_98:                               # %mymemcmp1.exit174.i
+	br      	30              # 30: up to label15
+.LBB0_99:                               # %mymemcmp1.exit174.i
+	end_block                       # label45:
+	i32.sub 	$push94=, $4, $2
+	return  	$pop94
+.LBB0_100:                              # %do0.i57
+                                        #   in Loop: Header=BB0_22 Depth=1
 	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.shl 	$push67=, $9, $3
 	i32.shr_u	$push66=, $4, $0
-	i32.or  	$push220=, $pop67, $pop66
-	tee_local	$push219=, $0=, $pop220
-	i32.eq  	$push68=, $pop219, $8
-	br_if   	15, $pop68      # 15: down to label27
-# BB#100:                               #   in Loop: Header=BB0_23 Depth=1
+	i32.or  	$0=, $pop67, $pop66
+	i32.const	$1=, 0
+	i32.eq  	$push68=, $0, $5
+	br_if   	15, $pop68      # 15: down to label28
+# %bb.101:                              #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 21
-	br      	28              # 28: up to label14
-.LBB0_101:                              # %if.then63.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label42:
-	i32.store	8($6), $8
-	i32.store	12($6), $0
-	i32.const	$push127=, 8
-	i32.add 	$push128=, $6, $pop127
-	copy_local	$1=, $pop128
-	i32.const	$push129=, 12
-	i32.add 	$push130=, $6, $pop129
-	copy_local	$6=, $pop130
-# BB#102:                               #   in Loop: Header=BB0_23 Depth=1
+	br      	28              # 28: up to label15
+.LBB0_102:                              # %if.then63.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label43:
+	i32.store	8($10), $5
+	i32.store	12($10), $0
+	i32.const	$push126=, 8
+	i32.add 	$push127=, $10, $pop126
+	copy_local	$1=, $pop127
+	i32.const	$push128=, 12
+	i32.add 	$push129=, $10, $pop128
+	copy_local	$0=, $pop129
+# %bb.103:                              #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 22
-	br      	27              # 27: up to label14
-.LBB0_103:                              # %do.body.i158.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label41:
-	i32.load8_u	$0=, 0($1)
-	i32.load8_u	$2=, 0($6)
-	i32.const	$push222=, 1
-	i32.add 	$push25=, $1, $pop222
+	br      	27              # 27: up to label15
+.LBB0_104:                              # %do.body.i158.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label42:
+	i32.load8_u	$2=, 0($1)
+	i32.load8_u	$4=, 0($0)
+	i32.const	$push177=, 1
+	i32.add 	$push25=, $1, $pop177
 	copy_local	$1=, $pop25
-	i32.const	$push221=, 1
-	i32.add 	$push24=, $6, $pop221
-	copy_local	$6=, $pop24
-	i32.eq  	$push69=, $2, $0
-	br_if   	14, $pop69      # 14: down to label26
-# BB#104:                               #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$push176=, 1
+	i32.add 	$push24=, $0, $pop176
+	copy_local	$0=, $pop24
+	i32.eq  	$push69=, $4, $2
+	br_if   	14, $pop69      # 14: down to label27
+# %bb.105:                              #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 23
-	br      	26              # 26: up to label14
-.LBB0_105:                              # %mymemcmp1.exit162.i
-                                        #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label40:
-	i32.sub 	$1=, $2, $0
-# BB#106:                               #   in Loop: Header=BB0_23 Depth=1
+	br      	26              # 26: up to label15
+.LBB0_106:                              # %mymemcmp1.exit162.i
+                                        #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label41:
+	i32.sub 	$1=, $4, $2
+# %bb.107:                              #   in Loop: Header=BB0_22 Depth=1
 	i32.const	$11=, 24
-	br      	25              # 25: up to label14
-.LBB0_107:                              # %cleanup
-	end_block                       # label39:
+	br      	25              # 25: up to label15
+.LBB0_108:                              # %cleanup
+	end_block                       # label40:
 	return  	$1
-.LBB0_108:                              #   in Loop: Header=BB0_23 Depth=1
+.LBB0_109:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label39:
+	i32.const	$11=, 26
+	br      	23              # 23: up to label15
+.LBB0_110:                              #   in Loop: Header=BB0_22 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 label14
-.LBB0_110:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label36:
+	br      	22              # 22: up to label15
+.LBB0_111:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label37:
 	i32.const	$11=, 0
-	br      	21              # 21: up to label14
-.LBB0_111:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label35:
+	br      	21              # 21: up to label15
+.LBB0_112:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label36:
 	i32.const	$11=, 2
-	br      	20              # 20: up to label14
-.LBB0_112:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label34:
+	br      	20              # 20: up to label15
+.LBB0_113:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label35:
 	i32.const	$11=, 5
-	br      	19              # 19: up to label14
-.LBB0_113:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label33:
+	br      	19              # 19: up to label15
+.LBB0_114:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label34:
 	i32.const	$11=, 6
-	br      	18              # 18: up to label14
-.LBB0_114:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label32:
+	br      	18              # 18: up to label15
+.LBB0_115:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label33:
 	i32.const	$11=, 10
-	br      	17              # 17: up to label14
-.LBB0_115:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label31:
+	br      	17              # 17: up to label15
+.LBB0_116:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label32:
 	i32.const	$11=, 11
-	br      	16              # 16: up to label14
-.LBB0_116:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label30:
+	br      	16              # 16: up to label15
+.LBB0_117:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label31:
 	i32.const	$11=, 15
-	br      	15              # 15: up to label14
-.LBB0_117:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label29:
+	br      	15              # 15: up to label15
+.LBB0_118:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label30:
 	i32.const	$11=, 16
-	br      	14              # 14: up to label14
-.LBB0_118:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label28:
+	br      	14              # 14: up to label15
+.LBB0_119:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label29:
 	i32.const	$11=, 20
-	br      	13              # 13: up to label14
-.LBB0_119:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label27:
+	br      	13              # 13: up to label15
+.LBB0_120:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label28:
 	i32.const	$11=, 24
-	br      	12              # 12: up to label14
-.LBB0_120:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label26:
+	br      	12              # 12: up to label15
+.LBB0_121:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label27:
 	i32.const	$11=, 22
-	br      	11              # 11: up to label14
-.LBB0_121:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label25:
+	br      	11              # 11: up to label15
+.LBB0_122:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label26:
 	i32.const	$11=, 24
-	br      	10              # 10: up to label14
-.LBB0_122:                              #   in Loop: Header=BB0_23 Depth=1
+	br      	10              # 10: up to label15
+.LBB0_123:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label25:
+	i32.const	$11=, 25
+	br      	9               # 9: up to label15
+.LBB0_124:                              #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label24:
-	i32.const	$11=, 44
-	br      	9               # 9: up to label14
-.LBB0_123:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label23:
 	i32.const	$11=, 27
-	br      	8               # 8: up to label14
-.LBB0_124:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label22:
+	br      	8               # 8: up to label15
+.LBB0_125:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label23:
 	i32.const	$11=, 30
-	br      	7               # 7: up to label14
-.LBB0_125:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label21:
+	br      	7               # 7: up to label15
+.LBB0_126:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label22:
 	i32.const	$11=, 31
-	br      	6               # 6: up to label14
-.LBB0_126:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label20:
+	br      	6               # 6: up to label15
+.LBB0_127:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label21:
 	i32.const	$11=, 35
-	br      	5               # 5: up to label14
-.LBB0_127:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label19:
+	br      	5               # 5: up to label15
+.LBB0_128:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label20:
 	i32.const	$11=, 36
-	br      	4               # 4: up to label14
-.LBB0_128:                              #   in Loop: Header=BB0_23 Depth=1
+	br      	4               # 4: up to label15
+.LBB0_129:                              #   in Loop: Header=BB0_22 Depth=1
+	end_block                       # label19:
+	i32.const	$11=, 40
+	br      	3               # 3: up to label15
+.LBB0_130:                              #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label18:
-	i32.const	$11=, 39
-	br      	3               # 3: up to label14
-.LBB0_129:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 41
+	br      	2               # 2: up to label15
+.LBB0_131:                              #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label17:
-	i32.const	$11=, 40
-	br      	2               # 2: up to label14
-.LBB0_130:                              #   in Loop: Header=BB0_23 Depth=1
+	i32.const	$11=, 45
+	br      	1               # 1: up to label15
+.LBB0_132:                              #   in Loop: Header=BB0_22 Depth=1
 	end_block                       # label16:
-	i32.const	$11=, 41
-	br      	1               # 1: up to label14
-.LBB0_131:                              #   in Loop: Header=BB0_23 Depth=1
-	end_block                       # label15:
-	i32.const	$11=, 46
-	br      	0               # 0: up to label14
-.LBB0_132:
+	i32.const	$11=, 47
+	br      	0               # 0: up to label15
+.LBB0_133:
 	end_loop
 	.endfunc
 .Lfunc_end0:
@@ -953,7 +938,7 @@ mymemcmp:                               # @mymemcmp
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.const	$push16=, 0
 	i64.load	$push0=, .L.str+7($pop16):p2align=0
@@ -977,12 +962,12 @@ main:                                   # @main
 	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
+	br_if   	0, $pop9        # 0: down to label89
+# %bb.1:                                # %cleanup
 	i32.const	$push18=, 0
 	return  	$pop18
 .LBB1_2:                                # %if.then26
-	end_block                       # label87:
+	end_block                       # label89:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -1010,5 +995,5 @@ buf:
 	.size	.L.str.1, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38151.c.s b/test/torture-s/pr38151.c.s
index 6c437f564..c31673aa0 100644
--- a/test/torture-s/pr38151.c.s
+++ b/test/torture-s/pr38151.c.s
@@ -7,20 +7,18 @@
 check2848va:                            # @check2848va
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push20=, 0
 	i32.load	$push19=, __stack_pointer($pop20)
 	i32.const	$push21=, 16
-	i32.sub 	$push26=, $pop19, $pop21
-	tee_local	$push25=, $3=, $pop26
-	i32.store	12($pop25), $1
+	i32.sub 	$3=, $pop19, $pop21
+	i32.store	12($3), $1
 	i32.const	$push0=, 15
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -16
-	i32.and 	$push24=, $pop1, $pop2
-	tee_local	$push23=, $1=, $pop24
+	i32.and 	$1=, $pop1, $pop2
 	i32.const	$push3=, 16
-	i32.add 	$push4=, $pop23, $pop3
+	i32.add 	$push4=, $1, $pop3
 	i32.store	12($3), $pop4
 	i32.load	$2=, 8($1)
 	i32.load	$3=, 4($1)
@@ -30,32 +28,32 @@ check2848va:                            # @check2848va
 	i32.load	$push5=, 0($1)
 	i32.eq  	$push7=, $pop6, $pop5
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push28=, 0
-	i32.const	$push27=, 0
-	i32.load	$push8=, fails($pop27)
+# %bb.1:                                # %if.then
+	i32.const	$push24=, 0
+	i32.const	$push23=, 0
+	i32.load	$push8=, fails($pop23)
 	i32.const	$push9=, 1
 	i32.add 	$push10=, $pop8, $pop9
-	i32.store	fails($pop28), $pop10
+	i32.store	fails($pop24), $pop10
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	block   	
-	i32.const	$push29=, 0
-	i32.load	$push12=, s2848+4($pop29)
+	i32.const	$push25=, 0
+	i32.load	$push12=, s2848+4($pop25)
 	i32.ne  	$push13=, $pop12, $3
 	br_if   	0, $pop13       # 0: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push30=, 0
-	i32.load	$push11=, s2848+8($pop30)
+# %bb.3:                                # %if.end
+	i32.const	$push26=, 0
+	i32.load	$push11=, s2848+8($pop26)
 	i32.ne  	$push14=, $pop11, $2
 	br_if   	0, $pop14       # 0: down to label1
-# BB#4:                                 # %if.end4
+# %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	$push27=, 0
+	i32.load	$push16=, fails($pop27)
 	i32.const	$push17=, 1
 	i32.add 	$push18=, $pop16, $pop17
 	i32.store	fails($pop15), $pop18
@@ -71,14 +69,13 @@ check2848va:                            # @check2848va
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push17=, 0
 	i32.const	$push0=, -218144346
 	i32.store	s2848+8($pop17), $pop0
@@ -98,13 +95,13 @@ main:                                   # @main
 	i32.const	$push13=, 0
 	i32.load	$push3=, fails($pop13)
 	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	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
+	i32.const	$push18=, 0
+	return  	$pop18
 .LBB1_2:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -132,5 +129,5 @@ fails:
 	.size	fails, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38212.c.s b/test/torture-s/pr38212.c.s
index 2370a364e..5267f35a5 100644
--- a/test/torture-s/pr38212.c.s
+++ b/test/torture-s/pr38212.c.s
@@ -8,14 +8,13 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $1, $pop0
 	i32.sub 	$push2=, $0, $pop1
 	i32.const	$push3=, 4
-	i32.add 	$push8=, $pop2, $pop3
-	tee_local	$push7=, $1=, $pop8
-	i32.load	$2=, 0($pop7)
+	i32.add 	$1=, $pop2, $pop3
+	i32.load	$2=, 0($1)
 	i32.const	$push4=, 1
 	i32.store	0($0), $pop4
 	i32.load	$push5=, 0($1)
@@ -32,14 +31,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push15=, $pop3, $pop5
-	tee_local	$push14=, $0=, $pop15
-	i32.store	__stack_pointer($pop6), $pop14
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push13=, 0
 	i32.store	12($0), $pop13
 	block   	
@@ -50,13 +48,13 @@ main:                                   # @main
 	i32.const	$push12=, 1
 	i32.ne  	$push2=, $pop1, $pop12
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 0
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $0, $pop7
 	i32.store	__stack_pointer($pop9), $pop8
-	i32.const	$push16=, 0
-	return  	$pop16
+	i32.const	$push14=, 0
+	return  	$pop14
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -66,5 +64,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38236.c.s b/test/torture-s/pr38236.c.s
index 166bc8080..6fd03b3d2 100644
--- a/test/torture-s/pr38236.c.s
+++ b/test/torture-s/pr38236.c.s
@@ -8,14 +8,13 @@ foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop4, $pop6
-	tee_local	$push13=, $4=, $pop14
+	i32.sub 	$4=, $pop4, $pop6
 	i32.const	$push7=, 12
-	i32.add 	$push8=, $pop13, $pop7
+	i32.add 	$push8=, $4, $pop7
 	i32.const	$push9=, 8
 	i32.add 	$push10=, $4, $pop9
 	i32.select	$push0=, $pop8, $pop10, $3
@@ -37,7 +36,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 0
 	i32.const	$push0=, 1
@@ -46,7 +45,7 @@ main:                                   # @main
 	i32.const	$push3=, 1
 	i32.ne  	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -58,5 +57,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38422.c.s b/test/torture-s/pr38422.c.s
index e85ccaef8..b89b70c44 100644
--- a/test/torture-s/pr38422.c.s
+++ b/test/torture-s/pr38422.c.s
@@ -6,19 +6,18 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, s($pop10)
-	tee_local	$push8=, $0=, $pop9
+	i32.load	$0=, s($pop0)
+	i32.const	$push8=, 0
 	i32.const	$push3=, 1
-	i32.shl 	$push4=, $pop8, $pop3
+	i32.shl 	$push4=, $0, $pop3
 	i32.const	$push5=, 1073741822
 	i32.and 	$push6=, $pop4, $pop5
 	i32.const	$push1=, -1073741824
 	i32.and 	$push2=, $0, $pop1
 	i32.or  	$push7=, $pop6, $pop2
-	i32.store	s($pop0), $pop7
+	i32.store	s($pop8), $pop7
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -30,7 +29,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push7=, 0
 	i32.load	$push1=, s($pop7)
@@ -55,4 +54,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr38533.c.s b/test/torture-s/pr38533.c.s
index 646c4346f..09c90f68b 100644
--- a/test/torture-s/pr38533.c.s
+++ b/test/torture-s/pr38533.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.result 	i32
 	.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, 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, 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, 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, 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, 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, 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, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$302=, 0
 	i32.const	$0=, 0
 	#APP
@@ -1230,11 +1230,11 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.call	$push0=, foo@FUNCTION
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push1=, 0
 	return  	$pop1
 .LBB1_2:                                # %if.then
@@ -1246,5 +1246,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr38819.c.s b/test/torture-s/pr38819.c.s
index b15884b0a..8e0986ad2 100644
--- a/test/torture-s/pr38819.c.s
+++ b/test/torture-s/pr38819.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.body
+# %bb.0:                                # %for.body
 	i32.const	$push0=, 0
 	i32.load	$drop=, a($pop0)
 	i32.const	$push1=, 0
@@ -67,5 +67,5 @@ r:
 	.size	r, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr38969.c.s b/test/torture-s/pr38969.c.s
index a908864e3..57ea89e46 100644
--- a/test/torture-s/pr38969.c.s
+++ b/test/torture-s/pr38969.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1):p2align=2
 	i64.store	0($0):p2align=2, $pop0
                                         # fallthrough-return
@@ -21,17 +21,15 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 32
-	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	8($3), $pop12
+	i32.sub 	$3=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $3
+	i64.load	$2=, 0($1):p2align=2
+	i64.store	8($3), $2
 	i64.store	16($3), $2
 	i32.const	$push8=, 24
 	i32.add 	$push9=, $3, $pop8
@@ -56,14 +54,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 32
-	i32.sub 	$push21=, $pop8, $pop10
-	tee_local	$push20=, $0=, $pop21
-	i32.store	__stack_pointer($pop11), $pop20
+	i32.sub 	$0=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $0
 	i64.const	$push1=, 4767060206663237632
 	i64.store	8($0), $pop1
 	i64.const	$push19=, 4767060206663237632
@@ -78,12 +75,12 @@ main:                                   # @main
 	f32.const	$push2=, 0x1.2p3
 	f32.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f32.load	$push0=, 28($0)
 	f32.const	$push5=, 0x1.5p5
 	f32.ne  	$push6=, $pop0, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push14=, 0
 	i32.const	$push12=, 32
 	i32.add 	$push13=, $0, $pop12
@@ -99,5 +96,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39100.c.s b/test/torture-s/pr39100.c.s
index 1a9d0774b..f42bf5b38 100644
--- a/test/torture-s/pr39100.c.s
+++ b/test/torture-s/pr39100.c.s
@@ -8,21 +8,20 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push22=, $pop8, $pop10
-	tee_local	$push21=, $8=, $pop22
+	i32.sub 	$8=, $pop8, $pop10
 	i32.const	$push20=, 0
-	i32.store	12($pop21), $pop20
+	i32.store	12($8), $pop20
 	i32.const	$push19=, 0
 	i32.store	8($8), $pop19
 	block   	
 	block   	
-	i32.eqz 	$push31=, $1
-	br_if   	0, $pop31       # 0: down to label1
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push27=, $1
+	br_if   	0, $pop27       # 0: down to label1
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push15=, 12
 	i32.add 	$push16=, $8, $pop15
 	copy_local	$6=, $pop16
@@ -34,24 +33,23 @@ foo:                                    # @foo
 .LBB0_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push24=, 4
-	i32.add 	$2=, $1, $pop24
+	i32.const	$push22=, 4
+	i32.add 	$2=, $1, $pop22
 	i32.load	$3=, 4($1)
 	block   	
 	block   	
 	i32.load8_u	$push0=, 0($1)
-	i32.const	$push23=, 1
-	i32.and 	$push1=, $pop0, $pop23
+	i32.const	$push21=, 1
+	i32.and 	$push1=, $pop0, $pop21
 	br_if   	0, $pop1        # 0: down to label4
-# BB#3:                                 # %if.else
+# %bb.3:                                # %if.else
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push28=, 4
-	i32.add 	$push27=, $0, $pop28
-	tee_local	$push26=, $7=, $pop27
+	i32.const	$push24=, 4
+	i32.add 	$7=, $0, $pop24
 	i32.load16_u	$push5=, 0($7)
-	i32.const	$push25=, 1
-	i32.add 	$push6=, $pop5, $pop25
-	i32.store16	0($pop26), $pop6
+	i32.const	$push23=, 1
+	i32.add 	$push6=, $pop5, $pop23
+	i32.store16	0($7), $pop6
 	copy_local	$7=, $5
 	copy_local	$5=, $2
 	br      	1               # 1: down to label3
@@ -59,8 +57,8 @@ foo:                                    # @foo
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label4:
 	i32.load16_u	$push3=, 0($4)
-	i32.const	$push29=, 1
-	i32.add 	$push4=, $pop3, $pop29
+	i32.const	$push25=, 1
+	i32.add 	$push4=, $pop3, $pop25
 	i32.store16	0($4), $pop4
 	copy_local	$7=, $6
 	copy_local	$6=, $2
@@ -70,7 +68,7 @@ foo:                                    # @foo
 	i32.store	0($7), $1
 	copy_local	$1=, $3
 	br_if   	0, $3           # 0: up to label2
-# BB#6:                                 # %while.end.loopexit
+# %bb.6:                                # %while.end.loopexit
 	end_loop
 	i32.load	$1=, 8($8)
 	br      	1               # 1: down to label0
@@ -86,12 +84,12 @@ foo:                                    # @foo
 .LBB0_8:                                # %while.end
 	end_block                       # label0:
 	i32.store	0($6), $1
-	i32.const	$push30=, 0
-	i32.store	0($5), $pop30
+	i32.const	$push26=, 0
+	i32.store	0($5), $pop26
 	i32.load	$push7=, 12($8)
 	i32.store	0($0), $pop7
-	copy_local	$push32=, $0
-                                        # fallthrough-return: $pop32
+	copy_local	$push28=, $0
+                                        # fallthrough-return: $pop28
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -103,50 +101,47 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push17=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$2=, $pop14, $pop16
+	i32.const	$push17=, 0
+	i32.store	__stack_pointer($pop17), $2
 	i64.const	$push0=, 0
 	i64.store	24($2), $pop0
 	i32.const	$push1=, 8
-	i32.or  	$push27=, $2, $pop1
-	tee_local	$push26=, $0=, $pop27
-	i32.store	4($2), $pop26
+	i32.or  	$0=, $2, $pop1
+	i32.store	4($2), $0
 	i32.const	$push2=, 0
 	i32.store	0($2), $pop2
 	i64.const	$push3=, 1
 	i64.store	8($2), $pop3
-	block   	
 	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.call	$1=, foo@FUNCTION, $pop22, $2
+	block   	
+	i32.load16_u	$push4=, 4($1)
 	i32.const	$push23=, 1
 	i32.ne  	$push5=, $pop4, $pop23
 	br_if   	0, $pop5        # 0: down to label5
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load16_u	$push6=, 6($1)
-	i32.const	$push30=, 1
-	i32.ne  	$push7=, $pop6, $pop30
+	i32.const	$push24=, 1
+	i32.ne  	$push7=, $pop6, $pop24
 	br_if   	0, $pop7        # 0: down to label5
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.load	$push8=, 24($2)
 	i32.ne  	$push9=, $pop8, $0
 	br_if   	0, $pop9        # 0: down to label5
-# BB#3:                                 # %if.end13
+# %bb.3:                                # %if.end13
 	i32.load	$push10=, 12($2)
 	i32.ne  	$push11=, $pop10, $2
 	br_if   	0, $pop11       # 0: down to label5
-# BB#4:                                 # %if.end20
+# %bb.4:                                # %if.end20
 	i32.load	$push12=, 4($2)
 	br_if   	0, $pop12       # 0: down to label5
-# BB#5:                                 # %if.end24
+# %bb.5:                                # %if.end24
 	i32.const	$push20=, 0
 	i32.const	$push18=, 32
 	i32.add 	$push19=, $2, $pop18
@@ -162,5 +157,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39120.c.s b/test/torture-s/pr39120.c.s
index 13b9e3b2d..01e4028f6 100644
--- a/test/torture-s/pr39120.c.s
+++ b/test/torture-s/pr39120.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ foo:                                    # @foo
 	.globl	bar
 	.type	bar,@function
 bar:                                    # @bar
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, x($pop0)
 	i32.const	$push2=, 1
@@ -36,35 +36,33 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push17=, $pop3, $pop5
-	tee_local	$push16=, $1=, $pop17
-	i32.store	__stack_pointer($pop6), $pop16
-	i32.const	$push15=, 0
-	i32.store	12($1), $pop15
-	i32.const	$push14=, 0
+	i32.sub 	$1=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $1
+	i32.const	$push13=, 0
+	i32.store	12($1), $pop13
 	i32.const	$push10=, 12
 	i32.add 	$push11=, $1, $pop10
-	i32.call	$push13=, foo@FUNCTION, $pop11
-	tee_local	$push12=, $0=, $pop13
-	i32.store	x($pop14), $pop12
+	i32.call	$0=, foo@FUNCTION, $pop11
+	i32.const	$push12=, 0
+	i32.store	x($pop12), $0
 	call    	bar@FUNCTION
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 0
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $1, $pop7
 	i32.store	__stack_pointer($pop9), $pop8
-	i32.const	$push18=, 0
-	return  	$pop18
+	i32.const	$push14=, 0
+	return  	$pop14
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -83,5 +81,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39228.c.s b/test/torture-s/pr39228.c.s
index dfe9b3c04..53768ad70 100644
--- a/test/torture-s/pr39228.c.s
+++ b/test/torture-s/pr39228.c.s
@@ -6,21 +6,21 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, infinity
 	i32.call	$push1=, __builtin_isinff@FUNCTION, $pop0
 	i32.const	$push8=, 0
 	i32.le_s	$push2=, $pop1, $pop8
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end4
+# %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	$push6=, $pop5, $pop9
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end8
+# %bb.2:                                # %if.end8
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB0_3:                                # %if.then
@@ -32,7 +32,7 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5bb1fa276..ec218ce4a 100644
--- a/test/torture-s/pr39233.c.s
+++ b/test/torture-s/pr39233.c.s
@@ -6,16 +6,16 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 7
 	i32.ge_s	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -31,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, 5
@@ -53,5 +53,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39240.c.s b/test/torture-s/pr39240.c.s
index 51dc453f1..8cb8df13f 100644
--- a/test/torture-s/pr39240.c.s
+++ b/test/torture-s/pr39240.c.s
@@ -7,7 +7,7 @@
 bar1:                                   # @bar1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo1@FUNCTION, $pop1
@@ -21,7 +21,7 @@ bar1:                                   # @bar1
 foo1:                                   # @foo1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -35,7 +35,7 @@ foo1:                                   # @foo1
 bar2:                                   # @bar2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo2@FUNCTION, $pop1
@@ -51,7 +51,7 @@ bar2:                                   # @bar2
 foo2:                                   # @foo2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push3=, 16
@@ -68,7 +68,7 @@ foo2:                                   # @foo2
 bar3:                                   # @bar3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo3@FUNCTION, $pop1
@@ -84,7 +84,7 @@ bar3:                                   # @bar3
 foo3:                                   # @foo3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push3=, 24
@@ -101,7 +101,7 @@ foo3:                                   # @foo3
 bar4:                                   # @bar4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo4@FUNCTION, $pop1
@@ -115,7 +115,7 @@ bar4:                                   # @bar4
 foo4:                                   # @foo4
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	copy_local	$push0=, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -129,7 +129,7 @@ foo4:                                   # @foo4
 bar5:                                   # @bar5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo5@FUNCTION, $pop1
@@ -147,7 +147,7 @@ bar5:                                   # @bar5
 foo5:                                   # @foo5
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 65535
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -162,7 +162,7 @@ foo5:                                   # @foo5
 bar6:                                   # @bar6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo6@FUNCTION, $pop1
@@ -180,7 +180,7 @@ bar6:                                   # @bar6
 foo6:                                   # @foo6
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 255
 	i32.and 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -194,7 +194,7 @@ foo6:                                   # @foo6
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push20=, -10
 	i32.call	$push0=, bar1@FUNCTION, $pop20
@@ -202,42 +202,42 @@ main:                                   # @main
 	i32.load	$push1=, l1($pop19)
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	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
+# %bb.2:                                # %if.end5
 	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
+# %bb.3:                                # %if.end11
 	i32.const	$push26=, -10
 	i32.call	$push9=, bar4@FUNCTION, $pop26
 	i32.const	$push25=, 0
 	i32.load	$push10=, l4($pop25)
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	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
+# %bb.5:                                # %if.end22
 	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
+# %bb.6:                                # %if.end28
 	i32.const	$push18=, 0
 	return  	$pop18
 .LBB12_7:                               # %if.then
@@ -303,5 +303,5 @@ l6:
 	.size	l6, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39339.c.s b/test/torture-s/pr39339.c.s
index 3960f8b16..13924368a 100644
--- a/test/torture-s/pr39339.c.s
+++ b/test/torture-s/pr39339.c.s
@@ -6,55 +6,50 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 12
-	i32.add 	$push1=, $0, $pop21
-	i32.load	$6=, 0($pop1)
-	i32.load	$push3=, 0($3)
-	i32.load	$push4=, 0($pop3)
+	.local  	i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push15=, 12
+	i32.add 	$push1=, $0, $pop15
+	i32.load	$4=, 0($pop1)
 	i32.load	$push0=, 4($0)
 	i32.const	$push2=, 3
-	i32.shl 	$push20=, $pop0, $pop2
-	tee_local	$push19=, $5=, $pop20
-	i32.add 	$push18=, $pop4, $pop19
-	tee_local	$push17=, $0=, $pop18
-	i32.store	0($pop17), $1
+	i32.shl 	$5=, $pop0, $pop2
+	i32.load	$push3=, 0($3)
+	i32.load	$push4=, 0($pop3)
+	i32.add 	$0=, $pop4, $5
+	i32.store	0($0), $1
 	i32.const	$push7=, -16
-	i32.and 	$push8=, $6, $pop7
+	i32.and 	$push8=, $4, $pop7
 	i32.const	$push5=, 15
 	i32.and 	$push6=, $2, $pop5
-	i32.or  	$push16=, $pop8, $pop6
-	tee_local	$push15=, $6=, $pop16
-	i32.store	4($0), $pop15
+	i32.or  	$4=, $pop8, $pop6
+	i32.store	4($0), $4
 	block   	
 	i32.const	$push10=, 2
 	i32.lt_s	$push11=, $2, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$push9=, 4194304
-	i32.or  	$4=, $6, $pop9
-	i32.const	$push23=, -1
-	i32.add 	$0=, $2, $pop23
-	i32.const	$push22=, 12
-	i32.add 	$2=, $5, $pop22
+	i32.or  	$4=, $4, $pop9
+	i32.const	$push17=, -1
+	i32.add 	$2=, $2, $pop17
+	i32.const	$push16=, 12
+	i32.add 	$0=, $5, $pop16
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	i32.load	$push12=, 0($3)
 	i32.load	$push13=, 0($pop12)
-	i32.add 	$push30=, $pop13, $2
-	tee_local	$push29=, $6=, $pop30
-	i32.store	0($pop29), $4
-	i32.const	$push28=, -4
-	i32.add 	$push14=, $6, $pop28
+	i32.add 	$5=, $pop13, $0
+	i32.store	0($5), $4
+	i32.const	$push20=, -4
+	i32.add 	$push14=, $5, $pop20
 	i32.store	0($pop14), $1
-	i32.const	$push27=, 8
-	i32.add 	$2=, $2, $pop27
-	i32.const	$push26=, -1
-	i32.add 	$push25=, $0, $pop26
-	tee_local	$push24=, $0=, $pop25
-	br_if   	0, $pop24       # 0: up to label1
+	i32.const	$push19=, -1
+	i32.add 	$2=, $2, $pop19
+	i32.const	$push18=, 8
+	i32.add 	$0=, $0, $pop18
+	br_if   	0, $2           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
@@ -70,14 +65,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push22=, 0
+# %bb.0:                                # %entry
 	i32.const	$push20=, 0
 	i32.load	$push19=, __stack_pointer($pop20)
 	i32.const	$push21=, 64
-	i32.sub 	$push38=, $pop19, $pop21
-	tee_local	$push37=, $0=, $pop38
-	i32.store	__stack_pointer($pop22), $pop37
+	i32.sub 	$0=, $pop19, $pop21
+	i32.const	$push22=, 0
+	i32.store	__stack_pointer($pop22), $0
 	i32.const	$push2=, 56
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -118,12 +112,12 @@ main:                                   # @main
 	i32.const	$push32=, 1434451954
 	i32.ne  	$push15=, $pop14, $pop32
 	br_if   	0, $pop15       # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.load	$push16=, 28($0)
-	i32.const	$push39=, 1434451954
-	i32.ne  	$push17=, $pop16, $pop39
+	i32.const	$push37=, 1434451954
+	i32.ne  	$push17=, $pop16, $pop37
 	br_if   	0, $pop17       # 0: down to label2
-# BB#2:                                 # %if.end13
+# %bb.2:                                # %if.end13
 	i32.const	$push25=, 0
 	i32.const	$push23=, 64
 	i32.add 	$push24=, $0, $pop23
@@ -152,5 +146,5 @@ main:                                   # @main
 	.size	.Lmain.e, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr39501.c.s b/test/torture-s/pr39501.c.s
index 7fd03c10d..d7a257851 100644
--- a/test/torture-s/pr39501.c.s
+++ b/test/torture-s/pr39501.c.s
@@ -7,7 +7,7 @@
 float_min1:                             # @float_min1
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.lt  	$push0=, $0, $1
 	f32.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ float_min1:                             # @float_min1
 float_min2:                             # @float_min2
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.le  	$push0=, $0, $1
 	f32.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ float_min2:                             # @float_min2
 float_max1:                             # @float_max1
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.gt  	$push0=, $0, $1
 	f32.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -52,7 +52,7 @@ float_max1:                             # @float_max1
 float_max2:                             # @float_max2
 	.param  	f32, f32
 	.result 	f32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f32.ge  	$push0=, $0, $1
 	f32.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -67,7 +67,7 @@ float_max2:                             # @float_max2
 double_min1:                            # @double_min1
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.lt  	$push0=, $0, $1
 	f64.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -82,7 +82,7 @@ double_min1:                            # @double_min1
 double_min2:                            # @double_min2
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.le  	$push0=, $0, $1
 	f64.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -97,7 +97,7 @@ double_min2:                            # @double_min2
 double_max1:                            # @double_max1
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.gt  	$push0=, $0, $1
 	f64.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -112,7 +112,7 @@ double_max1:                            # @double_max1
 double_max2:                            # @double_max2
 	.param  	f64, f64
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	f64.ge  	$push0=, $0, $1
 	f64.select	$push1=, $0, $1, $pop0
                                         # fallthrough-return: $pop1
@@ -126,7 +126,7 @@ double_max2:                            # @double_max2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	f32.const	$push99=, 0x0p0
@@ -135,329 +135,329 @@ main:                                   # @main
 	f32.const	$push97=, -0x1p0
 	f32.ne  	$push1=, $pop0, $pop97
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	f32.const	$push102=, -0x1p0
 	f32.const	$push101=, 0x0p0
 	f32.call	$push2=, float_min1@FUNCTION, $pop102, $pop101
 	f32.const	$push100=, -0x1p0
 	f32.ne  	$push3=, $pop2, $pop100
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	f32.const	$push105=, 0x0p0
 	f32.const	$push104=, 0x1p0
 	f32.call	$push4=, float_min1@FUNCTION, $pop105, $pop104
 	f32.const	$push103=, 0x0p0
 	f32.ne  	$push5=, $pop4, $pop103
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	f32.const	$push108=, 0x1p0
 	f32.const	$push107=, 0x0p0
 	f32.call	$push6=, float_min1@FUNCTION, $pop108, $pop107
 	f32.const	$push106=, 0x0p0
 	f32.ne  	$push7=, $pop6, $pop106
 	br_if   	0, $pop7        # 0: down to label1
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	f32.const	$push111=, -0x1p0
 	f32.const	$push110=, 0x1p0
 	f32.call	$push8=, float_min1@FUNCTION, $pop111, $pop110
 	f32.const	$push109=, -0x1p0
 	f32.ne  	$push9=, $pop8, $pop109
 	br_if   	0, $pop9        # 0: down to label1
-# BB#5:                                 # %if.end16
+# %bb.5:                                # %if.end16
 	f32.const	$push114=, 0x1p0
 	f32.const	$push113=, -0x1p0
 	f32.call	$push10=, float_min1@FUNCTION, $pop114, $pop113
 	f32.const	$push112=, -0x1p0
 	f32.ne  	$push11=, $pop10, $pop112
 	br_if   	0, $pop11       # 0: down to label1
-# BB#6:                                 # %if.end20
+# %bb.6:                                # %if.end20
 	f32.const	$push117=, 0x0p0
 	f32.const	$push116=, -0x1p0
 	f32.call	$push12=, float_max1@FUNCTION, $pop117, $pop116
 	f32.const	$push115=, 0x0p0
 	f32.ne  	$push13=, $pop12, $pop115
 	br_if   	0, $pop13       # 0: down to label1
-# BB#7:                                 # %if.end24
+# %bb.7:                                # %if.end24
 	f32.const	$push120=, -0x1p0
 	f32.const	$push119=, 0x0p0
 	f32.call	$push14=, float_max1@FUNCTION, $pop120, $pop119
 	f32.const	$push118=, 0x0p0
 	f32.ne  	$push15=, $pop14, $pop118
 	br_if   	0, $pop15       # 0: down to label1
-# BB#8:                                 # %if.end28
+# %bb.8:                                # %if.end28
 	f32.const	$push123=, 0x0p0
 	f32.const	$push122=, 0x1p0
 	f32.call	$push16=, float_max1@FUNCTION, $pop123, $pop122
 	f32.const	$push121=, 0x1p0
 	f32.ne  	$push17=, $pop16, $pop121
 	br_if   	0, $pop17       # 0: down to label1
-# BB#9:                                 # %if.end32
+# %bb.9:                                # %if.end32
 	f32.const	$push126=, 0x1p0
 	f32.const	$push125=, 0x0p0
 	f32.call	$push18=, float_max1@FUNCTION, $pop126, $pop125
 	f32.const	$push124=, 0x1p0
 	f32.ne  	$push19=, $pop18, $pop124
 	br_if   	0, $pop19       # 0: down to label1
-# BB#10:                                # %if.end36
+# %bb.10:                               # %if.end36
 	f32.const	$push129=, -0x1p0
 	f32.const	$push128=, 0x1p0
 	f32.call	$push20=, float_max1@FUNCTION, $pop129, $pop128
 	f32.const	$push127=, 0x1p0
 	f32.ne  	$push21=, $pop20, $pop127
 	br_if   	0, $pop21       # 0: down to label1
-# BB#11:                                # %if.end40
+# %bb.11:                               # %if.end40
 	f32.const	$push132=, 0x1p0
 	f32.const	$push131=, -0x1p0
 	f32.call	$push22=, float_max1@FUNCTION, $pop132, $pop131
 	f32.const	$push130=, 0x1p0
 	f32.ne  	$push23=, $pop22, $pop130
 	br_if   	0, $pop23       # 0: down to label1
-# BB#12:                                # %if.end44
+# %bb.12:                               # %if.end44
 	f32.const	$push135=, 0x0p0
 	f32.const	$push134=, -0x1p0
 	f32.call	$push24=, float_min2@FUNCTION, $pop135, $pop134
 	f32.const	$push133=, -0x1p0
 	f32.ne  	$push25=, $pop24, $pop133
 	br_if   	0, $pop25       # 0: down to label1
-# BB#13:                                # %if.end48
+# %bb.13:                               # %if.end48
 	f32.const	$push138=, -0x1p0
 	f32.const	$push137=, 0x0p0
 	f32.call	$push26=, float_min2@FUNCTION, $pop138, $pop137
 	f32.const	$push136=, -0x1p0
 	f32.ne  	$push27=, $pop26, $pop136
 	br_if   	0, $pop27       # 0: down to label1
-# BB#14:                                # %if.end52
+# %bb.14:                               # %if.end52
 	f32.const	$push141=, 0x0p0
 	f32.const	$push140=, 0x1p0
 	f32.call	$push28=, float_min2@FUNCTION, $pop141, $pop140
 	f32.const	$push139=, 0x0p0
 	f32.ne  	$push29=, $pop28, $pop139
 	br_if   	0, $pop29       # 0: down to label1
-# BB#15:                                # %if.end56
+# %bb.15:                               # %if.end56
 	f32.const	$push144=, 0x1p0
 	f32.const	$push143=, 0x0p0
 	f32.call	$push30=, float_min2@FUNCTION, $pop144, $pop143
 	f32.const	$push142=, 0x0p0
 	f32.ne  	$push31=, $pop30, $pop142
 	br_if   	0, $pop31       # 0: down to label1
-# BB#16:                                # %if.end60
+# %bb.16:                               # %if.end60
 	f32.const	$push147=, -0x1p0
 	f32.const	$push146=, 0x1p0
 	f32.call	$push32=, float_min2@FUNCTION, $pop147, $pop146
 	f32.const	$push145=, -0x1p0
 	f32.ne  	$push33=, $pop32, $pop145
 	br_if   	0, $pop33       # 0: down to label1
-# BB#17:                                # %if.end64
+# %bb.17:                               # %if.end64
 	f32.const	$push150=, 0x1p0
 	f32.const	$push149=, -0x1p0
 	f32.call	$push34=, float_min2@FUNCTION, $pop150, $pop149
 	f32.const	$push148=, -0x1p0
 	f32.ne  	$push35=, $pop34, $pop148
 	br_if   	0, $pop35       # 0: down to label1
-# BB#18:                                # %if.end68
+# %bb.18:                               # %if.end68
 	f32.const	$push153=, 0x0p0
 	f32.const	$push152=, -0x1p0
 	f32.call	$push36=, float_max2@FUNCTION, $pop153, $pop152
 	f32.const	$push151=, 0x0p0
 	f32.ne  	$push37=, $pop36, $pop151
 	br_if   	0, $pop37       # 0: down to label1
-# BB#19:                                # %if.end72
+# %bb.19:                               # %if.end72
 	f32.const	$push156=, -0x1p0
 	f32.const	$push155=, 0x0p0
 	f32.call	$push38=, float_max2@FUNCTION, $pop156, $pop155
 	f32.const	$push154=, 0x0p0
 	f32.ne  	$push39=, $pop38, $pop154
 	br_if   	0, $pop39       # 0: down to label1
-# BB#20:                                # %if.end76
+# %bb.20:                               # %if.end76
 	f32.const	$push159=, 0x0p0
 	f32.const	$push158=, 0x1p0
 	f32.call	$push40=, float_max2@FUNCTION, $pop159, $pop158
 	f32.const	$push157=, 0x1p0
 	f32.ne  	$push41=, $pop40, $pop157
 	br_if   	0, $pop41       # 0: down to label1
-# BB#21:                                # %if.end80
+# %bb.21:                               # %if.end80
 	f32.const	$push162=, 0x1p0
 	f32.const	$push161=, 0x0p0
 	f32.call	$push42=, float_max2@FUNCTION, $pop162, $pop161
 	f32.const	$push160=, 0x1p0
 	f32.ne  	$push43=, $pop42, $pop160
 	br_if   	0, $pop43       # 0: down to label1
-# BB#22:                                # %if.end84
+# %bb.22:                               # %if.end84
 	f32.const	$push165=, -0x1p0
 	f32.const	$push164=, 0x1p0
 	f32.call	$push44=, float_max2@FUNCTION, $pop165, $pop164
 	f32.const	$push163=, 0x1p0
 	f32.ne  	$push45=, $pop44, $pop163
 	br_if   	0, $pop45       # 0: down to label1
-# BB#23:                                # %if.end88
+# %bb.23:                               # %if.end88
 	f32.const	$push168=, 0x1p0
 	f32.const	$push167=, -0x1p0
 	f32.call	$push46=, float_max2@FUNCTION, $pop168, $pop167
 	f32.const	$push166=, 0x1p0
 	f32.ne  	$push47=, $pop46, $pop166
 	br_if   	0, $pop47       # 0: down to label1
-# BB#24:                                # %if.end92
+# %bb.24:                               # %if.end92
 	f64.const	$push171=, 0x0p0
 	f64.const	$push170=, -0x1p0
 	f64.call	$push48=, double_min1@FUNCTION, $pop171, $pop170
 	f64.const	$push169=, -0x1p0
 	f64.ne  	$push49=, $pop48, $pop169
 	br_if   	0, $pop49       # 0: down to label1
-# BB#25:                                # %if.end96
+# %bb.25:                               # %if.end96
 	f64.const	$push174=, -0x1p0
 	f64.const	$push173=, 0x0p0
 	f64.call	$push50=, double_min1@FUNCTION, $pop174, $pop173
 	f64.const	$push172=, -0x1p0
 	f64.ne  	$push51=, $pop50, $pop172
 	br_if   	0, $pop51       # 0: down to label1
-# BB#26:                                # %if.end100
+# %bb.26:                               # %if.end100
 	f64.const	$push177=, 0x0p0
 	f64.const	$push176=, 0x1p0
 	f64.call	$push52=, double_min1@FUNCTION, $pop177, $pop176
 	f64.const	$push175=, 0x0p0
 	f64.ne  	$push53=, $pop52, $pop175
 	br_if   	0, $pop53       # 0: down to label1
-# BB#27:                                # %if.end104
+# %bb.27:                               # %if.end104
 	f64.const	$push180=, 0x1p0
 	f64.const	$push179=, 0x0p0
 	f64.call	$push54=, double_min1@FUNCTION, $pop180, $pop179
 	f64.const	$push178=, 0x0p0
 	f64.ne  	$push55=, $pop54, $pop178
 	br_if   	0, $pop55       # 0: down to label1
-# BB#28:                                # %if.end108
+# %bb.28:                               # %if.end108
 	f64.const	$push183=, -0x1p0
 	f64.const	$push182=, 0x1p0
 	f64.call	$push56=, double_min1@FUNCTION, $pop183, $pop182
 	f64.const	$push181=, -0x1p0
 	f64.ne  	$push57=, $pop56, $pop181
 	br_if   	0, $pop57       # 0: down to label1
-# BB#29:                                # %if.end112
+# %bb.29:                               # %if.end112
 	f64.const	$push186=, 0x1p0
 	f64.const	$push185=, -0x1p0
 	f64.call	$push58=, double_min1@FUNCTION, $pop186, $pop185
 	f64.const	$push184=, -0x1p0
 	f64.ne  	$push59=, $pop58, $pop184
 	br_if   	0, $pop59       # 0: down to label1
-# BB#30:                                # %if.end116
+# %bb.30:                               # %if.end116
 	f64.const	$push189=, 0x0p0
 	f64.const	$push188=, -0x1p0
 	f64.call	$push60=, double_max1@FUNCTION, $pop189, $pop188
 	f64.const	$push187=, 0x0p0
 	f64.ne  	$push61=, $pop60, $pop187
 	br_if   	0, $pop61       # 0: down to label1
-# BB#31:                                # %if.end120
+# %bb.31:                               # %if.end120
 	f64.const	$push192=, -0x1p0
 	f64.const	$push191=, 0x0p0
 	f64.call	$push62=, double_max1@FUNCTION, $pop192, $pop191
 	f64.const	$push190=, 0x0p0
 	f64.ne  	$push63=, $pop62, $pop190
 	br_if   	0, $pop63       # 0: down to label1
-# BB#32:                                # %if.end124
+# %bb.32:                               # %if.end124
 	f64.const	$push195=, 0x0p0
 	f64.const	$push194=, 0x1p0
 	f64.call	$push64=, double_max1@FUNCTION, $pop195, $pop194
 	f64.const	$push193=, 0x1p0
 	f64.ne  	$push65=, $pop64, $pop193
 	br_if   	0, $pop65       # 0: down to label1
-# BB#33:                                # %if.end128
+# %bb.33:                               # %if.end128
 	f64.const	$push198=, 0x1p0
 	f64.const	$push197=, 0x0p0
 	f64.call	$push66=, double_max1@FUNCTION, $pop198, $pop197
 	f64.const	$push196=, 0x1p0
 	f64.ne  	$push67=, $pop66, $pop196
 	br_if   	0, $pop67       # 0: down to label1
-# BB#34:                                # %if.end132
+# %bb.34:                               # %if.end132
 	f64.const	$push201=, -0x1p0
 	f64.const	$push200=, 0x1p0
 	f64.call	$push68=, double_max1@FUNCTION, $pop201, $pop200
 	f64.const	$push199=, 0x1p0
 	f64.ne  	$push69=, $pop68, $pop199
 	br_if   	0, $pop69       # 0: down to label1
-# BB#35:                                # %if.end136
+# %bb.35:                               # %if.end136
 	f64.const	$push204=, 0x1p0
 	f64.const	$push203=, -0x1p0
 	f64.call	$push70=, double_max1@FUNCTION, $pop204, $pop203
 	f64.const	$push202=, 0x1p0
 	f64.ne  	$push71=, $pop70, $pop202
 	br_if   	0, $pop71       # 0: down to label1
-# BB#36:                                # %if.end140
+# %bb.36:                               # %if.end140
 	f64.const	$push207=, 0x0p0
 	f64.const	$push206=, -0x1p0
 	f64.call	$push72=, double_min2@FUNCTION, $pop207, $pop206
 	f64.const	$push205=, -0x1p0
 	f64.ne  	$push73=, $pop72, $pop205
 	br_if   	0, $pop73       # 0: down to label1
-# BB#37:                                # %if.end144
+# %bb.37:                               # %if.end144
 	f64.const	$push210=, -0x1p0
 	f64.const	$push209=, 0x0p0
 	f64.call	$push74=, double_min2@FUNCTION, $pop210, $pop209
 	f64.const	$push208=, -0x1p0
 	f64.ne  	$push75=, $pop74, $pop208
 	br_if   	0, $pop75       # 0: down to label1
-# BB#38:                                # %if.end148
+# %bb.38:                               # %if.end148
 	f64.const	$push213=, 0x0p0
 	f64.const	$push212=, 0x1p0
 	f64.call	$push76=, double_min2@FUNCTION, $pop213, $pop212
 	f64.const	$push211=, 0x0p0
 	f64.ne  	$push77=, $pop76, $pop211
 	br_if   	0, $pop77       # 0: down to label1
-# BB#39:                                # %if.end152
+# %bb.39:                               # %if.end152
 	f64.const	$push216=, 0x1p0
 	f64.const	$push215=, 0x0p0
 	f64.call	$push78=, double_min2@FUNCTION, $pop216, $pop215
 	f64.const	$push214=, 0x0p0
 	f64.ne  	$push79=, $pop78, $pop214
 	br_if   	0, $pop79       # 0: down to label1
-# BB#40:                                # %if.end156
+# %bb.40:                               # %if.end156
 	f64.const	$push219=, -0x1p0
 	f64.const	$push218=, 0x1p0
 	f64.call	$push80=, double_min2@FUNCTION, $pop219, $pop218
 	f64.const	$push217=, -0x1p0
 	f64.ne  	$push81=, $pop80, $pop217
 	br_if   	0, $pop81       # 0: down to label1
-# BB#41:                                # %if.end160
+# %bb.41:                               # %if.end160
 	f64.const	$push222=, 0x1p0
 	f64.const	$push221=, -0x1p0
 	f64.call	$push82=, double_min2@FUNCTION, $pop222, $pop221
 	f64.const	$push220=, -0x1p0
 	f64.ne  	$push83=, $pop82, $pop220
 	br_if   	0, $pop83       # 0: down to label1
-# BB#42:                                # %if.end164
+# %bb.42:                               # %if.end164
 	f64.const	$push225=, 0x0p0
 	f64.const	$push224=, -0x1p0
 	f64.call	$push84=, double_max2@FUNCTION, $pop225, $pop224
 	f64.const	$push223=, 0x0p0
 	f64.ne  	$push85=, $pop84, $pop223
 	br_if   	0, $pop85       # 0: down to label1
-# BB#43:                                # %if.end168
+# %bb.43:                               # %if.end168
 	f64.const	$push228=, -0x1p0
 	f64.const	$push227=, 0x0p0
 	f64.call	$push86=, double_max2@FUNCTION, $pop228, $pop227
 	f64.const	$push226=, 0x0p0
 	f64.ne  	$push87=, $pop86, $pop226
 	br_if   	0, $pop87       # 0: down to label1
-# BB#44:                                # %if.end172
+# %bb.44:                               # %if.end172
 	f64.const	$push231=, 0x0p0
 	f64.const	$push230=, 0x1p0
 	f64.call	$push88=, double_max2@FUNCTION, $pop231, $pop230
 	f64.const	$push229=, 0x1p0
 	f64.ne  	$push89=, $pop88, $pop229
 	br_if   	0, $pop89       # 0: down to label1
-# BB#45:                                # %if.end176
+# %bb.45:                               # %if.end176
 	f64.const	$push234=, 0x1p0
 	f64.const	$push233=, 0x0p0
 	f64.call	$push90=, double_max2@FUNCTION, $pop234, $pop233
 	f64.const	$push232=, 0x1p0
 	f64.ne  	$push91=, $pop90, $pop232
 	br_if   	0, $pop91       # 0: down to label1
-# BB#46:                                # %if.end180
+# %bb.46:                               # %if.end180
 	f64.const	$push237=, -0x1p0
 	f64.const	$push236=, 0x1p0
 	f64.call	$push92=, double_max2@FUNCTION, $pop237, $pop236
 	f64.const	$push235=, 0x1p0
 	f64.ne  	$push93=, $pop92, $pop235
 	br_if   	0, $pop93       # 0: down to label1
-# BB#47:                                # %if.end184
+# %bb.47:                               # %if.end184
 	f64.const	$push240=, 0x1p0
 	f64.const	$push239=, -0x1p0
 	f64.call	$push94=, double_max2@FUNCTION, $pop240, $pop239
@@ -478,6 +478,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end8-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr40022.c.s b/test/torture-s/pr40022.c.s
index d8bcf2ffb..017f63cf0 100644
--- a/test/torture-s/pr40022.c.s
+++ b/test/torture-s/pr40022.c.s
@@ -8,17 +8,16 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push4=, $pop0, $pop2
-	tee_local	$push3=, $1=, $pop4
-	i32.store	12($pop3), $0
+	i32.sub 	$1=, $pop0, $pop2
+	i32.store	12($1), $0
 	#APP
 	#NO_APP
-	copy_local	$push5=, $0
-                                        # fallthrough-return: $pop5
+	copy_local	$push3=, $0
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -29,38 +28,32 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.call	$push2=, foo@FUNCTION, $1
-	tee_local	$push1=, $1=, $pop2
-	i32.store	0($0), $pop1
+# %bb.0:                                # %entry
+	i32.call	$1=, foo@FUNCTION, $1
+	i32.store	0($0), $1
 	block   	
-	i32.eqz 	$push13=, $1
-	br_if   	0, $pop13       # 0: down to label0
+	i32.eqz 	$push1=, $1
+	br_if   	0, $pop1        # 0: down to label0
 .LBB1_1:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	copy_local	$push6=, $1
-	tee_local	$push5=, $0=, $pop6
-	i32.load	$push4=, 0($pop5)
-	tee_local	$push3=, $1=, $pop4
-	br_if   	0, $pop3        # 0: up to label1
+	copy_local	$0=, $1
+	i32.load	$1=, 0($0)
+	br_if   	0, $1           # 0: up to label1
 .LBB1_2:                                # %while.end
 	end_loop
 	end_block                       # label0:
-	i32.call	$push8=, foo@FUNCTION, $2
-	tee_local	$push7=, $1=, $pop8
-	i32.store	0($0), $pop7
+	i32.call	$1=, foo@FUNCTION, $2
+	i32.store	0($0), $1
 	block   	
-	i32.eqz 	$push14=, $1
-	br_if   	0, $pop14       # 0: down to label2
+	i32.eqz 	$push2=, $1
+	br_if   	0, $pop2        # 0: down to label2
 .LBB1_3:                                # %while.body4
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	copy_local	$push12=, $1
-	tee_local	$push11=, $0=, $pop12
-	i32.load	$push10=, 0($pop11)
-	tee_local	$push9=, $1=, $pop10
-	br_if   	0, $pop9        # 0: up to label3
+	copy_local	$0=, $1
+	i32.load	$1=, 0($0)
+	br_if   	0, $1           # 0: up to label3
 .LBB1_4:                                # %while.end6
 	end_loop
 	end_block                       # label2:
@@ -78,35 +71,32 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, g
 	i32.store	f($pop1), $pop0
 	i32.const	$push4=, d
 	i32.const	$push3=, e
 	i32.const	$push2=, f
-	i32.const	$push10=, 0
-	call    	bar@FUNCTION, $pop4, $pop3, $pop2, $pop10
+	i32.const	$push8=, 0
+	call    	bar@FUNCTION, $pop4, $pop3, $pop2, $pop8
+	i32.const	$push7=, 0
+	i32.load	$0=, d($pop7)
 	block   	
-	i32.const	$push9=, 0
-	i32.load	$push8=, d($pop9)
-	tee_local	$push7=, $0=, $pop8
-	i32.eqz 	$push15=, $pop7
-	br_if   	0, $pop15       # 0: down to label4
-# BB#1:                                 # %lor.lhs.false
-	i32.load	$push12=, 0($0)
-	tee_local	$push11=, $0=, $pop12
-	i32.eqz 	$push16=, $pop11
-	br_if   	0, $pop16       # 0: down to label4
-# BB#2:                                 # %lor.lhs.false2
-	i32.load	$push14=, 0($0)
-	tee_local	$push13=, $0=, $pop14
-	i32.eqz 	$push17=, $pop13
-	br_if   	0, $pop17       # 0: down to label4
-# BB#3:                                 # %lor.lhs.false6
+	i32.eqz 	$push9=, $0
+	br_if   	0, $pop9        # 0: down to label4
+# %bb.1:                                # %lor.lhs.false
+	i32.load	$0=, 0($0)
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label4
+# %bb.2:                                # %lor.lhs.false2
+	i32.load	$0=, 0($0)
+	i32.eqz 	$push11=, $0
+	br_if   	0, $pop11       # 0: down to label4
+# %bb.3:                                # %lor.lhs.false6
 	i32.load	$push5=, 0($0)
 	br_if   	0, $pop5        # 0: down to label4
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB2_5:                                # %if.then
@@ -154,5 +144,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr40057.c.s b/test/torture-s/pr40057.c.s
index 94027ca55..855c531c7 100644
--- a/test/torture-s/pr40057.c.s
+++ b/test/torture-s/pr40057.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.wrap/i64	$push0=, $0
 	i32.const	$push1=, 31
 	i32.shr_s	$push2=, $pop0, $pop1
@@ -23,7 +23,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.wrap/i64	$push0=, $0
 	i32.const	$push1=, 31
 	i32.shr_s	$push2=, $pop0, $pop1
@@ -38,26 +38,26 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 6042589866
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i64.const	$push2=, 6579460778
 	i32.call	$push3=, foo@FUNCTION, $pop2
 	i32.eqz 	$push9=, $pop3
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i64.const	$push4=, 6042589866
 	i32.call	$push5=, bar@FUNCTION, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	i64.const	$push6=, 6579460778
 	i32.call	$push7=, bar@FUNCTION, $pop6
 	i32.eqz 	$push10=, $pop7
 	br_if   	0, $pop10       # 0: down to label0
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB2_5:                                # %if.then
@@ -69,5 +69,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr40386.c.s b/test/torture-s/pr40386.c.s
index 595d62c94..1ce0396b6 100644
--- a/test/torture-s/pr40386.c.s
+++ b/test/torture-s/pr40386.c.s
@@ -7,215 +7,201 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i64, i64, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load8_s	$push125=, c($pop0)
-	tee_local	$push124=, $0=, $pop125
+	i32.load	$1=, shift1($pop0)
+	i32.const	$push119=, 0
+	i32.load8_s	$0=, c($pop119)
 	i32.const	$push2=, 8
-	i32.const	$push123=, 0
-	i32.load	$push122=, shift1($pop123)
-	tee_local	$push121=, $1=, $pop122
-	i32.sub 	$push120=, $pop2, $pop121
-	tee_local	$push119=, $2=, $pop120
-	i32.shl 	$push3=, $pop124, $pop119
+	i32.sub 	$2=, $pop2, $1
+	block   	
+	i32.shl 	$push3=, $0, $2
 	i32.shr_s	$push1=, $0, $1
 	i32.or  	$push4=, $pop3, $pop1
 	i32.const	$push118=, 835
 	i32.ne  	$push5=, $pop4, $pop118
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 4
 	i32.shr_s	$push8=, $0, $pop6
-	i32.const	$push127=, 4
-	i32.shl 	$push7=, $0, $pop127
+	i32.const	$push121=, 4
+	i32.shl 	$push7=, $0, $pop121
 	i32.or  	$push9=, $pop8, $pop7
-	i32.const	$push126=, 835
-	i32.ne  	$push10=, $pop9, $pop126
+	i32.const	$push120=, 835
+	i32.ne  	$push10=, $pop9, $pop120
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end11
-	i32.const	$push12=, 0
-	i32.load16_s	$push132=, s($pop12)
-	tee_local	$push131=, $3=, $pop132
-	i32.shr_s	$push14=, $pop131, $1
+# %bb.2:                                # %if.end11
 	i32.const	$push11=, 16
-	i32.sub 	$push130=, $pop11, $1
-	tee_local	$push129=, $4=, $pop130
-	i32.shl 	$push13=, $3, $pop129
+	i32.sub 	$4=, $pop11, $1
+	i32.const	$push12=, 0
+	i32.load16_s	$3=, s($pop12)
+	i32.shr_s	$push14=, $3, $1
+	i32.shl 	$push13=, $3, $4
 	i32.or  	$push15=, $pop14, $pop13
-	i32.const	$push128=, -221
-	i32.ne  	$push16=, $pop15, $pop128
+	i32.const	$push122=, -221
+	i32.ne  	$push16=, $pop15, $pop122
 	br_if   	0, $pop16       # 0: down to label0
-# BB#3:                                 # %if.end21
+# %bb.3:                                # %if.end21
 	i32.const	$push19=, 4
 	i32.shr_s	$push20=, $3, $pop19
 	i32.const	$push17=, 12
 	i32.shl 	$push18=, $3, $pop17
 	i32.or  	$push21=, $pop20, $pop18
-	i32.const	$push133=, -221
-	i32.ne  	$push22=, $pop21, $pop133
+	i32.const	$push123=, -221
+	i32.ne  	$push22=, $pop21, $pop123
 	br_if   	0, $pop22       # 0: down to label0
-# BB#4:                                 # %if.end30
-	i32.const	$push24=, 0
-	i32.load	$push138=, i($pop24)
-	tee_local	$push137=, $5=, $pop138
-	i32.shr_s	$push26=, $pop137, $1
+# %bb.4:                                # %if.end30
 	i32.const	$push23=, 32
-	i32.sub 	$push136=, $pop23, $1
-	tee_local	$push135=, $6=, $pop136
-	i32.shl 	$push25=, $5, $pop135
+	i32.sub 	$6=, $pop23, $1
+	i32.const	$push24=, 0
+	i32.load	$5=, i($pop24)
+	i32.shr_s	$push26=, $5, $1
+	i32.shl 	$push25=, $5, $6
 	i32.or  	$push27=, $pop26, $pop25
-	i32.const	$push134=, 1073745699
-	i32.ne  	$push28=, $pop27, $pop134
+	i32.const	$push124=, 1073745699
+	i32.ne  	$push28=, $pop27, $pop124
 	br_if   	0, $pop28       # 0: down to label0
-# BB#5:                                 # %if.end38
+# %bb.5:                                # %if.end38
 	i32.const	$push31=, 4
 	i32.shr_s	$push32=, $5, $pop31
 	i32.const	$push29=, 28
 	i32.shl 	$push30=, $5, $pop29
 	i32.or  	$push33=, $pop32, $pop30
-	i32.const	$push139=, 1073745699
-	i32.ne  	$push34=, $pop33, $pop139
+	i32.const	$push125=, 1073745699
+	i32.ne  	$push34=, $pop33, $pop125
 	br_if   	0, $pop34       # 0: down to label0
-# BB#6:                                 # %if.end45
+# %bb.6:                                # %if.end45
 	i32.const	$push35=, 0
-	i32.load	$push142=, l($pop35)
-	tee_local	$push141=, $7=, $pop142
-	i32.shr_s	$push37=, $pop141, $1
+	i32.load	$7=, l($pop35)
+	i32.shr_s	$push37=, $7, $1
 	i32.shl 	$push36=, $7, $6
 	i32.or  	$push38=, $pop37, $pop36
-	i32.const	$push140=, -14465689
-	i32.ne  	$push39=, $pop38, $pop140
+	i32.const	$push126=, -14465689
+	i32.ne  	$push39=, $pop38, $pop126
 	br_if   	0, $pop39       # 0: down to label0
-# BB#7:                                 # %if.end53
+# %bb.7:                                # %if.end53
 	i32.const	$push42=, 4
 	i32.shr_s	$push43=, $7, $pop42
 	i32.const	$push40=, 28
 	i32.shl 	$push41=, $7, $pop40
 	i32.or  	$push44=, $pop43, $pop41
-	i32.const	$push143=, -14465689
-	i32.ne  	$push45=, $pop44, $pop143
+	i32.const	$push127=, -14465689
+	i32.ne  	$push45=, $pop44, $pop127
 	br_if   	0, $pop45       # 0: down to label0
-# BB#8:                                 # %if.end60
+# %bb.8:                                # %if.end60
+	i64.extend_u/i32	$9=, $1
 	i32.const	$push46=, 0
-	i64.load	$push150=, ll($pop46)
-	tee_local	$push149=, $8=, $pop150
-	i64.extend_u/i32	$push148=, $1
-	tee_local	$push147=, $9=, $pop148
-	i64.shr_s	$push47=, $pop149, $pop147
+	i64.load	$8=, ll($pop46)
 	i32.const	$push48=, 64
 	i32.sub 	$push49=, $pop48, $1
-	i64.extend_u/i32	$push146=, $pop49
-	tee_local	$push145=, $10=, $pop146
-	i64.shl 	$push50=, $8, $pop145
+	i64.extend_u/i32	$10=, $pop49
+	i64.shr_s	$push47=, $8, $9
+	i64.shl 	$push50=, $8, $10
 	i64.or  	$push51=, $pop47, $pop50
-	i64.const	$push144=, 68174490360335855
-	i64.ne  	$push52=, $pop51, $pop144
+	i64.const	$push128=, 68174490360335855
+	i64.ne  	$push52=, $pop51, $pop128
 	br_if   	0, $pop52       # 0: down to label0
-# BB#9:                                 # %if.end69
+# %bb.9:                                # %if.end69
 	i64.const	$push55=, 4
 	i64.shr_s	$push56=, $8, $pop55
 	i64.const	$push53=, 60
 	i64.shl 	$push54=, $8, $pop53
 	i64.or  	$push57=, $pop56, $pop54
-	i64.const	$push151=, 68174490360335855
-	i64.ne  	$push58=, $pop57, $pop151
+	i64.const	$push129=, 68174490360335855
+	i64.ne  	$push58=, $pop57, $pop129
 	br_if   	0, $pop58       # 0: down to label0
-# BB#10:                                # %if.end76
-	i32.const	$push61=, 64
+# %bb.10:                               # %if.end76
 	i32.const	$push59=, 0
-	i32.load	$push158=, shift2($pop59)
-	tee_local	$push157=, $13=, $pop158
-	i32.sub 	$push62=, $pop61, $pop157
-	i64.extend_u/i32	$push156=, $pop62
-	tee_local	$push155=, $12=, $pop156
-	i64.shl 	$push63=, $8, $pop155
-	i64.extend_u/i32	$push154=, $13
-	tee_local	$push153=, $11=, $pop154
-	i64.shr_s	$push60=, $8, $pop153
+	i32.load	$13=, shift2($pop59)
+	i64.extend_u/i32	$11=, $13
+	i32.const	$push61=, 64
+	i32.sub 	$push62=, $pop61, $13
+	i64.extend_u/i32	$12=, $pop62
+	i64.shl 	$push63=, $8, $12
+	i64.shr_s	$push60=, $8, $11
 	i64.or  	$push64=, $pop63, $pop60
-	i64.const	$push152=, -994074541463572736
-	i64.ne  	$push65=, $pop64, $pop152
+	i64.const	$push130=, -994074541463572736
+	i64.ne  	$push65=, $pop64, $pop130
 	br_if   	0, $pop65       # 0: down to label0
-# BB#11:                                # %if.end86
+# %bb.11:                               # %if.end86
 	i64.const	$push68=, 60
 	i64.shr_s	$push69=, $8, $pop68
 	i64.const	$push66=, 4
 	i64.shl 	$push67=, $8, $pop66
 	i64.or  	$push70=, $pop69, $pop67
-	i64.const	$push159=, -994074541463572736
-	i64.ne  	$push71=, $pop70, $pop159
+	i64.const	$push131=, -994074541463572736
+	i64.ne  	$push71=, $pop70, $pop131
 	br_if   	0, $pop71       # 0: down to label0
-# BB#12:                                # %if.end93
+# %bb.12:                               # %if.end93
 	i32.shr_s	$push73=, $0, $2
 	i32.shl 	$push72=, $0, $1
 	i32.or  	$push74=, $pop73, $pop72
 	i32.const	$push75=, 835
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	0, $pop76       # 0: down to label0
-# BB#13:                                # %if.end112
+# %bb.13:                               # %if.end112
 	i32.shl 	$push78=, $3, $1
 	i32.shr_s	$push77=, $3, $4
 	i32.or  	$push79=, $pop78, $pop77
-	i32.const	$push160=, -1
-	i32.ne  	$push80=, $pop79, $pop160
+	i32.const	$push132=, -1
+	i32.ne  	$push80=, $pop79, $pop132
 	br_if   	0, $pop80       # 0: down to label0
-# BB#14:                                # %if.end122
+# %bb.14:                               # %if.end122
 	i32.const	$push83=, 4
 	i32.shl 	$push84=, $3, $pop83
 	i32.const	$push81=, 12
 	i32.shr_s	$push82=, $3, $pop81
 	i32.or  	$push85=, $pop84, $pop82
-	i32.const	$push161=, -1
-	i32.ne  	$push86=, $pop85, $pop161
+	i32.const	$push133=, -1
+	i32.ne  	$push86=, $pop85, $pop133
 	br_if   	0, $pop86       # 0: down to label0
-# BB#15:                                # %if.end131
+# %bb.15:                               # %if.end131
 	i32.shl 	$push88=, $5, $1
 	i32.shr_s	$push87=, $5, $6
 	i32.or  	$push89=, $pop88, $pop87
-	i32.const	$push162=, 992064
-	i32.ne  	$push90=, $pop89, $pop162
+	i32.const	$push134=, 992064
+	i32.ne  	$push90=, $pop89, $pop134
 	br_if   	0, $pop90       # 0: down to label0
-# BB#16:                                # %if.end139
+# %bb.16:                               # %if.end139
 	i32.const	$push93=, 4
 	i32.shl 	$push94=, $5, $pop93
 	i32.const	$push91=, 28
 	i32.shr_s	$push92=, $5, $pop91
 	i32.or  	$push95=, $pop94, $pop92
-	i32.const	$push163=, 992064
-	i32.ne  	$push96=, $pop95, $pop163
+	i32.const	$push135=, 992064
+	i32.ne  	$push96=, $pop95, $pop135
 	br_if   	0, $pop96       # 0: down to label0
-# BB#17:                                # %if.end146
+# %bb.17:                               # %if.end146
 	i32.shl 	$push98=, $7, $1
 	i32.shr_s	$push97=, $7, $6
 	i32.or  	$push99=, $pop98, $pop97
-	i32.const	$push164=, -1
-	i32.ne  	$push100=, $pop99, $pop164
+	i32.const	$push136=, -1
+	i32.ne  	$push100=, $pop99, $pop136
 	br_if   	0, $pop100      # 0: down to label0
-# BB#18:                                # %if.end154
+# %bb.18:                               # %if.end154
 	i32.const	$push103=, 4
 	i32.shl 	$push104=, $7, $pop103
 	i32.const	$push101=, 28
 	i32.shr_s	$push102=, $7, $pop101
 	i32.or  	$push105=, $pop104, $pop102
-	i32.const	$push165=, -1
-	i32.ne  	$push106=, $pop105, $pop165
+	i32.const	$push137=, -1
+	i32.ne  	$push106=, $pop105, $pop137
 	br_if   	0, $pop106      # 0: down to label0
-# BB#19:                                # %if.end161
+# %bb.19:                               # %if.end161
 	i64.shl 	$push108=, $8, $9
 	i64.shr_s	$push107=, $8, $10
 	i64.or  	$push109=, $pop108, $pop107
 	i64.const	$push110=, -994074541463572736
 	i64.ne  	$push111=, $pop109, $pop110
 	br_if   	0, $pop111      # 0: down to label0
-# BB#20:                                # %if.end178
+# %bb.20:                               # %if.end178
 	i64.shr_s	$push113=, $8, $12
 	i64.shl 	$push112=, $8, $11
 	i64.or  	$push114=, $pop113, $pop112
 	i64.const	$push115=, 68174490360335855
 	i64.ne  	$push116=, $pop114, $pop115
 	br_if   	0, $pop116      # 0: down to label0
-# BB#21:                                # %if.end195
+# %bb.21:                               # %if.end195
 	i32.const	$push117=, 0
 	call    	exit@FUNCTION, $pop117
 	unreachable
@@ -290,6 +276,6 @@ shift2:
 	.size	shift2, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr40404.c.s b/test/torture-s/pr40404.c.s
index 31069acd5..537e62c76 100644
--- a/test/torture-s/pr40404.c.s
+++ b/test/torture-s/pr40404.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, s($pop5)
@@ -29,4 +29,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr40493.c.s b/test/torture-s/pr40493.c.s
index eeed901d6..7e0d3f1ba 100644
--- a/test/torture-s/pr40493.c.s
+++ b/test/torture-s/pr40493.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 22
 	i32.store	x01($pop1), $pop0
@@ -63,4 +63,4 @@ y01:
 	.size	y01, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr40579.c.s b/test/torture-s/pr40579.c.s
index d3b29768e..b86647a18 100644
--- a/test/torture-s/pr40579.c.s
+++ b/test/torture-s/pr40579.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, 1
@@ -25,12 +25,12 @@ main:                                   # @main
 	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 4
 	i32.ge_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -41,5 +41,5 @@ foo:                                    # @foo
 	.size	foo, .Lfunc_end1-foo
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr40657.c.s b/test/torture-s/pr40657.c.s
index d90699a48..864010e2a 100644
--- a/test/torture-s/pr40657.c.s
+++ b/test/torture-s/pr40657.c.s
@@ -7,15 +7,14 @@
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, __stack_pointer($pop1)
 	i32.const	$push2=, 16
-	i32.sub 	$push5=, $pop0, $pop2
-	tee_local	$push4=, $1=, $pop5
-	i32.store	12($pop4), $0
+	i32.sub 	$1=, $pop0, $pop2
+	i32.store	12($1), $0
 	i32.const	$push3=, 12
-	i32.add 	$0=, $1, $pop3
+	i32.add 	$1=, $1, $pop3
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -30,14 +29,13 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.result 	i64
 	.local  	i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push11=, $pop1, $pop3
-	tee_local	$push10=, $1=, $pop11
-	i32.store	__stack_pointer($pop4), $pop10
+	i32.sub 	$1=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $1
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $1, $pop8
 	call    	bar@FUNCTION, $pop9
@@ -47,8 +45,8 @@ foo:                                    # @foo
 	i32.const	$push5=, 16
 	i32.add 	$push6=, $1, $pop5
 	i32.store	__stack_pointer($pop7), $pop6
-	copy_local	$push12=, $0
-                                        # fallthrough-return: $pop12
+	copy_local	$push10=, $0
+                                        # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -59,14 +57,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.call	$push0=, foo@FUNCTION
 	i32.const	$push3=, 0
 	i64.load	$push1=, v($pop3)
 	i64.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -88,6 +86,6 @@ v:
 	.size	v, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr40668.c.s b/test/torture-s/pr40668.c.s
index 7458e3b68..916ca33b4 100644
--- a/test/torture-s/pr40668.c.s
+++ b/test/torture-s/pr40668.c.s
@@ -6,24 +6,23 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
-	i32.add 	$push15=, $0, $pop0
-	tee_local	$push14=, $0=, $pop15
+	i32.add 	$0=, $0, $pop0
+	block   	
 	i32.const	$push1=, 8
-	i32.gt_u	$push2=, $pop14, $pop1
+	i32.gt_u	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %switch.hole_check
+# %bb.1:                                # %switch.hole_check
 	i32.const	$push5=, 449
 	i32.const	$push3=, 65535
 	i32.and 	$push4=, $0, $pop3
 	i32.shr_u	$push6=, $pop5, $pop4
 	i32.const	$push7=, 1
 	i32.and 	$push8=, $pop6, $pop7
-	i32.eqz 	$push16=, $pop8
-	br_if   	0, $pop16       # 0: down to label0
-# BB#2:                                 # %switch.lookup
+	i32.eqz 	$push14=, $pop8
+	br_if   	0, $pop14       # 0: down to label0
+# %bb.2:                                # %switch.lookup
 	i32.const	$push9=, 2
 	i32.shl 	$push10=, $0, $pop9
 	i32.const	$push11=, .Lswitch.table.bar
@@ -43,7 +42,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -66,4 +65,4 @@ main:                                   # @main
 	.size	.Lswitch.table.bar, 36
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr40747.c.s b/test/torture-s/pr40747.c.s
index 457d2d1f8..9b692bdb4 100644
--- a/test/torture-s/pr40747.c.s
+++ b/test/torture-s/pr40747.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.const	$push3=, 4
 	i32.lt_u	$push1=, $0, $pop3
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end24
+# %bb.0:                                # %if.end24
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -31,4 +31,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr41239.c.s b/test/torture-s/pr41239.c.s
index 542518ae1..6977d3e85 100644
--- a/test/torture-s/pr41239.c.s
+++ b/test/torture-s/pr41239.c.s
@@ -8,36 +8,34 @@ test:                                   # @test
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push21=, $pop11, $pop13
-	tee_local	$push20=, $3=, $pop21
-	i32.store	__stack_pointer($pop14), $pop20
-	i32.load	$1=, 4($0)
-	block   	
+	i32.sub 	$3=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $3
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $0, $pop0
-	i32.load	$push19=, 0($pop1)
-	tee_local	$push18=, $0=, $pop19
-	br_if   	0, $pop18       # 0: down to label0
-# BB#1:                                 # %if.then
+	i32.load	$1=, 0($pop1)
+	i32.load	$0=, 4($0)
+	block   	
+	br_if   	0, $1           # 0: down to label0
+# %bb.1:                                # %if.then
 	i32.const	$push5=, 20
 	i32.const	$push4=, .L.str
 	i32.const	$push3=, 924
 	i32.const	$push2=, .L__func__.test
-	i32.const	$push22=, 0
-	i32.call	$push6=, fn1@FUNCTION, $pop5, $pop4, $pop3, $pop2, $pop22
-	i32.eqz 	$push24=, $pop6
-	br_if   	0, $pop24       # 0: down to label0
-# BB#2:                                 # %cond.true
+	i32.const	$push18=, 0
+	i32.call	$push6=, fn1@FUNCTION, $pop5, $pop4, $pop3, $pop2, $pop18
+	i32.eqz 	$push20=, $pop6
+	br_if   	0, $pop20       # 0: down to label0
+# %bb.2:                                # %cond.true
 	i32.const	$push7=, 33816706
 	i32.call	$2=, fn3@FUNCTION, $pop7
 	i32.const	$push8=, .L.str.1
-	i32.const	$push23=, 0
-	i32.call	$push9=, fn4@FUNCTION, $pop8, $pop23
+	i32.const	$push19=, 0
+	i32.call	$push9=, fn4@FUNCTION, $pop8, $pop19
 	i32.store	0($3), $pop9
 	call    	fn2@FUNCTION, $2, $3
 .LBB0_3:                                # %if.end
@@ -46,7 +44,7 @@ test:                                   # @test
 	i32.const	$push15=, 16
 	i32.add 	$push16=, $3, $pop15
 	i32.store	__stack_pointer($pop17), $pop16
-	i32.div_s	$push10=, $1, $0
+	i32.div_s	$push10=, $0, $1
                                         # fallthrough-return: $pop10
 	.endfunc
 .Lfunc_end0:
@@ -59,7 +57,7 @@ test:                                   # @test
 fn1:                                    # @fn1
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	#APP
@@ -79,12 +77,12 @@ fn1:                                    # @fn1
 	.type	fn2,@function
 fn2:                                    # @fn2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	block   	
 	br_if   	0, $0           # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label1:
@@ -102,7 +100,7 @@ fn2:                                    # @fn2
 fn3:                                    # @fn3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	copy_local	$push0=, $0
@@ -118,7 +116,7 @@ fn3:                                    # @fn3
 fn4:                                    # @fn4
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	i32.load8_s	$push0=, 0($0)
@@ -134,14 +132,13 @@ fn4:                                    # @fn4
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push11=, $pop5, $pop7
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop8), $pop10
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i32.const	$push2=, 8
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -184,6 +181,6 @@ main:                                   # @main
 	.size	.Lmain.s, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr41317.c.s b/test/torture-s/pr41317.c.s
index 4e4fbe137..c8f006c62 100644
--- a/test/torture-s/pr41317.c.s
+++ b/test/torture-s/pr41317.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr41395-1.c.s b/test/torture-s/pr41395-1.c.s
index 946080246..75d4482c1 100644
--- a/test/torture-s/pr41395-1.c.s
+++ b/test/torture-s/pr41395-1.c.s
@@ -7,15 +7,14 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $1, $pop0
 	i32.add 	$push2=, $0, $pop1
 	i32.const	$push3=, 8
-	i32.add 	$push10=, $pop2, $pop3
-	tee_local	$push9=, $1=, $pop10
+	i32.add 	$1=, $pop2, $pop3
 	i32.const	$push4=, 0
-	i32.store16	0($pop9), $pop4
+	i32.store16	0($1), $pop4
 	i32.const	$push5=, 24
 	i32.add 	$push6=, $0, $pop5
 	i32.const	$push8=, 1
@@ -32,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 268
 	i32.call	$push1=, malloc@FUNCTION, $pop0
@@ -41,7 +40,7 @@ main:                                   # @main
 	i32.const	$push4=, 1
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -53,6 +52,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 101a2bb69..025644cf8 100644
--- a/test/torture-s/pr41395-2.c.s
+++ b/test/torture-s/pr41395-2.c.s
@@ -7,15 +7,14 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.shl 	$push1=, $1, $pop0
 	i32.add 	$push2=, $0, $pop1
 	i32.const	$push3=, 8
-	i32.add 	$push10=, $pop2, $pop3
-	tee_local	$push9=, $1=, $pop10
+	i32.add 	$1=, $pop2, $pop3
 	i32.const	$push4=, 0
-	i32.store16	0($pop9), $pop4
+	i32.store16	0($1), $pop4
 	i32.const	$push5=, 40
 	i32.add 	$push6=, $0, $pop5
 	i32.const	$push8=, 1
@@ -32,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 276
 	i32.call	$push1=, malloc@FUNCTION, $pop0
@@ -41,7 +40,7 @@ main:                                   # @main
 	i32.const	$push4=, 1
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -53,6 +52,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr41463.c.s b/test/torture-s/pr41463.c.s
index ff66657c9..7ada94d93 100644
--- a/test/torture-s/pr41463.c.s
+++ b/test/torture-s/pr41463.c.s
@@ -7,15 +7,14 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $1, $pop0
 	i32.add 	$push2=, $0, $pop1
 	i32.const	$push3=, 24
-	i32.add 	$push10=, $pop2, $pop3
-	tee_local	$push9=, $1=, $pop10
+	i32.add 	$1=, $pop2, $pop3
 	i32.const	$push4=, 0
-	i32.store	0($pop9), $pop4
+	i32.store	0($1), $pop4
 	i32.const	$push5=, 28
 	i32.add 	$push6=, $0, $pop5
 	i32.const	$push7=, global
@@ -32,7 +31,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 76
 	i32.call	$push1=, malloc@FUNCTION, $pop0
@@ -41,7 +40,7 @@ main:                                   # @main
 	i32.const	$push4=, global
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -62,6 +61,6 @@ global:
 	.size	global, 76
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr41750.c.s b/test/torture-s/pr41750.c.s
index fe4ed891d..b6d1ef36a 100644
--- a/test/torture-s/pr41750.c.s
+++ b/test/torture-s/pr41750.c.s
@@ -7,7 +7,7 @@
 foo_create_got_section:                 # @foo_create_got_section
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	8($pop0), $0
 	i32.const	$push1=, 1
@@ -24,23 +24,20 @@ elf64_ia64_check_relocs:                # @elf64_ia64_check_relocs
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($1)
+	i32.load	$3=, 8($2)
 	block   	
-	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
+	i32.eqz 	$push5=, $3
+	br_if   	0, $pop5        # 0: down to label0
+# %bb.1:                                # %get_got.exit
 	return  	$3
 .LBB1_2:                                # %if.then.i
 	end_block                       # label0:
+	i32.load	$3=, 4($2)
 	block   	
-	i32.load	$push10=, 4($2)
-	tee_local	$push9=, $3=, $pop10
-	br_if   	0, $pop9        # 0: down to label1
-# BB#3:                                 # %if.then3.i
+	br_if   	0, $3           # 0: down to label1
+# %bb.3:                                # %if.then3.i
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $2, $pop0
 	i32.store	0($pop1), $0
@@ -62,7 +59,7 @@ elf64_ia64_check_relocs:                # @elf64_ia64_check_relocs
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.const	$push0=, hash
 	i32.store	link_info($pop6), $pop0
@@ -73,7 +70,7 @@ main:                                   # @main
 	i32.const	$push5=, abfd
 	i32.ne  	$push4=, $pop3, $pop5
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB2_2:                                # %if.then
@@ -112,5 +109,5 @@ abfd:
 	.size	abfd, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr41917.c.s b/test/torture-s/pr41917.c.s
index bf592a462..68dc42486 100644
--- a/test/torture-s/pr41917.c.s
+++ b/test/torture-s/pr41917.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,4 +23,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr41919.c.s b/test/torture-s/pr41919.c.s
index 5307ae6e1..cbe06ae7c 100644
--- a/test/torture-s/pr41919.c.s
+++ b/test/torture-s/pr41919.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,4 +23,4 @@ g_23:
 	.size	g_23, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr42006.c.s b/test/torture-s/pr42006.c.s
index 63e6d43c8..0b7e65b59 100644
--- a/test/torture-s/pr42006.c.s
+++ b/test/torture-s/pr42006.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr42142.c.s b/test/torture-s/pr42142.c.s
index daef2e162..43120d8e2 100644
--- a/test/torture-s/pr42142.c.s
+++ b/test/torture-s/pr42142.c.s
@@ -7,7 +7,7 @@
 sort:                                   # @sort
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 2
 	i32.const	$push0=, 1
 	i32.const	$push8=, 1
@@ -28,14 +28,14 @@ sort:                                   # @sort
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 5
 	i32.call	$push1=, sort@FUNCTION, $pop0
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -47,5 +47,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42154.c.s b/test/torture-s/pr42154.c.s
index 0ceeb873b..4f1377959 100644
--- a/test/torture-s/pr42154.c.s
+++ b/test/torture-s/pr42154.c.s
@@ -6,14 +6,14 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 255
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 97
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,7 +29,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 97
 	call    	foo@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -39,5 +39,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42231.c.s b/test/torture-s/pr42231.c.s
index c89ca4464..cb6a106bb 100644
--- a/test/torture-s/pr42231.c.s
+++ b/test/torture-s/pr42231.c.s
@@ -6,13 +6,13 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.call	$push1=, CallFunctionRec@FUNCTION, $pop0
 	i32.eqz 	$push8=, $pop1
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %land.rhs.i
+# %bb.1:                                # %land.rhs.i
 	i32.const	$push2=, 0
 	call    	storemax@FUNCTION, $pop2
 .LBB0_2:                                # %CallFunction.exit
@@ -23,7 +23,7 @@ main:                                   # @main
 	i32.const	$push4=, 10
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB0_4:                                # %if.then
@@ -40,18 +40,18 @@ CallFunctionRec:                        # @CallFunctionRec
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	storemax@FUNCTION, $0
 	block   	
 	block   	
 	i32.eqz 	$push5=, $0
 	br_if   	0, $pop5        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$1=, 1
 	i32.const	$push0=, 9
 	i32.gt_s	$push1=, $0, $pop0
 	br_if   	1, $pop1        # 1: down to label2
-# BB#2:                                 # %if.then1
+# %bb.2:                                # %if.then1
 	i32.const	$push2=, 1
 	i32.add 	$push3=, $0, $pop2
 	i32.call	$drop=, CallFunctionRec@FUNCTION, $pop3
@@ -72,13 +72,13 @@ CallFunctionRec:                        # @CallFunctionRec
 	.type	storemax,@function      # -- Begin function storemax
 storemax:                               # @storemax
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push2=, 0
 	i32.load	$push0=, max($pop2)
 	i32.ge_s	$push1=, $pop0, $0
 	br_if   	0, $pop1        # 0: down to label4
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push3=, 0
 	i32.store	max($pop3), $0
 .LBB2_2:                                # %if.end
@@ -96,5 +96,5 @@ max:
 	.size	max, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42248.c.s b/test/torture-s/pr42248.c.s
index 61cecfcc2..b5521beaa 100644
--- a/test/torture-s/pr42248.c.s
+++ b/test/torture-s/pr42248.c.s
@@ -6,18 +6,18 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.load	$push3=, 0($0)
 	f64.load	$push2=, 0($1)
 	f64.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.load	$push0=, 8($0)
 	f64.load	$push1=, 8($1)
 	f64.ne  	$push5=, $pop0, $pop1
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
@@ -33,7 +33,7 @@ check:                                  # @check
 	.type	init,@function
 init:                                   # @init
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($1)
 	i64.store	0($0), $pop0
 	i64.load	$push1=, 8($1)
@@ -49,7 +49,7 @@ init:                                   # @init
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 0
 	i64.store	g1s+8($pop1), $pop0
@@ -72,5 +72,5 @@ g1s:
 	.size	g1s, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42269-2.c.s b/test/torture-s/pr42269-2.c.s
index ae9c5532f..98df8fa76 100644
--- a/test/torture-s/pr42269-2.c.s
+++ b/test/torture-s/pr42269-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$push1=, s($pop0)
 	i64.call	$push2=, foo@FUNCTION, $pop1
@@ -22,7 +22,7 @@ main:                                   # @main
 foo:                                    # @foo
 	.param  	i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.extend_u/i32	$push0=, $0
 	i64.const	$push1=, 48
 	i64.shl 	$push2=, $pop0, $pop1
@@ -43,4 +43,4 @@ s:
 	.size	s, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr42512.c.s b/test/torture-s/pr42512.c.s
index cec5461e4..ac3b3c7e7 100644
--- a/test/torture-s/pr42512.c.s
+++ b/test/torture-s/pr42512.c.s
@@ -7,36 +7,35 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load16_u	$2=, g_3($pop0)
 	i32.const	$1=, -1
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push10=, 65535
-	i32.and 	$push2=, $2, $pop10
-	i32.or  	$2=, $1, $pop2
-	i32.const	$push9=, 255
-	i32.add 	$push1=, $1, $pop9
 	i32.const	$push8=, 255
-	i32.and 	$push7=, $pop1, $pop8
-	tee_local	$push6=, $0=, $pop7
-	copy_local	$1=, $pop6
+	i32.add 	$push1=, $1, $pop8
+	i32.const	$push7=, 255
+	i32.and 	$0=, $pop1, $pop7
+	i32.const	$push6=, 65535
+	i32.and 	$push2=, $2, $pop6
+	i32.or  	$2=, $1, $pop2
+	copy_local	$1=, $0
 	br_if   	0, $0           # 0: up to label0
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
-	i32.const	$push12=, 0
-	i32.store16	g_3($pop12), $2
+	i32.const	$push10=, 0
+	i32.store16	g_3($pop10), $2
 	block   	
 	i32.const	$push3=, 65535
 	i32.and 	$push4=, $2, $pop3
-	i32.const	$push11=, 65535
-	i32.ne  	$push5=, $pop4, $pop11
+	i32.const	$push9=, 65535
+	i32.ne  	$push5=, $pop4, $pop9
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push13=, 0
-	return  	$pop13
+# %bb.3:                                # %if.end
+	i32.const	$push11=, 0
+	return  	$pop11
 .LBB0_4:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -55,5 +54,5 @@ g_3:
 	.size	g_3, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42544.c.s b/test/torture-s/pr42544.c.s
index e1bd754eb..147b319df 100644
--- a/test/torture-s/pr42544.c.s
+++ b/test/torture-s/pr42544.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr42570.c.s b/test/torture-s/pr42570.c.s
index 27ec75977..b0656e5d7 100644
--- a/test/torture-s/pr42570.c.s
+++ b/test/torture-s/pr42570.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,4 +21,4 @@ foo:
 	.size	foo, 0
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr42614.c.s b/test/torture-s/pr42614.c.s
index 5ddbf4519..f1e10ed14 100644
--- a/test/torture-s/pr42614.c.s
+++ b/test/torture-s/pr42614.c.s
@@ -6,7 +6,7 @@
 	.type	init,@function
 init:                                   # @init
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.call	$push1=, malloc@FUNCTION, $pop0
                                         # fallthrough-return: $pop1
@@ -20,14 +20,14 @@ init:                                   # @init
 	.type	expect_func,@function
 expect_func:                            # @expect_func
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push0=, $0
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.eqz 	$push1=, $1
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	return
 .LBB1_3:                                # %if.then
 	end_block                       # label0:
@@ -44,14 +44,13 @@ expect_func:                            # @expect_func
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push13=, $pop2, $pop4
-	tee_local	$push12=, $0=, $pop13
-	i32.store	__stack_pointer($pop5), $pop12
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 0
 	i32.store8	15($0), $pop0
 	i32.const	$push1=, 1
@@ -69,6 +68,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	malloc, i32, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr42691.c.s b/test/torture-s/pr42691.c.s
index a8f507e5a..c7038bc9b 100644
--- a/test/torture-s/pr42691.c.s
+++ b/test/torture-s/pr42691.c.s
@@ -8,29 +8,27 @@ add:                                    # @add
 	.param  	i32, i32
 	.result 	i32
 	.local  	f64, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	f64.load	$2=, 0($0)
+	f64.load	$3=, 0($1)
 	block   	
 	block   	
-	f64.load	$push8=, 0($1)
-	tee_local	$push7=, $3=, $pop8
-	f64.load	$push6=, 0($0)
-	tee_local	$push5=, $2=, $pop6
-	f64.eq  	$push1=, $pop7, $pop5
+	f64.eq  	$push1=, $3, $2
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end.preheader
-	i32.const	$push9=, 8
-	i32.add 	$1=, $1, $pop9
+# %bb.1:                                # %if.end.preheader
+	i32.const	$push5=, 8
+	i32.add 	$1=, $1, $pop5
 .LBB0_2:                                # %if.end
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	f64.const	$push10=, infinity
-	f64.ne  	$push2=, $3, $pop10
+	f64.const	$push6=, infinity
+	f64.ne  	$push2=, $3, $pop6
 	br_if   	2, $pop2        # 2: down to label0
-# BB#3:                                 # %while.cond
+# %bb.3:                                # %while.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	f64.load	$3=, 0($1)
-	i32.const	$push11=, 8
-	i32.add 	$push0=, $1, $pop11
+	i32.const	$push7=, 8
+	i32.add 	$push0=, $1, $pop7
 	copy_local	$1=, $pop0
 	f64.ne  	$push3=, $3, $2
 	br_if   	0, $pop3        # 0: up to label2
@@ -54,14 +52,13 @@ add:                                    # @add
 main:                                   # @main
 	.result 	i32
 	.local  	i32, f64, i32
-# BB#0:                                 # %if.end.lr.ph.i
-	i32.const	$push9=, 0
+# %bb.0:                                # %if.end.lr.ph.i
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push15=, $pop6, $pop8
-	tee_local	$push14=, $2=, $pop15
-	i32.store	__stack_pointer($pop9), $pop14
+	i32.sub 	$2=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $2
 	i64.const	$push1=, 4627167142146473984
 	i64.store	8($2), $pop1
 	i64.const	$push2=, 9218868437227405312
@@ -73,19 +70,19 @@ main:                                   # @main
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label4:
-	f64.const	$push16=, infinity
-	f64.ne  	$push3=, $1, $pop16
+	f64.const	$push14=, infinity
+	f64.ne  	$push3=, $1, $pop14
 	br_if   	1, $pop3        # 1: down to label3
-# BB#2:                                 # %while.cond.i
+# %bb.2:                                # %while.cond.i
                                         #   in Loop: Header=BB1_1 Depth=1
 	f64.load	$1=, 0($0)
-	i32.const	$push18=, 8
-	i32.add 	$push0=, $0, $pop18
+	i32.const	$push16=, 8
+	i32.add 	$push0=, $0, $pop16
 	copy_local	$0=, $pop0
-	f64.const	$push17=, 0x1.7p4
-	f64.ne  	$push4=, $1, $pop17
+	f64.const	$push15=, 0x1.7p4
+	f64.ne  	$push4=, $1, $pop15
 	br_if   	0, $pop4        # 0: up to label4
-# BB#3:                                 # %add.exit
+# %bb.3:                                # %add.exit
 	end_loop
 	i32.const	$push12=, 0
 	i32.const	$push10=, 16
@@ -102,5 +99,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42721.c.s b/test/torture-s/pr42721.c.s
index b860977b4..bd26c591d 100644
--- a/test/torture-s/pr42721.c.s
+++ b/test/torture-s/pr42721.c.s
@@ -7,19 +7,18 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, b($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, b($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 1
-	i32.xor 	$push1=, $pop2, $pop0
-	i32.store	b($pop5), $pop1
+	i32.xor 	$push1=, $0, $pop0
+	i32.store	b($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	return  	$pop6
+# %bb.1:                                # %if.end
+	i32.const	$push4=, 0
+	return  	$pop4
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -36,5 +35,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr42833.c.s b/test/torture-s/pr42833.c.s
index c86c40b97..d5c5f0923 100644
--- a/test/torture-s/pr42833.c.s
+++ b/test/torture-s/pr42833.c.s
@@ -7,225 +7,236 @@
 helper_neon_rshl_s8:                    # @helper_neon_rshl_s8
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push94=, 24
+	i32.shl 	$3=, $1, $pop94
+	i32.const	$6=, 0
 	i32.const	$5=, 0
-	i32.const	$4=, 0
 	block   	
-	i32.const	$push88=, 24
-	i32.shl 	$push87=, $1, $pop88
-	tee_local	$push86=, $6=, $pop87
 	i32.const	$push1=, 117440512
-	i32.gt_s	$push2=, $pop86, $pop1
+	i32.gt_s	$push2=, $3, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.else
+# %bb.1:                                # %if.else
 	block   	
 	i32.const	$push3=, -134217729
-	i32.gt_s	$push4=, $6, $pop3
+	i32.gt_s	$push4=, $3, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %if.then13
-	i32.const	$push16=, 24
-	i32.shl 	$push17=, $0, $pop16
-	i32.const	$push18=, 31
-	i32.shr_s	$4=, $pop17, $pop18
+# %bb.2:                                # %if.then13
+	i32.const	$push26=, 24
+	i32.shl 	$push27=, $0, $pop26
+	i32.const	$push28=, 31
+	i32.shr_s	$5=, $pop27, $pop28
 	br      	1               # 1: down to label0
 .LBB0_3:                                # %if.else18
 	end_block                       # label1:
-	i32.const	$4=, 0
-	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	$push95=, 24
+	i32.shr_s	$7=, $3, $pop95
+	block   	
+	i32.const	$push5=, -134217728
+	i32.ne  	$push6=, $3, $pop5
+	br_if   	0, $pop6        # 0: down to label2
+# %bb.4:                                # %if.then22
+	i32.const	$push18=, 24
+	i32.shl 	$push19=, $0, $pop18
+	i32.const	$push97=, 24
+	i32.shr_s	$push20=, $pop19, $pop97
+	i32.const	$push16=, -1
+	i32.add 	$push17=, $7, $pop16
+	i32.shr_s	$push21=, $pop20, $pop17
+	i32.const	$push96=, 24
+	i32.shl 	$push22=, $pop21, $pop96
+	i32.const	$push23=, 16777216
+	i32.add 	$push24=, $pop22, $pop23
+	i32.const	$push25=, 25
+	i32.shr_s	$5=, $pop24, $pop25
+	br      	1               # 1: down to label0
+.LBB0_5:                                # %if.else34
+	end_block                       # label2:
 	i32.const	$push7=, 24
 	i32.shl 	$push8=, $0, $pop7
-	i32.const	$push93=, 24
-	i32.shr_s	$4=, $pop8, $pop93
+	i32.const	$push99=, 24
+	i32.shr_s	$5=, $pop8, $pop99
 	block   	
-	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, $7
+	i32.const	$push98=, -1
+	i32.le_s	$push9=, $3, $pop98
+	br_if   	0, $pop9        # 0: down to label3
+# %bb.6:                                # %if.else48
+	i32.shl 	$5=, $5, $7
 	br      	1               # 1: down to label0
-.LBB0_6:                                # %if.then38
-	end_block                       # label2:
+.LBB0_7:                                # %if.then38
+	end_block                       # label3:
 	i32.const	$push13=, 1
-	i32.const	$push94=, -1
-	i32.xor 	$push12=, $7, $pop94
+	i32.const	$push100=, -1
+	i32.xor 	$push12=, $7, $pop100
 	i32.shl 	$push14=, $pop13, $pop12
-	i32.add 	$push15=, $pop14, $4
+	i32.add 	$push15=, $pop14, $5
 	i32.const	$push10=, 0
 	i32.sub 	$push11=, $pop10, $7
-	i32.shr_s	$4=, $pop15, $pop11
-.LBB0_7:                                # %if.end57
+	i32.shr_s	$5=, $pop15, $pop11
+.LBB0_8:                                # %if.end57
 	end_block                       # label0:
+	i32.const	$push102=, 16
+	i32.shl 	$3=, $1, $pop102
 	block   	
-	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	$push101=, 134217727
+	i32.gt_s	$push29=, $3, $pop101
+	br_if   	0, $pop29       # 0: down to label4
+# %bb.9:                                # %if.else67
 	i32.const	$push0=, 8
 	i32.shr_u	$7=, $0, $pop0
 	block   	
-	i32.const	$push21=, -9
-	i32.gt_s	$push22=, $6, $pop21
-	br_if   	0, $pop22       # 0: down to label4
-# BB#9:                                 # %if.then71
+	i32.const	$push30=, -134217729
+	i32.gt_s	$push31=, $3, $pop30
+	br_if   	0, $pop31       # 0: down to label5
+# %bb.10:                               # %if.then71
+	i32.const	$push43=, 24
+	i32.shl 	$push44=, $7, $pop43
+	i32.const	$push45=, 31
+	i32.shr_s	$6=, $pop44, $pop45
+	br      	1               # 1: down to label4
+.LBB0_11:                               # %if.else77
+	end_block                       # label5:
+	i32.const	$push103=, 24
+	i32.shr_s	$8=, $3, $pop103
+	i32.const	$push32=, -8
+	i32.eq  	$push33=, $8, $pop32
+	br_if   	0, $pop33       # 0: down to label4
+# %bb.12:                               # %if.else95
 	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.else77
-	end_block                       # label4:
-	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
+	i32.const	$push105=, 24
+	i32.shr_s	$7=, $pop35, $pop105
 	block   	
-	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.then99
-	end_block                       # label5:
-	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	$push104=, -1
+	i32.le_s	$push36=, $3, $pop104
+	br_if   	0, $pop36       # 0: down to label6
+# %bb.13:                               # %if.else111
+	i32.shl 	$6=, $7, $8
+	br      	1               # 1: down to label4
+.LBB0_14:                               # %if.then99
+	end_block                       # label6:
+	i32.const	$push40=, 1
+	i32.const	$push106=, -1
+	i32.xor 	$push39=, $8, $pop106
+	i32.shl 	$push41=, $pop40, $pop39
+	i32.add 	$push42=, $pop41, $7
+	i32.const	$push37=, 0
+	i32.sub 	$push38=, $pop37, $8
+	i32.shr_s	$6=, $pop42, $pop38
+.LBB0_15:                               # %if.end121
+	end_block                       # label4:
+	i32.const	$push46=, 8
+	i32.shl 	$3=, $1, $pop46
+	i32.const	$8=, 0
 	i32.const	$7=, 0
-	i32.const	$6=, 0
 	block   	
-	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
+	i32.const	$push107=, 134217727
+	i32.gt_s	$push47=, $3, $pop107
+	br_if   	0, $pop47       # 0: down to label7
+# %bb.16:                               # %if.else131
+	i32.const	$push108=, 16
+	i32.shr_u	$2=, $0, $pop108
 	block   	
-	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.else141
-	end_block                       # label7:
-	i32.const	$6=, 0
-	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	$push48=, -134217729
+	i32.gt_s	$push49=, $3, $pop48
+	br_if   	0, $pop49       # 0: down to label8
+# %bb.17:                               # %if.then135
+	i32.const	$push61=, 24
+	i32.shl 	$push62=, $2, $pop61
+	i32.const	$push63=, 31
+	i32.shr_s	$7=, $pop62, $pop63
+	br      	1               # 1: down to label7
+.LBB0_18:                               # %if.else141
+	end_block                       # label8:
 	i32.const	$push109=, 24
-	i32.shr_s	$6=, $pop45, $pop109
+	i32.shr_s	$4=, $3, $pop109
+	i32.const	$7=, 0
+	i32.const	$push50=, -8
+	i32.eq  	$push51=, $4, $pop50
+	br_if   	0, $pop51       # 0: down to label7
+# %bb.19:                               # %if.else159
+	i32.const	$push52=, 24
+	i32.shl 	$push53=, $2, $pop52
+	i32.const	$push111=, 24
+	i32.shr_s	$7=, $pop53, $pop111
 	block   	
-	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.then163
-	end_block                       # label8:
-	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:
+	i32.le_s	$push54=, $3, $pop110
+	br_if   	0, $pop54       # 0: down to label9
+# %bb.20:                               # %if.else175
+	i32.shl 	$7=, $7, $4
+	br      	1               # 1: down to label7
+.LBB0_21:                               # %if.then163
+	end_block                       # label9:
+	i32.const	$push58=, 1
+	i32.const	$push112=, -1
+	i32.xor 	$push57=, $4, $pop112
+	i32.shl 	$push59=, $pop58, $pop57
+	i32.add 	$push60=, $pop59, $7
+	i32.const	$push55=, 0
+	i32.sub 	$push56=, $pop55, $4
+	i32.shr_s	$7=, $pop60, $pop56
+.LBB0_22:                               # %if.end185
+	end_block                       # label7:
 	block   	
-	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
+	i32.const	$push64=, 134217727
+	i32.gt_s	$push65=, $1, $pop64
+	br_if   	0, $pop65       # 0: down to label10
+# %bb.23:                               # %if.else196
 	block   	
-	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.else206
-	end_block                       # label10:
-	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
+	i32.const	$push66=, -134217729
+	i32.gt_s	$push67=, $1, $pop66
+	br_if   	0, $pop67       # 0: down to label11
+# %bb.24:                               # %if.then200
+	i32.const	$push78=, 31
+	i32.shr_s	$8=, $0, $pop78
+	br      	1               # 1: down to label10
+.LBB0_25:                               # %if.else206
+	end_block                       # label11:
+	i32.const	$push113=, 24
+	i32.shr_s	$3=, $1, $pop113
+	i32.const	$push68=, -8
+	i32.eq  	$push69=, $3, $pop68
+	br_if   	0, $pop69       # 0: down to label10
+# %bb.26:                               # %if.else224
+	i32.const	$push70=, 24
+	i32.shr_s	$0=, $0, $pop70
 	block   	
 	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.then228
-	end_block                       # label11:
-	i32.const	$push67=, 1
+	i32.le_s	$push71=, $1, $pop114
+	br_if   	0, $pop71       # 0: down to label12
+# %bb.27:                               # %if.else240
+	i32.shl 	$8=, $0, $3
+	br      	1               # 1: down to label10
+.LBB0_28:                               # %if.then228
+	end_block                       # label12:
+	i32.const	$push75=, 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	$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
+	i32.xor 	$push74=, $3, $pop115
+	i32.shl 	$push76=, $pop75, $pop74
+	i32.add 	$push77=, $pop76, $0
+	i32.const	$push72=, 0
+	i32.sub 	$push73=, $pop72, $3
+	i32.shr_s	$8=, $pop77, $pop73
+.LBB0_29:                               # %if.end250
+	end_block                       # label10:
+	i32.const	$push81=, 8
+	i32.shl 	$push82=, $6, $pop81
+	i32.const	$push83=, 65280
+	i32.and 	$push84=, $pop82, $pop83
+	i32.const	$push79=, 255
+	i32.and 	$push80=, $5, $pop79
+	i32.or  	$push85=, $pop84, $pop80
+	i32.const	$push86=, 16
+	i32.shl 	$push87=, $7, $pop86
+	i32.const	$push88=, 16711680
+	i32.and 	$push89=, $pop87, $pop88
+	i32.or  	$push90=, $pop85, $pop89
+	i32.const	$push91=, 24
+	i32.shl 	$push92=, $8, $pop91
+	i32.or  	$push93=, $pop90, $pop92
+                                        # fallthrough-return: $pop93
 	.endfunc
 .Lfunc_end0:
 	.size	helper_neon_rshl_s8, .Lfunc_end0-helper_neon_rshl_s8
@@ -236,7 +247,7 @@ helper_neon_rshl_s8:                    # @helper_neon_rshl_s8
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -244,4 +255,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr43008.c.s b/test/torture-s/pr43008.c.s
index 8b30f7322..16a1246ca 100644
--- a/test/torture-s/pr43008.c.s
+++ b/test/torture-s/pr43008.c.s
@@ -7,14 +7,13 @@
 my_alloc:                               # @my_alloc
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
-	i32.call	$push3=, __builtin_malloc@FUNCTION, $pop0
-	tee_local	$push2=, $0=, $pop3
+	i32.call	$0=, __builtin_malloc@FUNCTION, $pop0
 	i32.const	$push1=, i
-	i32.store	0($pop2), $pop1
-	copy_local	$push4=, $0
-                                        # fallthrough-return: $pop4
+	i32.store	0($0), $pop1
+	copy_local	$push2=, $0
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end0:
 	.size	my_alloc, .Lfunc_end0-my_alloc
@@ -26,29 +25,27 @@ my_alloc:                               # @my_alloc
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
-	i32.call	$push12=, __builtin_malloc@FUNCTION, $pop0
-	tee_local	$push11=, $0=, $pop12
+	i32.call	$0=, __builtin_malloc@FUNCTION, $pop0
 	i32.const	$push1=, i
-	i32.store	0($pop11), $pop1
-	i32.const	$push10=, 4
-	i32.call	$push2=, __builtin_malloc@FUNCTION, $pop10
-	i32.const	$push9=, i
-	i32.store	0($pop2), $pop9
-	i32.load	$push8=, 0($0)
-	tee_local	$push7=, $0=, $pop8
+	i32.store	0($0), $pop1
+	i32.const	$push8=, 4
+	i32.call	$push2=, __builtin_malloc@FUNCTION, $pop8
+	i32.const	$push7=, i
+	i32.store	0($pop2), $pop7
+	i32.load	$0=, 0($0)
 	i32.const	$push3=, 1
-	i32.store	0($pop7), $pop3
+	i32.store	0($0), $pop3
 	i32.const	$push6=, 0
 	i32.const	$push5=, 0
 	i32.store	i($pop6), $pop5
 	block   	
 	i32.load	$push4=, 0($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push13=, 0
-	return  	$pop13
+# %bb.1:                                # %if.end
+	i32.const	$push9=, 0
+	return  	$pop9
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -67,6 +64,6 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	__builtin_malloc, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr43220.c.s b/test/torture-s/pr43220.c.s
index 7369bee1e..64831a01c 100644
--- a/test/torture-s/pr43220.c.s
+++ b/test/torture-s/pr43220.c.s
@@ -6,71 +6,69 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
-	i32.load	$push15=, __stack_pointer($pop13)
-	tee_local	$push14=, $3=, $pop15
-	copy_local	$drop=, $pop14
-	i32.const	$2=, 0
+	.local  	i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push14=, 0
+	i32.load	$5=, __stack_pointer($pop14)
+	copy_local	$drop=, $5
+	i32.const	$3=, 0
+	i32.const	$4=, 0
 .LBB0_1:                                # %lab
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # 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	$push32=, 1000
+	i32.div_u	$0=, $4, $pop32
+	i32.const	$push31=, 1000
+	i32.mul 	$push0=, $0, $pop31
+	i32.sub 	$push1=, $4, $pop0
+	i32.const	$push30=, 2
+	i32.shl 	$1=, $pop1, $pop30
+	i32.const	$push29=, 19
+	i32.add 	$push2=, $1, $pop29
+	i32.const	$push28=, -16
+	i32.and 	$push3=, $pop2, $pop28
+	i32.sub 	$2=, $5, $pop3
+	copy_local	$drop=, $2
+	i32.const	$push27=, 1
+	i32.store	0($2), $pop27
+	i32.const	$push26=, 0
+	i32.store	p($pop26), $2
+	i32.const	$push25=, 4000
+	i32.mul 	$push5=, $0, $pop25
+	i32.sub 	$0=, $3, $pop5
+	i32.add 	$push6=, $2, $0
+	i32.const	$push24=, 2
+	i32.store	0($pop6), $pop24
+	copy_local	$push4=, $5
+	copy_local	$5=, $pop4
+	i32.const	$push23=, 23
+	i32.add 	$push7=, $1, $pop23
+	i32.const	$push22=, -16
+	i32.and 	$push8=, $pop7, $pop22
+	i32.sub 	$2=, $5, $pop8
+	copy_local	$drop=, $2
+	i32.const	$push21=, 1
+	i32.store	0($2), $pop21
+	i32.const	$push20=, 0
+	i32.store	p($pop20), $2
+	i32.add 	$push10=, $2, $0
+	i32.const	$push19=, 4
+	i32.add 	$push11=, $pop10, $pop19
 	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	$push17=, 8
+	i32.add 	$3=, $3, $pop17
 	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
+	i32.add 	$4=, $4, $pop16
+	copy_local	$push9=, $5
+	copy_local	$5=, $pop9
+	i32.const	$push15=, 1000000
+	i32.lt_u	$push12=, $4, $pop15
+	br_if   	0, $pop12       # 0: up to label0
+# %bb.2:                                # %if.end
 	end_loop
-	i32.const	$push12=, 0
-                                        # fallthrough-return: $pop12
+	i32.const	$push13=, 0
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -85,4 +83,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr43236.c.s b/test/torture-s/pr43236.c.s
index 834e122ae..57fdd05e9 100644
--- a/test/torture-s/pr43236.c.s
+++ b/test/torture-s/pr43236.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop18, $pop20
+	i32.const	$push21=, 0
+	i32.store	__stack_pointer($pop21), $0
 	i32.const	$push25=, 64
 	i32.add 	$push26=, $0, $pop25
 	i32.const	$push0=, 16
@@ -87,13 +86,13 @@ main:                                   # @main
 	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
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push39=, 32
 	i32.add 	$push40=, $0, $pop39
-	i32.const	$push65=, 30
-	i32.call	$push16=, memcmp@FUNCTION, $pop40, $0, $pop65
+	i32.const	$push63=, 30
+	i32.call	$push16=, memcmp@FUNCTION, $pop40, $0, $pop63
 	br_if   	0, $pop16       # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push24=, 0
 	i32.const	$push22=, 96
 	i32.add 	$push23=, $0, $pop22
@@ -109,6 +108,6 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 840ed9bf8..a7ab9b132 100644
--- a/test/torture-s/pr43269.c.s
+++ b/test/torture-s/pr43269.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	func_32@FUNCTION
 	block   	
 	i32.const	$push3=, 0
@@ -14,7 +14,7 @@ main:                                   # @main
 	i32.const	$push1=, -1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -28,7 +28,7 @@ main:                                   # @main
 	.section	.text.func_32,"ax",@progbits
 	.type	func_32,@function       # -- Begin function func_32
 func_32:                                # @func_32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, -1
 	i32.store	g_261($pop1), $pop0
@@ -38,7 +38,7 @@ func_32:                                # @func_32
 	i32.const	$push4=, -1
 	i32.eq  	$push3=, $pop2, $pop4
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.end
+# %bb.1:                                # %for.end
 	return
 .LBB1_2:                                # %if.else
                                         # =>This Inner Loop Header: Depth=1
@@ -79,5 +79,5 @@ g_211:
 	.size	g_211, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43385.c.s b/test/torture-s/pr43385.c.s
index 99168bdde..9123c4f73 100644
--- a/test/torture-s/pr43385.c.s
+++ b/test/torture-s/pr43385.c.s
@@ -6,14 +6,14 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push5=, $0
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.eqz 	$push6=, $1
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, e($pop4)
@@ -34,7 +34,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.ne  	$push2=, $0, $pop0
 	i32.const	$push4=, 0
@@ -52,81 +52,79 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 	#APP
 	#NO_APP
+	i32.const	$push26=, 1
+	i32.add 	$2=, $0, $pop26
 	i32.const	$push0=, 2
-	i32.add 	$push30=, $0, $pop0
-	tee_local	$push29=, $1=, $pop30
-	i32.const	$push28=, 1
-	i32.add 	$push27=, $0, $pop28
-	tee_local	$push26=, $2=, $pop27
-	call    	foo@FUNCTION, $pop29, $pop26
+	i32.add 	$1=, $0, $pop0
+	call    	foo@FUNCTION, $1, $2
 	block   	
 	i32.const	$push25=, 0
 	i32.load	$push1=, e($pop25)
 	i32.const	$push24=, 1
 	i32.ne  	$push2=, $pop1, $pop24
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	call    	foo@FUNCTION, $1, $0
-	i32.const	$push32=, 0
-	i32.load	$push3=, e($pop32)
-	i32.const	$push31=, 1
-	i32.ne  	$push4=, $pop3, $pop31
+	i32.const	$push28=, 0
+	i32.load	$push3=, e($pop28)
+	i32.const	$push27=, 1
+	i32.ne  	$push4=, $pop3, $pop27
 	br_if   	0, $pop4        # 0: down to label1
-# BB#2:                                 # %if.end5
+# %bb.2:                                # %if.end5
 	call    	foo@FUNCTION, $2, $2
-	i32.const	$push34=, 0
-	i32.load	$push5=, e($pop34)
-	i32.const	$push33=, 2
-	i32.ne  	$push6=, $pop5, $pop33
+	i32.const	$push30=, 0
+	i32.load	$push5=, e($pop30)
+	i32.const	$push29=, 2
+	i32.ne  	$push6=, $pop5, $pop29
 	br_if   	0, $pop6        # 0: down to label1
-# BB#3:                                 # %if.end10
+# %bb.3:                                # %if.end10
 	call    	foo@FUNCTION, $2, $0
-	i32.const	$push36=, 0
-	i32.load	$push7=, e($pop36)
-	i32.const	$push35=, 2
-	i32.ne  	$push8=, $pop7, $pop35
+	i32.const	$push32=, 0
+	i32.load	$push7=, e($pop32)
+	i32.const	$push31=, 2
+	i32.ne  	$push8=, $pop7, $pop31
 	br_if   	0, $pop8        # 0: down to label1
-# BB#4:                                 # %if.end14
+# %bb.4:                                # %if.end14
 	call    	foo@FUNCTION, $0, $2
-	i32.const	$push38=, 0
-	i32.load	$push9=, e($pop38)
-	i32.const	$push37=, 2
-	i32.ne  	$push10=, $pop9, $pop37
+	i32.const	$push34=, 0
+	i32.load	$push9=, e($pop34)
+	i32.const	$push33=, 2
+	i32.ne  	$push10=, $pop9, $pop33
 	br_if   	0, $pop10       # 0: down to label1
-# BB#5:                                 # %if.end18
+# %bb.5:                                # %if.end18
 	call    	foo@FUNCTION, $0, $0
-	i32.const	$push40=, 0
-	i32.load	$push11=, e($pop40)
-	i32.const	$push39=, 2
-	i32.ne  	$push12=, $pop11, $pop39
+	i32.const	$push36=, 0
+	i32.load	$push11=, e($pop36)
+	i32.const	$push35=, 2
+	i32.ne  	$push12=, $pop11, $pop35
 	br_if   	0, $pop12       # 0: down to label1
-# BB#6:                                 # %if.end21
+# %bb.6:                                # %if.end21
 	i32.call	$push13=, bar@FUNCTION, $1, $2
 	i32.const	$push14=, 1
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label1
-# BB#7:                                 # %if.end26
+# %bb.7:                                # %if.end26
 	i32.call	$push16=, bar@FUNCTION, $1, $0
 	br_if   	0, $pop16       # 0: down to label1
-# BB#8:                                 # %if.end31
+# %bb.8:                                # %if.end31
 	i32.call	$push17=, bar@FUNCTION, $2, $2
 	i32.const	$push18=, 1
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label1
-# BB#9:                                 # %if.end37
+# %bb.9:                                # %if.end37
 	i32.call	$push20=, bar@FUNCTION, $2, $0
 	br_if   	0, $pop20       # 0: down to label1
-# BB#10:                                # %if.end42
+# %bb.10:                               # %if.end42
 	i32.call	$push21=, bar@FUNCTION, $0, $2
 	br_if   	0, $pop21       # 0: down to label1
-# BB#11:                                # %if.end47
+# %bb.11:                               # %if.end47
 	i32.call	$push22=, bar@FUNCTION, $0, $0
 	br_if   	0, $pop22       # 0: down to label1
-# BB#12:                                # %if.end51
+# %bb.12:                               # %if.end51
 	i32.const	$push23=, 0
 	return  	$pop23
 .LBB2_13:                               # %if.then
@@ -147,5 +145,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43438.c.s b/test/torture-s/pr43438.c.s
index 7b187bc7b..b861d3519 100644
--- a/test/torture-s/pr43438.c.s
+++ b/test/torture-s/pr43438.c.s
@@ -6,22 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
-	i32.const	$push1=, 0
-	i32.const	$push0=, 1
-	i32.store	g_9($pop1), $pop0
-	i32.const	$push2=, 0
-                                        # fallthrough-return: $pop2
+# %bb.0:                                # %if.end
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
                                         # -- End function
-	.type	g_9,@object             # @g_9
-	.section	.bss.g_9,"aw",@nobits
-	.p2align	2
-g_9:
-	.int32	0                       # 0x0
-	.size	g_9, 4
 
-
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr43560.c.s b/test/torture-s/pr43560.c.s
index 945cf2a7b..1341c6a2b 100644
--- a/test/torture-s/pr43560.c.s
+++ b/test/torture-s/pr43560.c.s
@@ -7,39 +7,35 @@
 test:                                   # @test
 	.param  	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$3=, 4($0)
 	block   	
-	i32.load	$push8=, 4($0)
-	tee_local	$push7=, $3=, $pop8
 	i32.const	$push0=, 2
-	i32.lt_s	$push1=, $pop7, $pop0
+	i32.lt_s	$push1=, $3, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %land.rhs.preheader
+# %bb.1:                                # %land.rhs.preheader
 	i32.const	$push5=, 4
 	i32.add 	$2=, $0, $pop5
 .LBB0_2:                                # %land.rhs
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push15=, -1
-	i32.add 	$push14=, $3, $pop15
-	tee_local	$push13=, $3=, $pop14
-	i32.add 	$push2=, $0, $pop13
-	i32.const	$push12=, 8
-	i32.add 	$push11=, $pop2, $pop12
-	tee_local	$push10=, $1=, $pop11
-	i32.load8_u	$push3=, 0($pop10)
-	i32.const	$push9=, 47
-	i32.ne  	$push4=, $pop3, $pop9
+	i32.const	$push9=, -1
+	i32.add 	$3=, $3, $pop9
+	i32.add 	$push2=, $0, $3
+	i32.const	$push8=, 8
+	i32.add 	$1=, $pop2, $pop8
+	i32.load8_u	$push3=, 0($1)
+	i32.const	$push7=, 47
+	i32.ne  	$push4=, $pop3, $pop7
 	br_if   	1, $pop4        # 1: down to label0
-# BB#3:                                 # %while.body
+# %bb.3:                                # %while.body
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.store	0($2), $3
-	i32.const	$push19=, 0
-	i32.store8	0($1), $pop19
-	i32.load	$push18=, 0($2)
-	tee_local	$push17=, $3=, $pop18
-	i32.const	$push16=, 1
-	i32.gt_s	$push6=, $pop17, $pop16
+	i32.const	$push11=, 0
+	i32.store8	0($1), $pop11
+	i32.load	$3=, 0($2)
+	i32.const	$push10=, 1
+	i32.gt_s	$push6=, $3, $pop10
 	br_if   	0, $pop6        # 0: up to label1
 .LBB0_4:                                # %while.end
 	end_loop
@@ -56,7 +52,7 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, s
 	#APP
 	#NO_APP
@@ -77,4 +73,4 @@ s:
 	.size	s, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr43629.c.s b/test/torture-s/pr43629.c.s
index cf22a33de..3f14ee3c4 100644
--- a/test/torture-s/pr43629.c.s
+++ b/test/torture-s/pr43629.c.s
@@ -6,12 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 0
 	i32.load	$push0=, flag($pop1)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end4
+# %bb.1:                                # %if.end4
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB0_2:                                # %if.then3
@@ -32,5 +32,5 @@ flag:
 	.size	flag, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43783.c.s b/test/torture-s/pr43783.c.s
index 3706ffe53..3bf5cea88 100644
--- a/test/torture-s/pr43783.c.s
+++ b/test/torture-s/pr43783.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i64.const	$push0=, 1
 	i64.store	bid_Kx192+32($pop1), $pop0
@@ -119,4 +119,4 @@ bid_Kx192:
 	.size	bid_Kx192, 768
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr43784.c.s b/test/torture-s/pr43784.c.s
index dc9d30bbe..dc8d08dc2 100644
--- a/test/torture-s/pr43784.c.s
+++ b/test/torture-s/pr43784.c.s
@@ -7,53 +7,48 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 256
-	i32.sub 	$push17=, $pop9, $pop11
-	tee_local	$push16=, $2=, $pop17
-	i32.store	__stack_pointer($pop12), $pop16
+	i32.sub 	$2=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $2
 	i32.const	$1=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push22=, v
-	i32.add 	$push0=, $1, $pop22
+	i32.const	$push18=, v
+	i32.add 	$push0=, $1, $pop18
 	i32.store8	0($pop0), $1
-	i32.const	$push21=, 1
-	i32.add 	$push20=, $1, $pop21
-	tee_local	$push19=, $1=, $pop20
-	i32.const	$push18=, 256
-	i32.ne  	$push1=, $pop19, $pop18
+	i32.const	$push17=, 1
+	i32.add 	$1=, $1, $pop17
+	i32.const	$push16=, 256
+	i32.ne  	$push1=, $1, $pop16
 	br_if   	0, $pop1        # 0: up to label0
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	call    	rp@FUNCTION, $2
 	i32.const	$push3=, v+4
 	i32.const	$push2=, 256
-	i32.call	$drop=, memcpy@FUNCTION, $pop3, $2, $pop2
-	i32.const	$1=, -1
+	i32.call	$0=, memcpy@FUNCTION, $pop3, $2, $pop2
+	i32.const	$1=, 0
 .LBB0_3:                                # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label2:
-	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.add 	$push4=, $1, $0
 	i32.load8_u	$push5=, 0($pop4)
-	i32.ne  	$push6=, $pop24, $pop5
+	i32.ne  	$push6=, $1, $pop5
 	br_if   	1, $pop6        # 1: down to label1
-# BB#4:                                 # %for.cond1
+# %bb.4:                                # %for.cond1
                                         #   in Loop: Header=BB0_3 Depth=1
-	copy_local	$1=, $0
-	i32.const	$push27=, 254
-	i32.le_u	$push7=, $0, $pop27
+	i32.const	$push20=, 1
+	i32.add 	$1=, $1, $pop20
+	i32.const	$push19=, 255
+	i32.le_u	$push7=, $1, $pop19
 	br_if   	0, $pop7        # 0: up to label2
-# BB#5:                                 # %for.end12
+# %bb.5:                                # %for.end12
 	end_loop
 	i32.const	$push15=, 0
 	i32.const	$push13=, 256
@@ -73,7 +68,7 @@ main:                                   # @main
 	.type	rp,@function            # -- Begin function rp
 rp:                                     # @rp
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, v
 	i32.const	$push0=, 256
 	i32.call	$drop=, memcpy@FUNCTION, $0, $pop1, $pop0
@@ -90,5 +85,5 @@ v:
 	.size	v, 260
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43835.c.s b/test/torture-s/pr43835.c.s
index 530599654..0fdb24ebb 100644
--- a/test/torture-s/pr43835.c.s
+++ b/test/torture-s/pr43835.c.s
@@ -6,7 +6,7 @@
 	.type	Parrot_gc_mark_PMC_alive_fun,@function
 Parrot_gc_mark_PMC_alive_fun:           # @Parrot_gc_mark_PMC_alive_fun
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -19,7 +19,7 @@ Parrot_gc_mark_PMC_alive_fun:           # @Parrot_gc_mark_PMC_alive_fun
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	mark_cell@FUNCTION, $0, $1
                                         # fallthrough-return
 	.endfunc
@@ -30,26 +30,25 @@ foo:                                    # @foo
 	.type	mark_cell,@function     # -- Begin function mark_cell
 mark_cell:                              # @mark_cell
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 4
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %land.lhs.true
-	i32.load	$push9=, 0($1)
-	tee_local	$push8=, $1=, $pop9
-	i32.eqz 	$push10=, $pop8
-	br_if   	0, $pop10       # 0: down to label1
-# BB#2:                                 # %land.lhs.true1
+# %bb.1:                                # %land.lhs.true
+	i32.load	$1=, 0($1)
+	i32.eqz 	$push8=, $1
+	br_if   	0, $pop8        # 0: down to label1
+# %bb.2:                                # %land.lhs.true1
 	i32.const	$push3=, 2
 	i32.add 	$push4=, $1, $pop3
 	i32.load8_u	$push5=, 0($pop4)
 	i32.const	$push6=, 4
 	i32.and 	$push7=, $pop5, $pop6
-	i32.eqz 	$push11=, $pop7
-	br_if   	1, $pop11       # 1: down to label0
+	i32.eqz 	$push9=, $pop7
+	br_if   	1, $pop9        # 1: down to label0
 .LBB2_3:                                # %if.end
 	end_block                       # label1:
 	return
@@ -68,14 +67,13 @@ mark_cell:                              # @mark_cell
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push13=, $pop3, $pop5
-	tee_local	$push12=, $0=, $pop13
-	i32.store	__stack_pointer($pop6), $pop12
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i32.const	$push0=, 4
 	i32.store	8($0), $pop0
 	i64.const	$push1=, 180388626432
@@ -94,5 +92,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr43987.c.s b/test/torture-s/pr43987.c.s
index 870e7d0a1..d4044713a 100644
--- a/test/torture-s/pr43987.c.s
+++ b/test/torture-s/pr43987.c.s
@@ -6,7 +6,7 @@
 	.type	add_input_file,@function
 add_input_file:                         # @add_input_file
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, B+4($pop0)
 	i32.store	0($pop1), $0
@@ -21,7 +21,7 @@ add_input_file:                         # @add_input_file
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
@@ -46,4 +46,4 @@ B:
 	.size	B, 1024
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr44164.c.s b/test/torture-s/pr44164.c.s
index 139a457df..dcc10d20a 100644
--- a/test/torture-s/pr44164.c.s
+++ b/test/torture-s/pr44164.c.s
@@ -8,7 +8,7 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$1=, 0($0)
 	i32.const	$push0=, 0
 	i32.const	$push3=, 0
@@ -26,7 +26,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.const	$push0=, 1
 	i32.store	a($pop5), $pop0
@@ -36,7 +36,7 @@ main:                                   # @main
 	i32.const	$push4=, 1
 	i32.ne  	$push3=, $pop2, $pop4
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -57,5 +57,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44202-1.c.s b/test/torture-s/pr44202-1.c.s
index a8da094a0..886b04981 100644
--- a/test/torture-s/pr44202-1.c.s
+++ b/test/torture-s/pr44202-1.c.s
@@ -8,19 +8,18 @@ add512:                                 # @add512
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 512
-	i32.add 	$push2=, $0, $pop0
-	tee_local	$push1=, $2=, $pop2
-	i32.eqz 	$push3=, $pop1
-	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.then
+	i32.add 	$2=, $0, $pop0
+	block   	
+	i32.eqz 	$push1=, $2
+	br_if   	0, $pop1        # 0: down to label0
+# %bb.1:                                # %if.then
 	i32.store	0($1), $0
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
-	copy_local	$push4=, $2
-                                        # fallthrough-return: $pop4
+	copy_local	$push2=, $2
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end0:
 	.size	add512, .Lfunc_end0-add512
@@ -33,20 +32,19 @@ add513:                                 # @add513
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 513
-	i32.add 	$push2=, $0, $pop0
-	tee_local	$push1=, $2=, $pop2
-	i32.eqz 	$push3=, $pop1
-	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+	i32.add 	$2=, $0, $pop0
+	block   	
+	i32.eqz 	$push1=, $2
+	br_if   	0, $pop1        # 0: down to label1
+# %bb.1:                                # %if.end
 	return  	$2
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
 	i32.store	0($1), $0
-	copy_local	$push4=, $2
-                                        # fallthrough-return: $pop4
+	copy_local	$push2=, $2
+                                        # fallthrough-return: $pop2
 	.endfunc
 .Lfunc_end1:
 	.size	add513, .Lfunc_end1-add513
@@ -58,14 +56,13 @@ add513:                                 # @add513
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push19=, $pop8, $pop10
-	tee_local	$push18=, $0=, $pop19
-	i32.store	__stack_pointer($pop11), $pop18
+	i32.sub 	$0=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $0
 	i32.const	$push17=, -1
 	i32.store	12($0), $pop17
 	i32.const	$push16=, -1
@@ -76,23 +73,23 @@ main:                                   # @main
 	i32.add 	$push13=, $0, $pop12
 	i32.call	$push2=, add512@FUNCTION, $pop1, $pop13
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 12($0)
-	i32.const	$push20=, -1
-	i32.ne  	$push3=, $pop0, $pop20
+	i32.const	$push18=, -1
+	i32.ne  	$push3=, $pop0, $pop18
 	br_if   	0, $pop3        # 0: down to label2
-# BB#2:                                 # %lor.lhs.false2
-	i32.const	$push21=, -513
+# %bb.2:                                # %lor.lhs.false2
+	i32.const	$push19=, -513
 	i32.const	$push14=, 8
 	i32.add 	$push15=, $0, $pop14
-	i32.call	$push5=, add513@FUNCTION, $pop21, $pop15
+	i32.call	$push5=, add513@FUNCTION, $pop19, $pop15
 	br_if   	0, $pop5        # 0: down to label2
-# BB#3:                                 # %lor.lhs.false2
+# %bb.3:                                # %lor.lhs.false2
 	i32.load	$push4=, 8($0)
-	i32.const	$push22=, -513
-	i32.ne  	$push6=, $pop4, $pop22
+	i32.const	$push20=, -513
+	i32.ne  	$push6=, $pop4, $pop20
 	br_if   	0, $pop6        # 0: down to label2
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push7=, 0
 	call    	exit@FUNCTION, $pop7
 	unreachable
@@ -105,6 +102,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr44468.c.s b/test/torture-s/pr44468.c.s
index 86fc81ce8..c1541eed6 100644
--- a/test/torture-s/pr44468.c.s
+++ b/test/torture-s/pr44468.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.store	s+4($pop0), $pop4
@@ -27,7 +27,7 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.store	s+4($pop0), $pop4
@@ -47,7 +47,7 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.store	s+4($pop0), $pop4
@@ -66,7 +66,7 @@ test3:                                  # @test3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i64.const	$push11=, 8589934593
 	i64.store	s+4($pop12):p2align=2, $pop11
@@ -76,7 +76,7 @@ main:                                   # @main
 	i32.const	$push9=, 3
 	i32.ne  	$push1=, $pop0, $pop9
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push16=, 0
 	i64.const	$push15=, 8589934593
 	i64.store	s+4($pop16):p2align=2, $pop15
@@ -85,7 +85,7 @@ main:                                   # @main
 	i32.const	$push13=, 3
 	i32.ne  	$push3=, $pop2, $pop13
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push17=, 0
 	i64.const	$push4=, 8589934593
 	i64.store	s+4($pop17):p2align=2, $pop4
@@ -94,7 +94,7 @@ main:                                   # @main
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	i32.const	$push18=, 0
 	return  	$pop18
 .LBB3_4:                                # %if.then
@@ -115,5 +115,5 @@ s:
 	.size	s, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44555.c.s b/test/torture-s/pr44555.c.s
index 0dddacc83..52cb965d0 100644
--- a/test/torture-s/pr44555.c.s
+++ b/test/torture-s/pr44555.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.ne  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -29,4 +29,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr44575.c.s b/test/torture-s/pr44575.c.s
index 8a13047e4..dcf2a17e3 100644
--- a/test/torture-s/pr44575.c.s
+++ b/test/torture-s/pr44575.c.s
@@ -6,76 +6,76 @@
 	.type	check,@function
 check:                                  # @check
 	.param  	i32, i32
-	.local  	f32, i32, i32
-# BB#0:                                 # %entry
-	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   	
+	.local  	i32, f32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push10=, 0
+	i32.load	$push9=, __stack_pointer($pop10)
+	i32.const	$push11=, 16
+	i32.sub 	$5=, $pop9, $pop11
+	i32.store	12($5), $1
+	i32.const	$push13=, 4
+	i32.shl 	$2=, $0, $pop13
+	i32.const	$push12=, 0
+	f32.load	$3=, a+32($pop12)
+	i32.const	$0=, 3
+.LBB0_1:                                # %for.body
+                                        # =>This Inner Loop Header: Depth=1
+	loop    	                # label0:
 	block   	
 	block   	
 	block   	
-	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
+	i32.const	$push16=, -1
+	i32.add 	$push1=, $0, $pop16
+	i32.const	$push15=, 2147483646
+	i32.and 	$push2=, $pop1, $pop15
+	i32.or  	$push3=, $pop2, $2
+	i32.const	$push14=, 18
+	i32.ne  	$push4=, $pop3, $pop14
 	br_if   	0, $pop4        # 0: down to label3
-# 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
+# %bb.2:                                # %land.lhs.true
+                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.load	$4=, 12($5)
+	i32.const	$push18=, 12
+	i32.add 	$push6=, $4, $pop18
+	i32.store	12($5), $pop6
+	i32.const	$push17=, 0
+	i32.load	$1=, fails($pop17)
+	f32.load	$push7=, 8($4)
+	f32.eq  	$push8=, $3, $pop7
+	br_if   	2, $pop8        # 2: down to label1
+# %bb.3:                                # %if.then
+                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push19=, 1
+	i32.add 	$1=, $1, $pop19
+	br      	1               # 1: down to label2
+.LBB0_4:                                # %sw.epilog.thread
+                                        #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label3:
-	i32.const	$push30=, 0
-	i32.load	$0=, fails($pop30)
-.LBB0_4:                                # %if.end.sink.split
+	i32.const	$push21=, 0
+	i32.load	$push5=, fails($pop21)
+	i32.const	$push20=, 1
+	i32.add 	$1=, $pop5, $pop20
+.LBB0_5:                                # %if.end.sink.split
+                                        #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
-	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
+	i32.const	$push22=, 0
+	i32.store	fails($pop22), $1
+.LBB0_6:                                # %if.end
+                                        #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label1:
 	block   	
-	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:
-	i32.const	$push18=, 0
-	i32.const	$push17=, 1
-	i32.store	fails($pop18), $pop17
+	br_if   	0, $1           # 0: down to label4
+# %bb.7:                                # %if.end
+                                        #   in Loop: Header=BB0_1 Depth=1
+	i32.const	$push24=, 4
+	i32.lt_u	$1=, $0, $pop24
+	i32.const	$push23=, 1
+	i32.add 	$push0=, $0, $pop23
+	copy_local	$0=, $pop0
+	br_if   	1, $1           # 1: up to label0
 .LBB0_8:                                # %for.end
-	end_block                       # label0:
+	end_block                       # label4:
+	end_loop
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -88,33 +88,31 @@ check:                                  # @check
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	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.sub 	$1=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $1
+	i32.const	$push26=, 0
 	i32.const	$push0=, -952139264
-	i32.store	a+32($pop28), $pop0
+	i32.store	a+32($pop26), $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	$push25=, -952139264
+	i32.store	0($pop2), $pop25
 	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
-	i64.load	$push23=, a+24($pop24)
-	tee_local	$push22=, $0=, $pop23
-	i64.store	32($1), $pop22
+	i32.const	$push24=, 8
+	i32.add 	$push3=, $pop16, $pop24
+	i32.const	$push23=, -952139264
+	i32.store	0($pop3), $pop23
+	i32.const	$push22=, 0
+	i64.load	$0=, a+24($pop22)
+	i64.store	32($1), $0
 	i64.store	16($1), $0
 	i32.const	$push17=, 16
 	i32.add 	$push18=, $1, $pop17
@@ -128,13 +126,13 @@ main:                                   # @main
 	i32.const	$push21=, 0
 	i32.load	$push5=, fails($pop21)
 	br_if   	0, $pop5        # 0: down to label5
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	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
+	i32.const	$push27=, 0
+	return  	$pop27
 .LBB1_2:                                # %if.then
 	end_block                       # label5:
 	call    	abort@FUNCTION
@@ -162,5 +160,5 @@ a:
 	.size	a, 60
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44683.c.s b/test/torture-s/pr44683.c.s
index 6d1880a9b..8f506fa6e 100644
--- a/test/torture-s/pr44683.c.s
+++ b/test/torture-s/pr44683.c.s
@@ -7,17 +7,17 @@
 copysign_bug:                           # @copysign_bug
 	.param  	f64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push10=, 0x0p0
 	f64.eq  	$push2=, $0, $pop10
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	f64.const	$push1=, 0x1p-1
 	f64.mul 	$push0=, $0, $pop1
 	f64.ne  	$push3=, $pop0, $0
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %return
+# %bb.2:                                # %return
 	i32.const	$push11=, 1
 	return  	$pop11
 .LBB0_3:                                # %if.end
@@ -40,14 +40,14 @@ copysign_bug:                           # @copysign_bug
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	f64.const	$push0=, -0x0p0
 	i32.call	$push1=, copysign_bug@FUNCTION, $pop0
 	i32.const	$push2=, 2
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -59,5 +59,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44828.c.s b/test/torture-s/pr44828.c.s
index c97130071..0f95bee12 100644
--- a/test/torture-s/pr44828.c.s
+++ b/test/torture-s/pr44828.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push7=, 0
 	i32.load8_u	$push0=, a($pop7)
@@ -17,7 +17,7 @@ main:                                   # @main
 	i32.const	$push5=, 1
 	i32.ge_s	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB0_2:                                # %if.then
@@ -38,5 +38,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44852.c.s b/test/torture-s/pr44852.c.s
index 72fd9f8d8..53f4c62b3 100644
--- a/test/torture-s/pr44852.c.s
+++ b/test/torture-s/pr44852.c.s
@@ -8,36 +8,32 @@ sf:                                     # @sf
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push8=, -1
+	i32.add 	$2=, $0, $pop8
 	#APP
 	#NO_APP
+	i32.load8_u	$3=, 0($2)
 	block   	
 	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
+	i32.ne  	$push0=, $3, $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
+# %bb.2:                                # %while.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.const	$push10=, -1
+	i32.add 	$2=, $2, $pop10
+	i32.load8_u	$3=, 0($2)
+	i32.const	$push9=, 57
+	i32.eq  	$push2=, $3, $pop9
 	br_if   	0, $pop2        # 0: up to label3
-# BB#3:                                 # %while.end.loopexit
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i32.const	$push3=, 1
 	i32.add 	$0=, $2, $pop3
@@ -48,8 +44,8 @@ sf:                                     # @sf
 .LBB0_5:                                # %if.then
 	end_block                       # label1:
 	i32.const	$3=, 48
-	i32.const	$push19=, 48
-	i32.store8	0($1), $pop19
+	i32.const	$push11=, 48
+	i32.store8	0($1), $pop11
 	i32.const	$push4=, 1
 	i32.add 	$0=, $2, $pop4
 .LBB0_6:                                # %while.end
@@ -57,8 +53,8 @@ sf:                                     # @sf
 	i32.const	$push5=, 1
 	i32.add 	$push6=, $3, $pop5
 	i32.store8	0($1), $pop6
-	copy_local	$push20=, $0
-                                        # fallthrough-return: $pop20
+	copy_local	$push12=, $0
+                                        # fallthrough-return: $pop12
 	.endfunc
 .Lfunc_end0:
 	.size	sf, .Lfunc_end0-sf
@@ -70,14 +66,13 @@ sf:                                     # @sf
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	i32.const	$push18=, 0
 	i32.load	$push17=, __stack_pointer($pop18)
 	i32.const	$push19=, 16
-	i32.sub 	$push35=, $pop17, $pop19
-	tee_local	$push34=, $0=, $pop35
-	i32.store	__stack_pointer($pop20), $pop34
+	i32.sub 	$0=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $0
 	i32.const	$push2=, 14
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -105,13 +100,13 @@ main:                                   # @main
 	i32.or  	$push9=, $pop25, $pop8
 	i32.ne  	$push13=, $pop12, $pop9
 	br_if   	0, $pop13       # 0: down to label4
-# BB#1:                                 # %lor.lhs.false
+# %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 label4
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push23=, 0
 	i32.const	$push21=, 16
 	i32.add 	$push22=, $0, $pop21
@@ -138,6 +133,6 @@ main:                                   # @main
 	.size	.L.str, 7
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 472d98e1b..d04e312b5 100644
--- a/test/torture-s/pr44858.c.s
+++ b/test/torture-s/pr44858.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.div_s	$push0=, $0, $1
 	i64.extend_s/i32	$push1=, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, a($pop5)
@@ -40,7 +40,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, bar@FUNCTION
 	block   	
 	i32.const	$push3=, 0
@@ -48,7 +48,7 @@ main:                                   # @main
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB2_2:                                # %if.then
@@ -78,5 +78,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr44942.c.s b/test/torture-s/pr44942.c.s
index 23ea3355f..e924fd271 100644
--- a/test/torture-s/pr44942.c.s
+++ b/test/torture-s/pr44942.c.s
@@ -7,14 +7,13 @@
 test1:                                  # @test1
 	.param  	i32, i32, i32, i32, i32, i32, i32, i64, i64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop5, $pop7
-	tee_local	$push12=, $10=, $pop13
-	i32.store	__stack_pointer($pop8), $pop12
+	i32.sub 	$10=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $10
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $9, $pop0
 	i32.store	12($10), $pop1
@@ -23,7 +22,7 @@ test1:                                  # @test1
 	i32.const	$push3=, 1234
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push11=, 0
 	i32.const	$push9=, 16
 	i32.add 	$push10=, $10, $pop9
@@ -44,14 +43,13 @@ test1:                                  # @test1
 test2:                                  # @test2
 	.param  	i32, i32, i32, i32, i32, i32, i32, i64, i64, i32, i64, i64, i32, i64, i64, i32, i64, i64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push13=, $pop5, $pop7
-	tee_local	$push12=, $19=, $pop13
-	i32.store	__stack_pointer($pop8), $pop12
+	i32.sub 	$19=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $19
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $18, $pop0
 	i32.store	12($19), $pop1
@@ -60,7 +58,7 @@ test2:                                  # @test2
 	i32.const	$push3=, 1234
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push11=, 0
 	i32.const	$push9=, 16
 	i32.add 	$push10=, $19, $pop9
@@ -81,28 +79,26 @@ test2:                                  # @test2
 test3:                                  # @test3
 	.param  	f64, f64, f64, f64, f64, f64, f64, i64, i64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop8, $pop10
-	tee_local	$push17=, $10=, $pop18
-	i32.store	__stack_pointer($pop11), $pop17
+	i32.sub 	$10=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $10
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $9, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push16=, $pop1, $pop2
-	tee_local	$push15=, $9=, $pop16
+	i32.and 	$9=, $pop1, $pop2
 	i32.const	$push3=, 8
-	i32.add 	$push4=, $pop15, $pop3
+	i32.add 	$push4=, $9, $pop3
 	i32.store	12($10), $pop4
 	block   	
 	f64.load	$push5=, 0($9)
 	f64.const	$push6=, 0x1.348p10
 	f64.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push14=, 0
 	i32.const	$push12=, 16
 	i32.add 	$push13=, $10, $pop12
@@ -123,28 +119,26 @@ test3:                                  # @test3
 test4:                                  # @test4
 	.param  	f64, f64, f64, f64, f64, f64, f64, i64, i64, f64, i64, i64, f64, i64, i64, f64, i64, i64, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 16
-	i32.sub 	$push18=, $pop8, $pop10
-	tee_local	$push17=, $19=, $pop18
-	i32.store	__stack_pointer($pop11), $pop17
+	i32.sub 	$19=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $19
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $18, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push16=, $pop1, $pop2
-	tee_local	$push15=, $18=, $pop16
+	i32.and 	$18=, $pop1, $pop2
 	i32.const	$push3=, 8
-	i32.add 	$push4=, $pop15, $pop3
+	i32.add 	$push4=, $18, $pop3
 	i32.store	12($19), $pop4
 	block   	
 	f64.load	$push5=, 0($18)
 	f64.const	$push6=, 0x1.348p10
 	f64.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push14=, 0
 	i32.const	$push12=, 16
 	i32.add 	$push13=, $19, $pop12
@@ -165,14 +159,13 @@ test4:                                  # @test4
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 128
-	i32.sub 	$push25=, $pop6, $pop8
-	tee_local	$push24=, $2=, $pop25
-	i32.store	__stack_pointer($pop9), $pop24
+	i32.sub 	$2=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $2
 	i32.const	$push0=, 1234
 	i32.store	120($2), $pop0
 	i32.const	$push13=, 112
@@ -208,5 +201,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr45034.c.s b/test/torture-s/pr45034.c.s
index b4d431ea3..f85126b5b 100644
--- a/test/torture-s/pr45034.c.s
+++ b/test/torture-s/pr45034.c.s
@@ -6,14 +6,14 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 128
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, 256
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,40 +30,38 @@ foo:                                    # @foo
 test_neg:                               # @test_neg
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -128
 	i32.const	$0=, -2147483648
 .LBB1_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
+	i32.const	$push8=, 0
+	i32.sub 	$push0=, $pop8, $1
+	i32.const	$push7=, 24
+	i32.shl 	$push1=, $pop0, $pop7
+	i32.const	$push6=, 24
+	i32.shr_s	$2=, $pop1, $pop6
 	block   	
-	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
+	i32.lt_s	$push2=, $2, $pop5
 	br_if   	0, $pop2        # 0: down to label2
-# BB#2:                                 # %cond.true.i
+# %bb.2:                                # %cond.true.i
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push11=, 24
-	i32.shr_s	$2=, $0, $pop11
+	i32.const	$push9=, 24
+	i32.shr_s	$2=, $0, $pop9
 .LBB1_3:                                # %fixnum_neg.exit
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label2:
 	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
+	i32.const	$push12=, -16777216
+	i32.add 	$0=, $0, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$1=, $1, $pop11
+	i32.const	$push10=, 128
+	i32.ne  	$push3=, $1, $pop10
 	br_if   	0, $pop3        # 0: up to label1
-# BB#4:                                 # %for.end
+# %bb.4:                                # %for.end
 	end_loop
 	i32.const	$push4=, 0
                                         # fallthrough-return: $pop4
@@ -78,40 +76,38 @@ test_neg:                               # @test_neg
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -128
 	i32.const	$0=, -2147483648
 .LBB2_1:                                # %for.cond.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
+	i32.const	$push8=, 0
+	i32.sub 	$push0=, $pop8, $1
+	i32.const	$push7=, 24
+	i32.shl 	$push1=, $pop0, $pop7
+	i32.const	$push6=, 24
+	i32.shr_s	$2=, $pop1, $pop6
 	block   	
-	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
+	i32.lt_s	$push2=, $2, $pop5
 	br_if   	0, $pop2        # 0: down to label4
-# BB#2:                                 # %cond.true.i.i
+# %bb.2:                                # %cond.true.i.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push11=, 24
-	i32.shr_s	$2=, $0, $pop11
+	i32.const	$push9=, 24
+	i32.shr_s	$2=, $0, $pop9
 .LBB2_3:                                # %fixnum_neg.exit.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	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
+	i32.const	$push12=, -16777216
+	i32.add 	$0=, $0, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$1=, $1, $pop11
+	i32.const	$push10=, 128
+	i32.ne  	$push3=, $1, $pop10
 	br_if   	0, $pop3        # 0: up to label3
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	end_loop
 	i32.const	$push4=, 0
                                         # fallthrough-return: $pop4
@@ -120,5 +116,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr45070.c.s b/test/torture-s/pr45070.c.s
index 2040eb22c..3fd934207 100644
--- a/test/torture-s/pr45070.c.s
+++ b/test/torture-s/pr45070.c.s
@@ -7,64 +7,59 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	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=, $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
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 16
+	i32.sub 	$2=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $2
+	i32.const	$1=, 0
+	i32.const	$push13=, 0
+	i32.store	8($2), $pop13
+	i64.const	$push0=, 0
+	i64.store	0($2), $pop0
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
 	i32.call	$0=, next@FUNCTION, $2
 	block   	
-	i32.const	$push18=, -1
-	i32.ne  	$push2=, $1, $pop18
-	br_if   	0, $pop2        # 0: down to label2
-# BB#2:                                 # %for.body
+	br_if   	0, $1           # 0: down to label2
+# %bb.2:                                # %for.body
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.const	$push15=, 65535
+	i32.and 	$push1=, $0, $pop15
+	i32.const	$push14=, 65535
+	i32.ne  	$push2=, $pop1, $pop14
+	br_if   	2, $pop2        # 2: down to label0
 .LBB0_3:                                # %lor.lhs.false
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label2:
 	block   	
-	i32.const	$push21=, -1
-	i32.eq  	$push5=, $1, $pop21
-	br_if   	0, $pop5        # 0: down to label3
-# BB#4:                                 # %lor.lhs.false
+	i32.eqz 	$push19=, $1
+	br_if   	0, $pop19       # 0: down to label3
+# %bb.4:                                # %lor.lhs.false
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push22=, 65535
-	i32.and 	$push6=, $0, $pop22
-	br_if   	2, $pop6        # 2: down to label0
+	i32.const	$push16=, 65535
+	i32.and 	$push3=, $0, $pop16
+	br_if   	2, $pop3        # 2: down to label0
 .LBB0_5:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_block                       # label3:
-	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
+	i32.const	$push18=, 1
+	i32.add 	$1=, $1, $pop18
+	i32.const	$push17=, 15
+	i32.le_u	$push4=, $1, $pop17
+	br_if   	0, $pop4        # 0: up to label1
+# %bb.6:                                # %for.end
 	end_loop
-	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
+	i32.const	$push12=, 0
+	i32.const	$push10=, 16
+	i32.add 	$push11=, $2, $pop10
+	i32.store	__stack_pointer($pop12), $pop11
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB0_7:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -79,7 +74,7 @@ next:                                   # @next
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$3=, 0
 	block   	
 	block   	
@@ -87,7 +82,7 @@ next:                                   # @next
 	i32.load	$push0=, 4($0)
 	i32.lt_s	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label5
-# BB#1:                                 # %if.then.lr.ph
+# %bb.1:                                # %if.then.lr.ph
 	i32.const	$push3=, 8
 	i32.add 	$1=, $0, $pop3
 	i32.const	$push5=, 4
@@ -98,7 +93,7 @@ next:                                   # @next
 	i32.load	$push4=, 0($1)
 	i32.eqz 	$push14=, $pop4
 	br_if   	2, $pop14       # 2: down to label4
-# BB#3:                                 # %if.then1
+# %bb.3:                                # %if.then1
                                         #   in Loop: Header=BB1_2 Depth=1
 	i32.const	$3=, 0
 	i32.const	$push13=, 0
@@ -128,7 +123,7 @@ next:                                   # @next
 	.type	fetch,@function         # -- Begin function fetch
 fetch:                                  # @fetch
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 128
 	i32.store	4($0), $pop0
                                         # fallthrough-return
@@ -137,5 +132,5 @@ fetch:                                  # @fetch
 	.size	fetch, .Lfunc_end2-fetch
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr45262.c.s b/test/torture-s/pr45262.c.s
index cd7ffc091..948ed6b2d 100644
--- a/test/torture-s/pr45262.c.s
+++ b/test/torture-s/pr45262.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 1
 	i32.const	$push0=, 0
 	i32.sub 	$push2=, $pop0, $0
@@ -28,7 +28,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 1
 	i32.const	$push0=, 0
 	i32.sub 	$push2=, $pop0, $0
@@ -48,7 +48,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end20
+# %bb.0:                                # %if.end20
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -56,4 +56,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr45695.c.s b/test/torture-s/pr45695.c.s
index fc3ca2ce1..935fe65a2 100644
--- a/test/torture-s/pr45695.c.s
+++ b/test/torture-s/pr45695.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -21,7 +21,7 @@ g:                                      # @g
 f:                                      # @f
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $2, $1
 	call    	g@FUNCTION, $pop0
 	i32.const	$push2=, -1
@@ -39,27 +39,25 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	#APP
 	#NO_APP
-	block   	
-	i32.const	$push11=, 1
-	i32.add 	$push10=, $2, $pop11
-	tee_local	$push9=, $0=, $pop10
 	i32.const	$push0=, 4
-	i32.add 	$push8=, $2, $pop0
-	tee_local	$push7=, $1=, $pop8
-	i32.call	$push1=, f@FUNCTION, $2, $pop9, $pop7
+	i32.add 	$1=, $2, $pop0
+	i32.const	$push7=, 1
+	i32.add 	$0=, $2, $pop7
+	block   	
+	i32.call	$push1=, f@FUNCTION, $2, $0, $1
 	i32.const	$push2=, -1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.call	$push4=, f@FUNCTION, $1, $0, $1
-	i32.const	$push12=, 1
-	i32.ne  	$push5=, $pop4, $pop12
+	i32.const	$push8=, 1
+	i32.ne  	$push5=, $pop4, $pop8
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end9
+# %bb.2:                                # %if.end9
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB2_3:                                # %if.then
@@ -71,5 +69,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46019.c.s b/test/torture-s/pr46019.c.s
index fa03a56f9..877c94a89 100644
--- a/test/torture-s/pr46019.c.s
+++ b/test/torture-s/pr46019.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond.7
+# %bb.0:                                # %for.cond.7
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr46309.c.s b/test/torture-s/pr46309.c.s
index 7816e04bf..94cb7e0e2 100644
--- a/test/torture-s/pr46309.c.s
+++ b/test/torture-s/pr46309.c.s
@@ -6,21 +6,20 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$0=, 0($0)
 	block   	
 	block   	
-	i32.load	$push12=, 0($0)
-	tee_local	$push11=, $0=, $pop12
 	i32.const	$push0=, -2
-	i32.and 	$push1=, $pop11, $pop0
+	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 2
 	i32.eq  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push9=, 1
 	i32.ne  	$push10=, $0, $pop9
 	br_if   	0, $pop10       # 0: down to label1
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
 	i32.const	$push5=, 0
 	i32.load	$push6=, q($pop5)
 	i32.load	$push7=, 0($pop6)
@@ -45,14 +44,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push26=, $pop4, $pop6
-	tee_local	$push25=, $0=, $pop26
-	i32.store	__stack_pointer($pop7), $pop25
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	#APP
 	#NO_APP
 	i32.const	$push0=, 2
@@ -103,5 +101,5 @@ q:
 	.size	q, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46316.c.s b/test/torture-s/pr46316.c.s
index b30f4f27d..3b3c7b323 100644
--- a/test/torture-s/pr46316.c.s
+++ b/test/torture-s/pr46316.c.s
@@ -8,14 +8,13 @@ foo:                                    # @foo
 	.param  	i64
 	.result 	i64
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -1
-	i64.xor 	$push12=, $0, $pop0
-	tee_local	$push11=, $1=, $pop12
+	i64.xor 	$1=, $0, $pop0
 	i64.const	$push1=, 3
 	i64.const	$push10=, 3
 	i64.gt_s	$push2=, $1, $pop10
-	i64.select	$push3=, $pop11, $pop1, $pop2
+	i64.select	$push3=, $1, $pop1, $pop2
 	i64.add 	$push4=, $pop3, $0
 	i64.const	$push5=, 2
 	i64.add 	$push6=, $pop4, $pop5
@@ -33,14 +32,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, 0
 	i64.call	$push1=, foo@FUNCTION, $pop0
 	i64.const	$push2=, -4
 	i64.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -52,5 +51,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46909-1.c.s b/test/torture-s/pr46909-1.c.s
index e63dd1ee4..c96b6e535 100644
--- a/test/torture-s/pr46909-1.c.s
+++ b/test/torture-s/pr46909-1.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 1
 	i32.const	$push12=, 1
 	i32.const	$push4=, -1
@@ -33,16 +33,15 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -14
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push11=, 4
-	i32.add 	$push10=, $1, $pop11
-	tee_local	$push9=, $0=, $pop10
-	i32.call	$push3=, foo@FUNCTION, $pop9
+	i32.const	$push9=, 4
+	i32.add 	$0=, $1, $pop9
+	i32.call	$push3=, foo@FUNCTION, $0
 	i32.const	$push8=, 1
 	i32.eqz 	$push0=, $1
 	i32.const	$push7=, 1
@@ -50,14 +49,14 @@ main:                                   # @main
 	i32.sub 	$push2=, $pop8, $pop1
 	i32.ne  	$push4=, $pop3, $pop2
 	br_if   	1, $pop4        # 1: down to label0
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push13=, 1
-	i32.add 	$1=, $1, $pop13
-	i32.const	$push12=, 8
-	i32.le_s	$push5=, $0, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$1=, $1, $pop11
+	i32.const	$push10=, 8
+	i32.le_s	$push5=, $0, $pop10
 	br_if   	0, $pop5        # 0: up to label1
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	i32.const	$push6=, 0
 	return  	$pop6
@@ -70,5 +69,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr46909-2.c.s b/test/torture-s/pr46909-2.c.s
index a9bfbc509..597f99764 100644
--- a/test/torture-s/pr46909-2.c.s
+++ b/test/torture-s/pr46909-2.c.s
@@ -8,13 +8,13 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, 13
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$1=, 1
 	br_if   	1, $0           # 1: down to label0
 .LBB0_2:                                # %if.end
@@ -35,20 +35,19 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, -11
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
-	i32.const	$push15=, 12
-	i32.eq  	$0=, $2, $pop15
-	i32.const	$push14=, -1
-	i32.eq  	$1=, $2, $pop14
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $2, $pop13
-	tee_local	$push11=, $2=, $pop12
-	i32.call	$push4=, foo@FUNCTION, $pop11
+	i32.const	$push13=, 12
+	i32.eq  	$0=, $2, $pop13
+	i32.const	$push12=, -1
+	i32.eq  	$1=, $2, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$2=, $2, $pop11
+	i32.call	$push4=, foo@FUNCTION, $2
 	i32.const	$push10=, 1
 	i32.const	$push9=, 1
 	i32.shl 	$push1=, $1, $pop9
@@ -58,12 +57,12 @@ main:                                   # @main
 	i32.sub 	$push3=, $pop2, $pop0
 	i32.ne  	$push5=, $pop4, $pop3
 	br_if   	1, $pop5        # 1: down to label2
-# BB#2:                                 # %for.cond
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push16=, 28
-	i32.le_s	$push6=, $2, $pop16
+	i32.const	$push14=, 28
+	i32.le_s	$push6=, $2, $pop14
 	br_if   	0, $pop6        # 0: up to label3
-# BB#3:                                 # %for.end
+# %bb.3:                                # %for.end
 	end_loop
 	i32.const	$push7=, 0
 	return  	$pop7
@@ -76,5 +75,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr47148.c.s b/test/torture-s/pr47148.c.s
index 67d2c6acf..a911bd73b 100644
--- a/test/torture-s/pr47148.c.s
+++ b/test/torture-s/pr47148.c.s
@@ -6,22 +6,12 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
-	i32.const	$push2=, 0
-	i32.store	b($pop0), $pop2
-	i32.const	$push1=, 0
-                                        # fallthrough-return: $pop1
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
                                         # -- End function
-	.type	b,@object               # @b
-	.section	.data.b,"aw",@progbits
-	.p2align	2
-b:
-	.int32	1                       # 0x1
-	.size	b, 4
 
-
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr47155.c.s b/test/torture-s/pr47155.c.s
index 9b7b637ca..2a0ee5b2e 100644
--- a/test/torture-s/pr47155.c.s
+++ b/test/torture-s/pr47155.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	a($pop1), $pop0
@@ -35,4 +35,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr47237.c.s b/test/torture-s/pr47237.c.s
index 0f9829a0d..6dc58db39 100644
--- a/test/torture-s/pr47237.c.s
+++ b/test/torture-s/pr47237.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, foo@FUNCTION
 	i32.call	$push0=, __builtin_apply_args@FUNCTION
 	i32.const	$push1=, 16
@@ -21,12 +21,12 @@ main:                                   # @main
 	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 5
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -37,7 +37,7 @@ foo:                                    # @foo
 	.size	foo, .Lfunc_end1-foo
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d093f8eba..e9e541b4e 100644
--- a/test/torture-s/pr47299.c.s
+++ b/test/torture-s/pr47299.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 255
 	i32.mul 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,14 +21,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 64
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	i32.const	$push2=, 16320
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -40,5 +40,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr47337.c.s b/test/torture-s/pr47337.c.s
index a1a1030b4..ca86d9ecc 100644
--- a/test/torture-s/pr47337.c.s
+++ b/test/torture-s/pr47337.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, w($pop0)
 	i32.const	$push2=, .L.str.1
@@ -21,82 +21,78 @@ main:                                   # @main
 	i32.const	$push43=, 1
 	i32.store	0($pop3), $pop43
 	i32.const	$push42=, 4
-	i32.add 	$push41=, $1, $pop42
-	tee_local	$push40=, $1=, $pop41
-	br_if   	0, $pop40       # 0: up to label0
-# BB#2:                                 # %for.end6
+	i32.add 	$1=, $1, $pop42
+	br_if   	0, $1           # 0: up to label0
+# %bb.2:                                # %for.end6
 	end_loop
-	i32.const	$push46=, 0
-	i32.const	$push45=, 0
-	i32.store	d($pop46), $pop45
 	block   	
-	i32.eqz 	$push71=, $0
-	br_if   	0, $pop71       # 0: down to label1
-# BB#3:                                 # %if.then.i
-	i32.const	$push69=, 0
-	i32.const	$push68=, 0
-	i32.load	$push4=, b($pop68)
-	i32.const	$push5=, 1
-	i32.and 	$push6=, $pop4, $pop5
-	i32.const	$push7=, 2
-	i32.shl 	$push8=, $pop6, $pop7
-	i32.const	$push9=, a
-	i32.add 	$push10=, $pop8, $pop9
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push67=, 1
-	i32.and 	$push12=, $pop11, $pop67
-	i32.const	$push66=, 2
-	i32.shl 	$push13=, $pop12, $pop66
-	i32.const	$push65=, a
-	i32.add 	$push14=, $pop13, $pop65
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push64=, 1
-	i32.and 	$push16=, $pop15, $pop64
-	i32.const	$push63=, 2
-	i32.shl 	$push17=, $pop16, $pop63
-	i32.const	$push62=, a
-	i32.add 	$push18=, $pop17, $pop62
-	i32.load	$push19=, 0($pop18)
-	i32.const	$push61=, 1
-	i32.and 	$push20=, $pop19, $pop61
-	i32.const	$push60=, 2
-	i32.shl 	$push21=, $pop20, $pop60
-	i32.const	$push59=, a
-	i32.add 	$push22=, $pop21, $pop59
-	i32.load	$push23=, 0($pop22)
-	i32.const	$push58=, 1
-	i32.and 	$push24=, $pop23, $pop58
-	i32.const	$push57=, 2
-	i32.shl 	$push25=, $pop24, $pop57
-	i32.const	$push56=, a
-	i32.add 	$push26=, $pop25, $pop56
-	i32.load	$push27=, 0($pop26)
-	i32.const	$push55=, 1
-	i32.and 	$push28=, $pop27, $pop55
-	i32.const	$push54=, 2
-	i32.shl 	$push29=, $pop28, $pop54
-	i32.const	$push53=, a
-	i32.add 	$push30=, $pop29, $pop53
-	i32.load	$push31=, 0($pop30)
-	i32.const	$push52=, 1
-	i32.and 	$push32=, $pop31, $pop52
-	i32.const	$push51=, 2
-	i32.shl 	$push33=, $pop32, $pop51
-	i32.const	$push50=, a
-	i32.add 	$push34=, $pop33, $pop50
-	i32.load	$push35=, 0($pop34)
-	i32.const	$push49=, 1
-	i32.and 	$push36=, $pop35, $pop49
-	i32.const	$push48=, 2
-	i32.shl 	$push37=, $pop36, $pop48
-	i32.const	$push47=, a
-	i32.add 	$push38=, $pop37, $pop47
-	i32.load	$push39=, 0($pop38)
-	i32.store	b($pop69), $pop39
+	i32.eqz 	$push67=, $0
+	br_if   	0, $pop67       # 0: down to label1
+# %bb.3:                                # %if.then.i
+	i32.const	$push4=, 0
+	i32.const	$push66=, 0
+	i32.load	$push5=, b($pop66)
+	i32.const	$push6=, 1
+	i32.and 	$push7=, $pop5, $pop6
+	i32.const	$push8=, 2
+	i32.shl 	$push9=, $pop7, $pop8
+	i32.const	$push10=, a
+	i32.add 	$push11=, $pop9, $pop10
+	i32.load	$push12=, 0($pop11)
+	i32.const	$push65=, 1
+	i32.and 	$push13=, $pop12, $pop65
+	i32.const	$push64=, 2
+	i32.shl 	$push14=, $pop13, $pop64
+	i32.const	$push63=, a
+	i32.add 	$push15=, $pop14, $pop63
+	i32.load	$push16=, 0($pop15)
+	i32.const	$push62=, 1
+	i32.and 	$push17=, $pop16, $pop62
+	i32.const	$push61=, 2
+	i32.shl 	$push18=, $pop17, $pop61
+	i32.const	$push60=, a
+	i32.add 	$push19=, $pop18, $pop60
+	i32.load	$push20=, 0($pop19)
+	i32.const	$push59=, 1
+	i32.and 	$push21=, $pop20, $pop59
+	i32.const	$push58=, 2
+	i32.shl 	$push22=, $pop21, $pop58
+	i32.const	$push57=, a
+	i32.add 	$push23=, $pop22, $pop57
+	i32.load	$push24=, 0($pop23)
+	i32.const	$push56=, 1
+	i32.and 	$push25=, $pop24, $pop56
+	i32.const	$push55=, 2
+	i32.shl 	$push26=, $pop25, $pop55
+	i32.const	$push54=, a
+	i32.add 	$push27=, $pop26, $pop54
+	i32.load	$push28=, 0($pop27)
+	i32.const	$push53=, 1
+	i32.and 	$push29=, $pop28, $pop53
+	i32.const	$push52=, 2
+	i32.shl 	$push30=, $pop29, $pop52
+	i32.const	$push51=, a
+	i32.add 	$push31=, $pop30, $pop51
+	i32.load	$push32=, 0($pop31)
+	i32.const	$push50=, 1
+	i32.and 	$push33=, $pop32, $pop50
+	i32.const	$push49=, 2
+	i32.shl 	$push34=, $pop33, $pop49
+	i32.const	$push48=, a
+	i32.add 	$push35=, $pop34, $pop48
+	i32.load	$push36=, 0($pop35)
+	i32.const	$push47=, 1
+	i32.and 	$push37=, $pop36, $pop47
+	i32.const	$push46=, 2
+	i32.shl 	$push38=, $pop37, $pop46
+	i32.const	$push45=, a
+	i32.add 	$push39=, $pop38, $pop45
+	i32.load	$push40=, 0($pop39)
+	i32.store	b($pop4), $pop40
 .LBB0_4:                                # %if.end25
 	end_block                       # label1:
-	i32.const	$push70=, 0
-                                        # fallthrough-return: $pop70
+	i32.const	$push41=, 0
+                                        # fallthrough-return: $pop41
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -129,13 +125,6 @@ a:
 	.skip	1024
 	.size	a, 1024
 
-	.type	d,@object               # @d
-	.section	.bss.d,"aw",@nobits
-	.p2align	2
-d:
-	.int32	0                       # 0x0
-	.size	d, 4
-
 	.type	b,@object               # @b
 	.section	.bss.b,"aw",@nobits
 	.p2align	2
@@ -144,5 +133,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	strcmp, i32, i32, i32
diff --git a/test/torture-s/pr47538.c.s b/test/torture-s/pr47538.c.s
index 49f6923c4..ca972f079 100644
--- a/test/torture-s/pr47538.c.s
+++ b/test/torture-s/pr47538.c.s
@@ -7,39 +7,33 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32, f64, i32, i32, i32, f64, i32, f64, f64
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	f64.load	$11=, 0($1)
+	f64.store	0($0), $11
+	f64.load	$8=, 8($1)
+	f64.store	8($0), $8
+	i32.load	$2=, 20($1)
 	block   	
 	block   	
-	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
+	i32.eqz 	$push44=, $2
+	br_if   	0, $pop44       # 0: down to label1
+# %bb.1:                                # %if.else
+	i32.const	$push0=, 1
+	i32.add 	$3=, $2, $pop0
+	f64.sub 	$push1=, $8, $11
 	f64.const	$push2=, 0x1p-2
 	f64.mul 	$4=, $pop1, $pop2
-	i32.const	$push0=, 1
-	i32.add 	$push44=, $2, $pop0
-	tee_local	$push43=, $3=, $pop44
 	i32.const	$push3=, 2
-	i32.ne  	$push4=, $pop43, $pop3
+	i32.ne  	$push4=, $3, $pop3
 	br_if   	1, $pop4        # 1: down to label0
-# BB#2:                                 # %if.then6
-	i32.load	$push48=, 16($0)
-	tee_local	$push47=, $0=, $pop48
+# %bb.2:                                # %if.then6
 	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.mul 	$11=, $4, $pop33
+	i32.load	$1=, 16($0)
+	f64.store	8($1), $11
 	f64.add 	$push34=, $11, $11
-	f64.store	0($0), $pop34
+	f64.store	0($1), $pop34
 	return
 .LBB0_3:                                # %if.then
 	end_block                       # label1:
@@ -49,83 +43,75 @@ foo:                                    # @foo
 	return
 .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)
+	i32.load	$6=, 16($1)
+	f64.load	$push6=, 0($6)
 	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.mul 	$11=, $4, $pop7
+	i32.load	$7=, 16($0)
+	f64.store	8($7), $11
 	f64.const	$push8=, 0x0p0
 	f64.add 	$10=, $11, $pop8
+	i32.const	$push9=, -1
+	i32.add 	$5=, $2, $pop9
 	block   	
 	block   	
-	i32.const	$push9=, -1
-	i32.add 	$push51=, $2, $pop9
-	tee_local	$push50=, $5=, $pop51
-	i32.const	$push49=, 1
-	i32.ne  	$push10=, $pop50, $pop49
+	i32.const	$push37=, 1
+	i32.ne  	$push10=, $5, $pop37
 	br_if   	0, $pop10       # 0: down to label3
-# BB#5:
+# %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.add 	$9=, $7, $pop11
 	i32.const	$push12=, 24
 	i32.add 	$1=, $6, $pop12
 	f64.const	$11=, -0x1p0
-	i32.const	$9=, 2
+	i32.const	$0=, 2
 .LBB0_7:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
-	i32.const	$push65=, -16
-	i32.add 	$push13=, $1, $pop65
+	i32.const	$push41=, -16
+	i32.add 	$push13=, $1, $pop41
 	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.convert_u/i32	$push18=, $0
+	f64.div 	$8=, $pop17, $pop18
+	f64.store	0($9), $8
+	i32.const	$push40=, 8
+	i32.add 	$9=, $9, $pop40
+	i32.const	$push39=, 8
+	i32.add 	$1=, $1, $pop39
 	f64.mul 	$push19=, $11, $8
 	f64.add 	$10=, $10, $pop19
+	i32.const	$push38=, 1
+	i32.add 	$0=, $0, $pop38
 	f64.neg 	$11=, $11
-	i32.const	$push60=, 1
-	i32.add 	$push59=, $9, $pop60
-	tee_local	$push58=, $9=, $pop59
-	i32.le_u	$push20=, $pop58, $5
+	i32.le_u	$push20=, $0, $5
 	br_if   	0, $pop20       # 0: up to label4
 .LBB0_8:                                # %for.end
 	end_loop
 	end_block                       # label2:
 	i32.const	$push23=, 3
-	i32.shl 	$push28=, $2, $pop23
-	i32.add 	$push29=, $7, $pop28
-	i32.const	$push71=, 3
-	i32.shl 	$push24=, $5, $pop71
+	i32.shl 	$push24=, $5, $pop23
 	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.const	$push43=, -0x1p0
+	f64.add 	$push22=, $pop21, $pop43
+	f64.div 	$8=, $pop27, $pop22
+	i32.const	$push42=, 3
+	i32.shl 	$push28=, $2, $pop42
+	i32.add 	$push29=, $7, $pop28
+	f64.store	0($pop29), $8
 	f64.mul 	$push30=, $11, $8
-	f64.add 	$push67=, $10, $pop30
-	tee_local	$push66=, $11=, $pop67
-	f64.add 	$push31=, $pop66, $11
+	f64.add 	$11=, $10, $pop30
+	f64.add 	$push31=, $11, $11
 	f64.store	0($7), $pop31
                                         # fallthrough-return
 	.endfunc
@@ -139,14 +125,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push95=, 0
+# %bb.0:                                # %entry
 	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.sub 	$2=, $pop92, $pop94
+	i32.const	$push95=, 0
+	i32.store	__stack_pointer($pop95), $2
 	i32.const	$push99=, 32
 	i32.add 	$push100=, $2, $pop99
 	i32.const	$push0=, 24
@@ -203,43 +188,41 @@ main:                                   # @main
 	f64.const	$push18=, 0x0p0
 	f64.ne  	$push20=, $pop19, $pop18
 	br_if   	0, $pop20       # 0: down to label5
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	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
+# %bb.2:                                # %lor.lhs.false9
 	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
+# %bb.3:                                # %lor.lhs.false12
 	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
+# %bb.4:                                # %if.end
 	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.add 	$0=, $2, $pop38
 	i32.const	$push36=, 0
 	i64.load	$push37=, .Lmain.e+16($pop36)
-	i64.store	0($pop137), $pop37
+	i64.store	0($0), $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.add 	$1=, $2, $pop40
 	i32.const	$push132=, 0
-	i64.load	$push42=, .Lmain.e+8($pop132)
+	i64.load	$push39=, .Lmain.e+24($pop132)
+	i64.store	0($1), $pop39
+	i32.const	$push131=, 0
+	i64.load	$push41=, .Lmain.e($pop131)
+	i64.store	0($2), $pop41
+	i32.const	$push130=, 0
+	i64.load	$push42=, .Lmain.e+8($pop130)
 	i64.store	8($2), $pop42
 	i32.const	$push109=, 88
 	i32.add 	$push110=, $2, $pop109
@@ -250,43 +233,41 @@ main:                                   # @main
 	f64.const	$push43=, 0x1.ep5
 	f64.ne  	$push45=, $pop44, $pop43
 	br_if   	0, $pop45       # 0: down to label5
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	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
+# %bb.6:                                # %if.end
 	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
+# %bb.7:                                # %if.end
 	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
+# %bb.8:                                # %if.end30
 	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.add 	$0=, $2, $pop60
 	i32.const	$push58=, 0
 	i64.load	$push59=, .Lmain.e+16($pop58)
-	i64.store	0($pop144), $pop59
+	i64.store	0($0), $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)
+	i32.add 	$1=, $2, $pop62
+	i32.const	$push135=, 0
+	i64.load	$push61=, .Lmain.e+24($pop135)
+	i64.store	0($1), $pop61
+	i32.const	$push134=, 0
+	i64.load	$push63=, .Lmain.e($pop134)
 	i64.store	0($2), $pop63
-	i32.const	$push139=, 0
-	i64.load	$push64=, .Lmain.e+8($pop139)
+	i32.const	$push133=, 0
+	i64.load	$push64=, .Lmain.e+8($pop133)
 	i64.store	8($2), $pop64
 	i32.const	$push113=, 88
 	i32.add 	$push114=, $2, $pop113
@@ -297,43 +278,41 @@ main:                                   # @main
 	f64.const	$push65=, -0x1.4p4
 	f64.ne  	$push67=, $pop66, $pop65
 	br_if   	0, $pop67       # 0: down to label5
-# BB#9:                                 # %if.end30
+# %bb.9:                                # %if.end30
 	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
+# %bb.10:                               # %if.end30
 	f64.load	$push53=, 0($0)
-	f64.const	$push146=, 0x1.d8p6
-	f64.ne  	$push70=, $pop53, $pop146
+	f64.const	$push136=, 0x1.d8p6
+	f64.ne  	$push70=, $pop53, $pop136
 	br_if   	0, $pop70       # 0: down to label5
-# BB#11:                                # %if.end30
+# %bb.11:                               # %if.end30
 	f64.load	$push54=, 0($1)
-	f64.const	$push147=, 0x1.d8p6
-	f64.ne  	$push71=, $pop54, $pop147
+	f64.const	$push137=, 0x1.d8p6
+	f64.ne  	$push71=, $pop54, $pop137
 	br_if   	0, $pop71       # 0: down to label5
-# BB#12:                                # %if.end46
+# %bb.12:                               # %if.end46
 	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.add 	$0=, $2, $pop79
+	i32.const	$push141=, 0
+	i64.load	$push78=, .Lmain.e+16($pop141)
+	i64.store	0($0), $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)
+	i32.add 	$1=, $2, $pop81
+	i32.const	$push140=, 0
+	i64.load	$push80=, .Lmain.e+24($pop140)
+	i64.store	0($1), $pop80
+	i32.const	$push139=, 0
+	i64.load	$push82=, .Lmain.e($pop139)
 	i64.store	0($2), $pop82
-	i32.const	$push148=, 0
-	i64.load	$push83=, .Lmain.e+8($pop148)
+	i32.const	$push138=, 0
+	i64.load	$push83=, .Lmain.e+8($pop138)
 	i64.store	8($2), $pop83
 	i32.const	$push117=, 88
 	i32.add 	$push118=, $2, $pop117
@@ -344,22 +323,22 @@ main:                                   # @main
 	f64.const	$push84=, 0x0p0
 	f64.ne  	$push86=, $pop85, $pop84
 	br_if   	0, $pop86       # 0: down to label5
-# BB#13:                                # %if.end46
+# %bb.13:                               # %if.end46
 	f64.load	$push72=, 8($2)
-	f64.const	$push156=, 0x1.d8p6
-	f64.ne  	$push87=, $pop72, $pop156
+	f64.const	$push142=, 0x1.d8p6
+	f64.ne  	$push87=, $pop72, $pop142
 	br_if   	0, $pop87       # 0: down to label5
-# BB#14:                                # %if.end46
+# %bb.14:                               # %if.end46
 	f64.load	$push73=, 0($0)
-	f64.const	$push157=, 0x1.d8p6
-	f64.ne  	$push88=, $pop73, $pop157
+	f64.const	$push143=, 0x1.d8p6
+	f64.ne  	$push88=, $pop73, $pop143
 	br_if   	0, $pop88       # 0: down to label5
-# BB#15:                                # %if.end46
+# %bb.15:                               # %if.end46
 	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
+# %bb.16:                               # %if.end62
 	i32.const	$push98=, 0
 	i32.const	$push96=, 112
 	i32.add 	$push97=, $2, $pop96
@@ -394,5 +373,5 @@ main:                                   # @main
 	.size	.Lmain.e, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr47925.c.s b/test/torture-s/pr47925.c.s
index 872f6f6ad..8a598b651 100644
--- a/test/torture-s/pr47925.c.s
+++ b/test/torture-s/pr47925.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -21,26 +21,25 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	bar@FUNCTION, $1, $1
 	block   	
 	i32.const	$push0=, 1
 	i32.lt_s	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
+	i32.const	$push2=, -1
+	i32.add 	$1=, $1, $pop2
 	i32.load	$0=, 0($0)
-	i32.const	$push4=, -1
-	i32.add 	$push3=, $1, $pop4
-	tee_local	$push2=, $1=, $pop3
-	br_if   	0, $pop2        # 0: up to label1
+	br_if   	0, $1           # 0: up to label1
 .LBB1_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push5=, $1
-                                        # fallthrough-return: $pop5
+	copy_local	$push3=, $1
+                                        # fallthrough-return: $pop3
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -52,14 +51,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push14=, $pop2, $pop4
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop5), $pop13
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push9=, 8
 	i32.add 	$push10=, $0, $pop9
 	i32.store	8($0), $pop10
@@ -78,4 +76,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr48197.c.s b/test/torture-s/pr48197.c.s
index 1c3247719..6bd3ef1b1 100644
--- a/test/torture-s/pr48197.c.s
+++ b/test/torture-s/pr48197.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr48571-1.c.s b/test/torture-s/pr48571-1.c.s
index 3b84465cc..3b16ecd23 100644
--- a/test/torture-s/pr48571-1.c.s
+++ b/test/torture-s/pr48571-1.c.s
@@ -6,26 +6,24 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$1=, c($pop0)
 	i32.const	$0=, 4
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push10=, c
-	i32.add 	$push1=, $0, $pop10
-	i32.const	$push9=, 1
-	i32.shl 	$push8=, $1, $pop9
-	tee_local	$push7=, $1=, $pop8
-	i32.store	0($pop1), $pop7
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
+	i32.const	$push6=, 1
+	i32.shl 	$1=, $1, $pop6
+	i32.const	$push5=, c
+	i32.add 	$push1=, $0, $pop5
+	i32.store	0($pop1), $1
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
 	i32.const	$push3=, 2496
-	i32.ne  	$push2=, $pop4, $pop3
+	i32.ne  	$push2=, $0, $pop3
 	br_if   	0, $pop2        # 0: up to label0
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -39,45 +37,43 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -2496
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push9=, c+2496
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, 1
-	i32.store	0($pop0), $pop8
-	i32.const	$push7=, 4
-	i32.add 	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	br_if   	0, $pop5        # 0: up to label1
-# BB#2:                                 # %for.end
+	i32.const	$push7=, c+2496
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, 1
+	i32.store	0($pop0), $pop6
+	i32.const	$push5=, 4
+	i32.add 	$0=, $0, $pop5
+	br_if   	0, $0           # 0: up to label1
+# %bb.2:                                # %for.end
 	end_loop
 	call    	bar@FUNCTION
-	i32.const	$2=, 0
-	i32.const	$0=, c
-	i32.const	$1=, 1
+	i32.const	$0=, 0
+	i32.const	$1=, c
+	i32.const	$2=, 1
 .LBB1_3:                                # %for.body3
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
-	i32.load	$push1=, 0($0)
-	i32.ne  	$push2=, $pop1, $1
+	i32.load	$push1=, 0($1)
+	i32.ne  	$push2=, $pop1, $2
 	br_if   	1, $pop2        # 1: down to label2
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push15=, 4
-	i32.add 	$0=, $0, $pop15
-	i32.const	$push14=, 1
-	i32.shl 	$1=, $1, $pop14
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $2, $pop13
-	tee_local	$push11=, $2=, $pop12
-	i32.const	$push10=, 624
-	i32.lt_u	$push3=, $pop11, $pop10
+	i32.const	$push11=, 4
+	i32.add 	$1=, $1, $pop11
+	i32.const	$push10=, 1
+	i32.shl 	$2=, $2, $pop10
+	i32.const	$push9=, 1
+	i32.add 	$0=, $0, $pop9
+	i32.const	$push8=, 624
+	i32.lt_u	$push3=, $0, $pop8
 	br_if   	0, $pop3        # 0: up to label3
-# BB#5:                                 # %for.end8
+# %bb.5:                                # %for.end8
 	end_loop
 	i32.const	$push4=, 0
 	return  	$pop4
@@ -99,5 +95,5 @@ c:
 	.size	c, 2496
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48717.c.s b/test/torture-s/pr48717.c.s
index e4c139b2e..008aba691 100644
--- a/test/torture-s/pr48717.c.s
+++ b/test/torture-s/pr48717.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $1, $0
 	i32.const	$push1=, 65535
 	i32.and 	$push2=, $pop0, $pop1
@@ -22,17 +22,16 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push8=, 0
-	i32.load	$push7=, w($pop8)
-	tee_local	$push6=, $0=, $pop7
+	i32.load	$0=, w($pop0)
+	i32.const	$push6=, 0
 	i32.const	$push1=, -1
-	i32.xor 	$push2=, $pop6, $pop1
+	i32.xor 	$push2=, $0, $pop1
 	i32.add 	$push3=, $pop2, $0
 	i32.const	$push4=, 65535
 	i32.and 	$push5=, $pop3, $pop4
-	i32.store	v($pop0), $pop5
+	i32.store	v($pop6), $pop5
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -45,25 +44,23 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, w($pop10)
-	tee_local	$push8=, $0=, $pop9
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$0=, w($pop7)
 	i32.const	$push0=, -1
-	i32.xor 	$push1=, $pop8, $pop0
+	i32.xor 	$push1=, $0, $pop0
 	i32.add 	$push2=, $pop1, $0
 	i32.const	$push3=, 65535
-	i32.and 	$push7=, $pop2, $pop3
-	tee_local	$push6=, $0=, $pop7
-	i32.store	v($pop11), $pop6
+	i32.and 	$0=, $pop2, $pop3
+	i32.const	$push6=, 0
+	i32.store	v($pop6), $0
 	block   	
 	i32.const	$push5=, 65535
 	i32.ne  	$push4=, $0, $pop5
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push12=, 0
-	return  	$pop12
+# %bb.1:                                # %if.end
+	i32.const	$push8=, 0
+	return  	$pop8
 .LBB2_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -91,5 +88,5 @@ w:
 	.size	w, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48809.c.s b/test/torture-s/pr48809.c.s
index 17c2f0937..7fe60a928 100644
--- a/test/torture-s/pr48809.c.s
+++ b/test/torture-s/pr48809.c.s
@@ -8,7 +8,9 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push0=, 62
+	i32.add 	$1=, $0, $pop0
 	i32.const	$2=, 0
 	block   	
 	block   	
@@ -44,13 +46,10 @@ foo:                                    # @foo
 	block   	
 	block   	
 	block   	
-	i32.const	$push0=, 62
-	i32.add 	$push37=, $0, $pop0
-	tee_local	$push36=, $1=, $pop37
 	i32.const	$push1=, 160
-	i32.gt_u	$push2=, $pop36, $pop1
+	i32.gt_u	$push2=, $1, $pop1
 	br_if   	0, $pop2        # 0: down to label33
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	br_table 	$1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 4, 0, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 34, 0 # 0: down to label34
                                         # 1: down to label33
@@ -235,7 +234,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end25
+# %bb.0:                                # %if.end25
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -243,4 +242,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr48814-1.c.s b/test/torture-s/pr48814-1.c.s
index 886ab0f63..5d52ec591 100644
--- a/test/torture-s/pr48814-1.c.s
+++ b/test/torture-s/pr48814-1.c.s
@@ -7,16 +7,15 @@
 incr:                                   # @incr
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load	$push1=, count($pop5)
+	i32.load	$push1=, count($pop0)
 	i32.const	$push2=, 1
-	i32.add 	$push4=, $pop1, $pop2
-	tee_local	$push3=, $0=, $pop4
-	i32.store	count($pop0), $pop3
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	i32.add 	$0=, $pop1, $pop2
+	i32.const	$push3=, 0
+	i32.store	count($pop3), $0
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	incr, .Lfunc_end0-incr
@@ -28,32 +27,30 @@ incr:                                   # @incr
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$0=, incr@FUNCTION
-	i32.const	$push16=, 0
-	i32.load	$push15=, count($pop16)
-	tee_local	$push14=, $1=, $pop15
+	i32.const	$push12=, 0
+	i32.load	$1=, count($pop12)
 	i32.const	$push1=, 2
-	i32.shl 	$push2=, $pop14, $pop1
+	i32.shl 	$push2=, $1, $pop1
 	i32.const	$push3=, arr
 	i32.add 	$push4=, $pop2, $pop3
 	i32.store	0($pop4), $0
-	i32.const	$push13=, 0
 	i32.const	$push5=, 1
-	i32.add 	$push12=, $1, $pop5
-	tee_local	$push11=, $0=, $pop12
-	i32.store	count($pop13), $pop11
+	i32.add 	$1=, $1, $pop5
+	i32.const	$push11=, 0
+	i32.store	count($pop11), $1
 	block   	
 	i32.const	$push10=, 2
-	i32.ne  	$push6=, $0, $pop10
+	i32.ne  	$push6=, $1, $pop10
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push17=, 0
-	i32.load	$push0=, arr+8($pop17)
+# %bb.1:                                # %entry
+	i32.const	$push13=, 0
+	i32.load	$push0=, arr+8($pop13)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop0, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB1_3:                                # %if.then
@@ -86,5 +83,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48814-2.c.s b/test/torture-s/pr48814-2.c.s
index fc5a1d07a..d32cbde68 100644
--- a/test/torture-s/pr48814-2.c.s
+++ b/test/torture-s/pr48814-2.c.s
@@ -7,16 +7,15 @@
 incr:                                   # @incr
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load	$push1=, count($pop5)
+	i32.load	$push1=, count($pop0)
 	i32.const	$push2=, 1
-	i32.add 	$push4=, $pop1, $pop2
-	tee_local	$push3=, $0=, $pop4
-	i32.store	count($pop0), $pop3
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	i32.add 	$0=, $pop1, $pop2
+	i32.const	$push3=, 0
+	i32.store	count($pop3), $0
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	incr, .Lfunc_end0-incr
@@ -28,35 +27,32 @@ incr:                                   # @incr
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push19=, 0
-	i32.load	$push18=, count($pop19)
-	tee_local	$push17=, $1=, $pop18
-	i32.const	$push16=, 2
-	i32.add 	$push15=, $pop17, $pop16
-	tee_local	$push14=, $0=, $pop15
-	i32.store	count($pop0), $pop14
+	i32.load	$1=, count($pop0)
+	i32.const	$push13=, 2
+	i32.add 	$0=, $1, $pop13
+	i32.const	$push12=, 0
+	i32.store	count($pop12), $0
 	i32.const	$push1=, 1
-	i32.add 	$push13=, $1, $pop1
-	tee_local	$push12=, $2=, $pop13
+	i32.add 	$2=, $1, $pop1
 	i32.const	$push11=, 2
-	i32.shl 	$push2=, $pop12, $pop11
+	i32.shl 	$push2=, $2, $pop11
 	i32.const	$push10=, arr
 	i32.add 	$push3=, $pop2, $pop10
 	i32.store	0($pop3), $2
 	block   	
 	br_if   	0, $1           # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push21=, 2
-	i32.shl 	$push4=, $0, $pop21
-	i32.const	$push20=, arr
-	i32.add 	$push5=, $pop4, $pop20
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push15=, 2
+	i32.shl 	$push4=, $0, $pop15
+	i32.const	$push14=, arr
+	i32.add 	$push5=, $pop4, $pop14
 	i32.load	$push6=, 0($pop5)
 	i32.const	$push7=, 3
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB1_3:                                # %if.then
@@ -89,5 +85,5 @@ count:
 	.size	count, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48973-1.c.s b/test/torture-s/pr48973-1.c.s
index 09c77f0d1..9ce3d2fe5 100644
--- a/test/torture-s/pr48973-1.c.s
+++ b/test/torture-s/pr48973-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -1
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,25 +28,24 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push9=, 0
-	i32.load8_u	$push2=, s($pop9)
-	i32.const	$push3=, 254
-	i32.and 	$push4=, $pop2, $pop3
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push0=, v($pop8)
 	i32.const	$push1=, 1
-	i32.and 	$push7=, $pop0, $pop1
-	tee_local	$push6=, $0=, $pop7
-	i32.or  	$push5=, $pop4, $pop6
-	i32.store8	s($pop10), $pop5
+	i32.and 	$0=, $pop0, $pop1
+	i32.const	$push7=, 0
+	i32.const	$push6=, 0
+	i32.load8_u	$push2=, s($pop6)
+	i32.const	$push3=, 254
+	i32.and 	$push4=, $pop2, $pop3
+	i32.or  	$push5=, $pop4, $0
+	i32.store8	s($pop7), $pop5
 	block   	
-	i32.eqz 	$push12=, $0
-	br_if   	0, $pop12       # 0: down to label1
-# BB#1:                                 # %foo.exit
-	i32.const	$push11=, 0
-	return  	$pop11
+	i32.eqz 	$push10=, $0
+	br_if   	0, $pop10       # 0: down to label1
+# %bb.1:                                # %foo.exit
+	i32.const	$push9=, 0
+	return  	$pop9
 .LBB1_2:                                # %if.then.i
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -74,5 +73,5 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr48973-2.c.s b/test/torture-s/pr48973-2.c.s
index 5c52ec9a3..048af779e 100644
--- a/test/torture-s/pr48973-2.c.s
+++ b/test/torture-s/pr48973-2.c.s
@@ -7,26 +7,25 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.load8_u	$push2=, s($pop11)
-	i32.const	$push3=, 254
-	i32.and 	$push4=, $pop2, $pop3
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.load	$push0=, v($pop10)
 	i32.const	$push1=, 31
-	i32.shr_u	$push9=, $pop0, $pop1
-	tee_local	$push8=, $0=, $pop9
-	i32.or  	$push5=, $pop4, $pop8
-	i32.store8	s($pop12), $pop5
+	i32.shr_u	$0=, $pop0, $pop1
+	i32.const	$push9=, 0
+	i32.const	$push8=, 0
+	i32.load8_u	$push2=, s($pop8)
+	i32.const	$push3=, 254
+	i32.and 	$push4=, $pop2, $pop3
+	i32.or  	$push5=, $pop4, $0
+	i32.store8	s($pop9), $pop5
 	block   	
 	i32.const	$push6=, 1
 	i32.ne  	$push7=, $0, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push13=, 0
-	return  	$pop13
+# %bb.1:                                # %if.end
+	i32.const	$push11=, 0
+	return  	$pop11
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -54,5 +53,5 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49039.c.s b/test/torture-s/pr49039.c.s
index 88dcc8793..320046a64 100644
--- a/test/torture-s/pr49039.c.s
+++ b/test/torture-s/pr49039.c.s
@@ -7,16 +7,16 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 1
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, -2
 	i32.eq  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.gt_u	$push4=, $0, $1
 	i32.select	$2=, $0, $1, $pop4
 	block   	
@@ -25,7 +25,7 @@ foo:                                    # @foo
 	i32.const	$push17=, 1
 	i32.ne  	$push7=, $pop6, $pop17
 	br_if   	0, $pop7        # 0: down to label1
-# BB#3:                                 # %if.then9
+# %bb.3:                                # %if.then9
 	i32.const	$push8=, 0
 	i32.const	$push19=, 0
 	i32.load	$push9=, cnt($pop19)
@@ -37,7 +37,7 @@ foo:                                    # @foo
 	i32.const	$push11=, -2
 	i32.ne  	$push12=, $2, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#5:                                 # %if.then12
+# %bb.5:                                # %if.then12
 	i32.const	$push13=, 0
 	i32.const	$push20=, 0
 	i32.load	$push14=, cnt($pop20)
@@ -57,7 +57,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, -2
 	i32.const	$push0=, 1
 	call    	foo@FUNCTION, $pop1, $pop0
@@ -67,7 +67,7 @@ main:                                   # @main
 	i32.const	$push3=, 2
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -88,5 +88,5 @@ cnt:
 	.size	cnt, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49073.c.s b/test/torture-s/pr49073.c.s
index 6df203f13..b68684b59 100644
--- a/test/torture-s/pr49073.c.s
+++ b/test/torture-s/pr49073.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i32.const	$1=, a+4
 .LBB0_1:                                # %do.body
@@ -19,9 +19,9 @@ main:                                   # @main
 	block   	
 	i32.const	$push10=, 1
 	i32.and 	$push0=, $2, $pop10
-	i32.eqz 	$push18=, $pop0
-	br_if   	0, $pop18       # 0: down to label3
-# BB#2:                                 # %do.body
+	i32.eqz 	$push16=, $pop0
+	br_if   	0, $pop16       # 0: down to label3
+# %bb.2:                                # %do.body
                                         #   in Loop: Header=BB0_1 Depth=1
 	i32.const	$push11=, 4
 	i32.eq  	$push1=, $0, $pop11
@@ -36,7 +36,7 @@ main:                                   # @main
 	i32.const	$push12=, 7
 	i32.lt_s	$push2=, $0, $pop12
 	br_if   	0, $pop2        # 0: up to label2
-# BB#4:                                 # %do.endthread-pre-split
+# %bb.4:                                # %do.endthread-pre-split
 	end_loop
 	i32.const	$push3=, 0
 	i32.load	$0=, c($pop3)
@@ -44,19 +44,18 @@ main:                                   # @main
 .LBB0_5:                                # %if.then
 	end_block                       # label1:
 	i32.const	$push4=, 0
-	i32.const	$push17=, 0
-	i32.load	$push5=, c($pop17)
+	i32.load	$push5=, c($pop4)
 	i32.const	$push6=, 1
-	i32.add 	$push16=, $pop5, $pop6
-	tee_local	$push15=, $0=, $pop16
-	i32.store	c($pop4), $pop15
+	i32.add 	$0=, $pop5, $pop6
+	i32.const	$push15=, 0
+	i32.store	c($pop15), $0
 .LBB0_6:                                # %do.end
 	end_block                       # label0:
 	block   	
 	i32.const	$push7=, 1
 	i32.ne  	$push8=, $0, $pop7
 	br_if   	0, $pop8        # 0: down to label4
-# BB#7:                                 # %if.end6
+# %bb.7:                                # %if.end6
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB0_8:                                # %if.then5
@@ -92,5 +91,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49123.c.s b/test/torture-s/pr49123.c.s
index 627f99f9f..3b3d4e156 100644
--- a/test/torture-s/pr49123.c.s
+++ b/test/torture-s/pr49123.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load8_u	$push1=, s.0($pop5)
@@ -27,4 +27,4 @@ s.0:
 	.size	s.0, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr49161.c.s b/test/torture-s/pr49161.c.s
index 7cbfd3be2..4117c5c2f 100644
--- a/test/torture-s/pr49161.c.s
+++ b/test/torture-s/pr49161.c.s
@@ -7,18 +7,17 @@
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push6=, 0
-	i32.load	$push5=, c($pop6)
-	tee_local	$push4=, $1=, $pop5
+	i32.load	$1=, c($pop0)
+	i32.const	$push4=, 0
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop4, $pop1
-	i32.store	c($pop0), $pop2
+	i32.add 	$push2=, $1, $pop1
+	i32.store	c($pop4), $pop2
 	block   	
 	i32.ne  	$push3=, $1, $0
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -34,7 +33,7 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -44,13 +43,13 @@ foo:                                    # @foo
 	i32.const	$push2=, 2
 	i32.ge_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label4
-# BB#1:                                 # %l4
+# %bb.1:                                # %l4
 	i32.const	$push9=, 0
 	call    	bar@FUNCTION, $pop9
 	i32.const	$push10=, 4
 	i32.eq  	$push11=, $0, $pop10
 	br_if   	1, $pop11       # 1: down to label3
-# BB#2:                                 # %if.then.thread
+# %bb.2:                                # %if.then.thread
 	i32.const	$push12=, 1
 	call    	bar@FUNCTION, $pop12
 	br      	2               # 2: down to label2
@@ -59,7 +58,7 @@ foo:                                    # @foo
 	i32.const	$push4=, 6
 	i32.ne  	$push5=, $0, $pop4
 	br_if   	2, $pop5        # 2: down to label1
-# BB#4:                                 # %if.then
+# %bb.4:                                # %if.then
 	i32.const	$push6=, -1
 	call    	bar@FUNCTION, $pop6
 	i32.const	$push7=, 0
@@ -87,7 +86,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	call    	foo@FUNCTION, $pop0
 	block   	
@@ -96,7 +95,7 @@ main:                                   # @main
 	i32.const	$push3=, 3
 	i32.ne  	$push2=, $pop1, $pop3
 	br_if   	0, $pop2        # 0: down to label5
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB2_2:                                # %if.then
@@ -117,5 +116,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49186.c.s b/test/torture-s/pr49186.c.s
index 96e227392..9202aab2f 100644
--- a/test/torture-s/pr49186.c.s
+++ b/test/torture-s/pr49186.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr49218.c.s b/test/torture-s/pr49218.c.s
index ec468b20a..be0cd984e 100644
--- a/test/torture-s/pr49218.c.s
+++ b/test/torture-s/pr49218.c.s
@@ -6,61 +6,56 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i64, i32, i64, i64, i32
-# BB#0:                                 # %entry
-	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
+	.local  	i64, i64, i64, i32
+# %bb.0:                                # %entry
+	i32.const	$push14=, 0
+	i32.load	$push13=, __stack_pointer($pop14)
+	i32.const	$push15=, 16
+	i32.sub 	$3=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $3
+	i32.const	$push21=, 0
+	f32.load	$push0=, f($pop21)
+	call    	__fixsfti@FUNCTION, $3, $pop0
+	i32.const	$push1=, 8
+	i32.add 	$push2=, $3, $pop1
+	i64.load	$2=, 0($pop2)
+	i64.load	$1=, 0($3)
 	block   	
-	i64.load	$push23=, 0($4)
-	tee_local	$push22=, $2=, $pop23
 	i64.const	$push4=, 10
-	i64.gt_u	$push5=, $pop22, $pop4
-	i32.const	$push1=, 8
-	i32.add 	$push2=, $4, $pop1
-	i64.load	$push21=, 0($pop2)
-	tee_local	$push20=, $3=, $pop21
-	i64.const	$push19=, 0
-	i64.gt_s	$push3=, $pop20, $pop19
-	i64.eqz 	$push6=, $3
+	i64.gt_u	$push5=, $1, $pop4
+	i64.const	$push20=, 0
+	i64.gt_s	$push3=, $2, $pop20
+	i64.eqz 	$push6=, $2
 	i32.select	$push7=, $pop5, $pop3, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %do.body.preheader
+# %bb.1:                                # %do.body.preheader
 .LBB0_2:                                # %do.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i64.const	$push33=, 1
-	i64.add 	$push32=, $2, $pop33
-	tee_local	$push31=, $0=, $pop32
-	i64.lt_u	$1=, $pop31, $2
+	i64.const	$push24=, 1
+	i64.add 	$0=, $1, $pop24
+	i64.lt_u	$push9=, $0, $1
+	i64.extend_u/i32	$push10=, $pop9
+	i64.add 	$2=, $2, $pop10
 	#APP
 	#NO_APP
-	copy_local	$2=, $0
-	i64.const	$push30=, 11
-	i64.xor 	$push8=, $0, $pop30
-	i64.extend_u/i32	$push9=, $1
-	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
+	copy_local	$1=, $0
+	i64.const	$push23=, 11
+	i64.xor 	$push8=, $0, $pop23
+	i64.or  	$push11=, $pop8, $2
+	i64.const	$push22=, 0
+	i64.ne  	$push12=, $pop11, $pop22
+	br_if   	0, $pop12       # 0: up to label1
 .LBB0_3:                                # %if.end
 	end_loop
 	end_block                       # label0:
-	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
+	i32.const	$push19=, 0
+	i32.const	$push17=, 16
+	i32.add 	$push18=, $3, $pop17
+	i32.store	__stack_pointer($pop19), $pop18
+	i32.const	$push25=, 0
+                                        # fallthrough-return: $pop25
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -75,4 +70,4 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr49279.c.s b/test/torture-s/pr49279.c.s
index 34991167c..a0e0184d9 100644
--- a/test/torture-s/pr49279.c.s
+++ b/test/torture-s/pr49279.c.s
@@ -7,7 +7,7 @@
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	copy_local	$push0=, $0
@@ -24,14 +24,13 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push16=, $pop3, $pop5
-	tee_local	$push15=, $2=, $pop16
-	i32.store	__stack_pointer($pop6), $pop15
+	i32.sub 	$2=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $2
 	i32.store	12($2), $0
 	i32.const	$push0=, 1
 	i32.store	8($2), $pop0
@@ -39,10 +38,9 @@ foo:                                    # @foo
 	i32.add 	$push11=, $2, $pop10
 	i32.call	$push1=, bar@FUNCTION, $pop11
 	i32.store	4($pop1), $1
-	i32.load	$push14=, 12($2)
-	tee_local	$push13=, $0=, $pop14
+	i32.load	$0=, 12($2)
 	i32.const	$push2=, 0
-	i32.store	0($pop13), $pop2
+	i32.store	0($0), $pop2
 	i32.const	$push12=, 1
 	i32.store	0($1), $pop12
 	i32.load	$1=, 0($0)
@@ -50,8 +48,8 @@ foo:                                    # @foo
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $2, $pop7
 	i32.store	__stack_pointer($pop9), $pop8
-	copy_local	$push17=, $1
-                                        # fallthrough-return: $pop17
+	copy_local	$push13=, $1
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -63,14 +61,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	block   	
 	i32.const	$push11=, 12
 	i32.add 	$push12=, $0, $pop11
@@ -80,7 +77,7 @@ main:                                   # @main
 	i32.const	$push0=, 1
 	i32.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push10=, 0
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $0, $pop8
@@ -96,5 +93,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49281.c.s b/test/torture-s/pr49281.c.s
index e8c480799..bbc5c4f84 100644
--- a/test/torture-s/pr49281.c.s
+++ b/test/torture-s/pr49281.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 4
@@ -24,7 +24,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 3
@@ -40,44 +40,44 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 43
 	i32.call	$push1=, foo@FUNCTION, $pop0
 	i32.const	$push2=, 172
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push4=, 1
 	i32.call	$push5=, foo@FUNCTION, $pop4
 	i32.const	$push6=, 4
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i32.const	$push8=, 2
 	i32.call	$push9=, foo@FUNCTION, $pop8
 	i32.const	$push10=, 12
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push12=, 43
 	i32.call	$push13=, bar@FUNCTION, $pop12
 	i32.const	$push14=, 175
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false8
+# %bb.4:                                # %lor.lhs.false8
 	i32.const	$push16=, 1
 	i32.call	$push17=, bar@FUNCTION, $pop16
 	i32.const	$push18=, 7
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false11
+# %bb.5:                                # %lor.lhs.false11
 	i32.const	$push20=, 2
 	i32.call	$push21=, bar@FUNCTION, $pop20
 	i32.const	$push22=, 11
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#6:                                 # %if.end15
+# %bb.6:                                # %if.end15
 	i32.const	$push24=, 0
 	return  	$pop24
 .LBB2_7:                                # %if.then
@@ -89,5 +89,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49390.c.s b/test/torture-s/pr49390.c.s
index e864f737b..40f723bf1 100644
--- a/test/torture-s/pr49390.c.s
+++ b/test/torture-s/pr49390.c.s
@@ -6,16 +6,16 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 4
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, u+4
 	i32.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push5=, 0
 	i32.add 	$push4=, $3, $2
 	i32.store	v($pop5), $pop4
@@ -37,7 +37,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, 0($0)
 	i32.store	v($pop1), $pop0
@@ -56,7 +56,7 @@ bar:                                    # @bar
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, 0($0)
 	i32.store	v($pop1), $pop0
@@ -82,37 +82,33 @@ baz:                                    # @baz
 test:                                   # @test
 	.param  	i32
 	.local  	i32, i32, i32, i32, i64, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push51=, 0
+# %bb.0:                                # %entry
 	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.sub 	$7=, $pop48, $pop50
+	i32.const	$push51=, 0
+	i32.store	__stack_pointer($pop51), $7
 	i32.const	$push1=, 0
-	i64.load	$push58=, a($pop1)
-	tee_local	$push57=, $5=, $pop58
-	i64.store	8($7), $pop57
+	i64.load	$5=, a($pop1)
+	i64.store	8($7), $5
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push83=, $0
-	br_if   	0, $pop83       # 0: down to label3
-# BB#1:                                 # %if.else
+	i32.eqz 	$push57=, $0
+	br_if   	0, $pop57       # 0: down to label3
+# %bb.1:                                # %if.else
+	i32.load	$3=, 4($0)
+	i32.const	$push5=, 8191
+	i32.and 	$6=, $3, $pop5
 	block   	
 	block   	
-	i32.load	$push64=, 4($0)
-	tee_local	$push63=, $6=, $pop64
-	i32.const	$push5=, 8191
-	i32.and 	$push62=, $pop63, $pop5
-	tee_local	$push61=, $3=, $pop62
 	i32.const	$push7=, 16
-	i32.lt_u	$push8=, $pop61, $pop7
+	i32.lt_u	$push8=, $6, $pop7
 	br_if   	0, $pop8        # 0: down to label5
-# BB#2:                                 # %if.else
+# %bb.2:                                # %if.else
 	i32.const	$push6=, 8192
-	i32.sub 	$push4=, $pop6, $3
+	i32.sub 	$push4=, $pop6, $6
 	i32.const	$push9=, 31
 	i32.gt_u	$push10=, $pop4, $pop9
 	br_if   	1, $pop10       # 1: down to label4
@@ -121,7 +117,7 @@ test:                                   # @test
 	i32.const	$push13=, 1
 	i32.const	$push12=, 0
 	i32.load	$push11=, 0($0)
-	call    	foo@FUNCTION, $pop13, $pop12, $pop11, $6
+	call    	foo@FUNCTION, $pop13, $pop12, $pop11, $3
 .LBB3_4:                                # %if.end7
 	end_block                       # label4:
 	i32.call	$push15=, baz@FUNCTION, $0
@@ -131,36 +127,31 @@ test:                                   # @test
 	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
+	copy_local	$0=, $pop56
+	i32.call	$push14=, baz@FUNCTION, $0
+	i32.eqz 	$push58=, $pop14
+	br_if   	1, $pop58       # 1: down to label1
 .LBB3_6:                                # %if.end9
 	end_block                       # label2:
+	i32.const	$push16=, 0
+	i32.load	$1=, b($pop16)
+	i32.load16_u	$2=, 2($1)
 	i32.const	$push20=, 32
 	i32.const	$push19=, 4
-	i32.const	$push16=, 0
-	i32.load	$push74=, b($pop16)
-	tee_local	$push73=, $1=, $pop74
-	i32.load16_u	$push72=, 2($pop73)
-	tee_local	$push71=, $2=, $pop72
 	i32.const	$push17=, 2
-	i32.and 	$push18=, $pop71, $pop17
+	i32.and 	$push18=, $2, $pop17
 	i32.select	$3=, $pop20, $pop19, $pop18
+	i32.load	$4=, 4($0)
+	i32.const	$push21=, 8191
+	i32.and 	$6=, $4, $pop21
 	block   	
 	block   	
-	i32.load	$push70=, 4($0)
-	tee_local	$push69=, $4=, $pop70
-	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.eqz 	$push59=, $6
+	br_if   	0, $pop59       # 0: down to label7
+# %bb.7:                                # %if.else17
 	i32.ge_u	$push22=, $6, $3
 	br_if   	1, $pop22       # 1: down to label6
-# BB#8:                                 # %if.then20
+# %bb.8:                                # %if.then20
 	i32.const	$push25=, 2
 	i32.const	$push24=, 0
 	i32.load	$push23=, 0($0)
@@ -179,12 +170,12 @@ test:                                   # @test
 	block   	
 	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.eqz 	$push60=, $pop28
+	br_if   	0, $pop60       # 0: down to label8
+# %bb.11:                               # %if.end24
 	i32.ne  	$push29=, $6, $3
 	br_if   	0, $pop29       # 0: down to label8
-# BB#12:                                # %if.then31
+# %bb.12:                               # %if.then31
 	i64.load	$push41=, 0($0):p2align=2
 	i64.store	0($7), $pop41
 	call    	bar@FUNCTION, $7
@@ -200,32 +191,28 @@ test:                                   # @test
 	end_block                       # label8:
 	i32.const	$push30=, 4
 	i32.add 	$push31=, $0, $pop30
-	i32.load	$push82=, 0($pop31)
-	tee_local	$push81=, $3=, $pop82
+	i32.load	$6=, 0($pop31)
 	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	$push34=, $pop77, $pop75
+	i32.and 	$push33=, $6, $pop32
+	i32.add 	$3=, $1, $pop33
+	i32.load	$2=, 4($3)
+	i32.load	$0=, 0($0)
+	i32.lt_u	$push34=, $2, $0
 	br_if   	0, $pop34       # 0: down to label1
-# BB#14:                                # %land.lhs.true41
+# %bb.14:                               # %land.lhs.true41
 	block   	
 	i32.ne  	$push35=, $2, $0
 	br_if   	0, $pop35       # 0: down to label9
-# BB#15:                                # %lor.lhs.false47
+# %bb.15:                               # %lor.lhs.false47
 	i32.const	$push36=, 8
-	i32.add 	$push37=, $6, $pop36
+	i32.add 	$push37=, $3, $pop36
 	i32.load	$push38=, 0($pop37)
-	i32.lt_u	$push39=, $pop38, $3
+	i32.lt_u	$push39=, $pop38, $6
 	br_if   	1, $pop39       # 1: down to label1
 .LBB3_16:                               # %if.then53
 	end_block                       # label9:
 	i32.const	$push40=, 4
-	call    	foo@FUNCTION, $pop40, $6, $0, $3
+	call    	foo@FUNCTION, $pop40, $3, $0, $6
 .LBB3_17:                               # %cleanup
 	end_block                       # label1:
 	i32.const	$push54=, 0
@@ -244,7 +231,7 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.const	$push0=, u
 	i32.store	b($pop7), $pop0
@@ -262,7 +249,7 @@ main:                                   # @main
 	i32.const	$push3=, 16384
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label10
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 0
 	return  	$pop8
 .LBB4_2:                                # %if.then
@@ -310,5 +297,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49419.c.s b/test/torture-s/pr49419.c.s
index 511d703a6..0ecd305b8 100644
--- a/test/torture-s/pr49419.c.s
+++ b/test/torture-s/pr49419.c.s
@@ -8,13 +8,13 @@ foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, -1
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$5=, 0
 	i32.const	$push34=, 0
 	i32.load	$4=, t($pop34)
@@ -22,49 +22,46 @@ foo:                                    # @foo
 	i32.const	$push3=, 1
 	i32.lt_s	$push4=, $3, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#2:                                 # %if.end
+# %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.lr.ph
+# %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
+# %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.load	$6=, 4($pop14)
 	i32.const	$push35=, 12
-	i32.mul 	$push15=, $pop36, $pop35
+	i32.mul 	$push15=, $6, $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
+# %bb.5:                                # %for.body.preheader
 	i32.const	$5=, 1
 .LBB0_6:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push40=, 1
-	i32.add 	$push39=, $5, $pop40
-	tee_local	$push38=, $5=, $pop39
-	i32.ge_s	$push19=, $pop38, $3
+	i32.const	$push36=, 1
+	i32.add 	$5=, $5, $pop36
+	i32.ge_s	$push19=, $5, $3
 	br_if   	1, $pop19       # 1: down to label2
-# BB#7:                                 # %for.body
+# %bb.7:                                # %for.body
                                         #   in Loop: Header=BB0_6 Depth=1
-	i32.const	$push44=, 12
-	i32.mul 	$push20=, $6, $pop44
+	i32.const	$push38=, 12
+	i32.mul 	$push20=, $6, $pop38
 	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.load	$6=, 4($pop21)
+	i32.const	$push37=, 12
+	i32.mul 	$push22=, $6, $pop37
 	i32.add 	$push23=, $4, $pop22
 	i32.load	$push18=, 0($pop23)
 	i32.eq  	$push24=, $pop18, $1
@@ -74,41 +71,39 @@ foo:                                    # @foo
 	end_block                       # label2:
 	i32.eq  	$push25=, $5, $3
 	br_if   	1, $pop25       # 1: down to label0
-# BB#9:                                 # %if.end7
+# %bb.9:                                # %if.end7
 	block   	
-	i32.const	$push45=, 1
-	i32.lt_s	$push26=, $5, $pop45
+	i32.const	$push39=, 1
+	i32.lt_s	$push26=, $5, $pop39
 	br_if   	0, $pop26       # 0: down to label4
-# BB#10:                                # %for.body10.preheader
-	i32.const	$push46=, 1
-	i32.add 	$3=, $5, $pop46
+# %bb.10:                               # %for.body10.preheader
+	i32.const	$push40=, 1
+	i32.add 	$6=, $5, $pop40
 	i32.const	$push27=, 2
 	i32.shl 	$push28=, $5, $pop27
-	i32.add 	$6=, $2, $pop28
+	i32.add 	$3=, $2, $pop28
 .LBB0_11:                               # %for.body10
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	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.const	$push44=, 12
+	i32.mul 	$push29=, $0, $pop44
+	i32.add 	$0=, $4, $pop29
+	i32.load	$push30=, 8($0)
+	i32.store	0($3), $pop30
+	i32.const	$push43=, -4
+	i32.add 	$3=, $3, $pop43
+	i32.const	$push42=, -1
+	i32.add 	$6=, $6, $pop42
 	i32.load	$0=, 4($0)
-	i32.const	$push50=, -1
-	i32.add 	$push49=, $3, $pop50
-	tee_local	$push48=, $3=, $pop49
-	i32.const	$push47=, 1
-	i32.gt_s	$push31=, $pop48, $pop47
+	i32.const	$push41=, 1
+	i32.gt_s	$push31=, $6, $pop41
 	br_if   	0, $pop31       # 0: up to label5
 .LBB0_12:                               # %for.end16
 	end_loop
 	end_block                       # label4:
 	i32.store	0($2), $0
-	i32.const	$push55=, 1
-	i32.add 	$push33=, $5, $pop55
+	i32.const	$push45=, 1
+	i32.add 	$push33=, $5, $pop45
 	return  	$pop33
 .LBB0_13:
 	end_block                       # label1:
@@ -129,14 +124,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %lor.lhs.false
+# %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.sub 	$0=, $pop10, $pop12
 	i32.const	$push0=, 32
-	i32.add 	$push1=, $pop17, $pop0
+	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
 	i32.store	0($pop1), $pop2
 	i32.const	$push3=, 24
@@ -171,5 +165,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr49644.c.s b/test/torture-s/pr49644.c.s
index db5e25618..f118f3bae 100644
--- a/test/torture-s/pr49644.c.s
+++ b/test/torture-s/pr49644.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr49712.c.s b/test/torture-s/pr49712.c.s
index b6308ef66..d98b6cacf 100644
--- a/test/torture-s/pr49712.c.s
+++ b/test/torture-s/pr49712.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,14 +18,14 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 0
 	i32.load	$push0=, d($pop4)
 	i32.const	$push3=, 0
 	i32.le_s	$push1=, $pop0, $pop3
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.end9
+# %bb.1:                                # %for.end9
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB1_2:                                # %for.body
@@ -49,7 +49,7 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.const	$push4=, 0
 	i32.store	b($pop5), $pop4
@@ -58,7 +58,7 @@ main:                                   # @main
 	i32.load	$push0=, c($pop3)
 	i32.eqz 	$push11=, $pop0
 	br_if   	0, $pop11       # 0: down to label1
-# BB#1:                                 # %while.body.lr.ph
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push6=, 0
 	i32.load	$0=, d($pop6)
 .LBB2_2:                                # %while.body
@@ -127,4 +127,4 @@ a:
 	.size	a, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr49768.c.s b/test/torture-s/pr49768.c.s
index a10da59b4..1f904e8ed 100644
--- a/test/torture-s/pr49768.c.s
+++ b/test/torture-s/pr49768.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr49886.c.s b/test/torture-s/pr49886.c.s
index 75dc29744..e130b2bfb 100644
--- a/test/torture-s/pr49886.c.s
+++ b/test/torture-s/pr49886.c.s
@@ -6,7 +6,7 @@
 	.type	never_ever,@function
 never_ever:                             # @never_ever
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -19,7 +19,7 @@ never_ever:                             # @never_ever
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	cond($pop1), $pop0
@@ -35,7 +35,7 @@ main:                                   # @main
 	.type	bar_1,@function
 bar_1:                                  # @bar_1
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($1)
 	i32.const	$push1=, 1
 	i32.add 	$push2=, $pop0, $pop1
@@ -51,7 +51,7 @@ bar_1:                                  # @bar_1
 mark_cell:                              # @mark_cell
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -62,92 +62,88 @@ mark_cell:                              # @mark_cell
 	block   	
 	block   	
 	block   	
-	i32.eqz 	$push49=, $0
-	br_if   	0, $pop49       # 0: down to label9
-# BB#1:                                 # %entry
+	i32.eqz 	$push41=, $0
+	br_if   	0, $pop41       # 0: down to label9
+# %bb.1:                                # %entry
 	i32.const	$push1=, 0
 	i32.load	$push0=, cond($pop1)
-	i32.eqz 	$push50=, $pop0
-	br_if   	0, $pop50       # 0: down to label9
-# BB#2:                                 # %land.lhs.true
+	i32.eqz 	$push42=, $pop0
+	br_if   	0, $pop42       # 0: down to label9
+# %bb.2:                                # %land.lhs.true
 	i32.load	$push2=, 8($0)
 	i32.const	$push3=, 4
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label9
-# BB#3:                                 # %land.lhs.true2
-	i32.load	$push38=, 0($0)
-	tee_local	$push37=, $0=, $pop38
-	i32.eqz 	$push51=, $pop37
-	br_if   	0, $pop51       # 0: down to label9
-# BB#4:                                 # %land.lhs.true4
-	i32.const	$push41=, 2
-	i32.add 	$push40=, $0, $pop41
-	tee_local	$push39=, $1=, $pop40
-	i32.load8_u	$push5=, 0($pop39)
+# %bb.3:                                # %land.lhs.true2
+	i32.load	$0=, 0($0)
+	i32.eqz 	$push43=, $0
+	br_if   	0, $pop43       # 0: down to label9
+# %bb.4:                                # %land.lhs.true4
+	i32.const	$push37=, 2
+	i32.add 	$1=, $0, $pop37
+	i32.load8_u	$push5=, 0($1)
 	i32.const	$push6=, 4
 	i32.and 	$push7=, $pop5, $pop6
-	i32.eqz 	$push52=, $pop7
-	br_if   	1, $pop52       # 1: down to label8
-# BB#5:                                 # %land.lhs.true17
+	i32.eqz 	$push44=, $pop7
+	br_if   	1, $pop44       # 1: down to label8
+# %bb.5:                                # %land.lhs.true17
 	i32.load8_u	$push8=, 0($1)
-	i32.const	$push42=, 2
-	i32.and 	$push9=, $pop8, $pop42
-	i32.eqz 	$push53=, $pop9
-	br_if   	2, $pop53       # 2: down to label7
-# BB#6:                                 # %land.lhs.true33
+	i32.const	$push38=, 2
+	i32.and 	$push9=, $pop8, $pop38
+	i32.eqz 	$push45=, $pop9
+	br_if   	2, $pop45       # 2: down to label7
+# %bb.6:                                # %land.lhs.true33
 	i32.const	$push10=, 2
 	i32.add 	$push11=, $0, $pop10
 	i32.load8_u	$push12=, 0($pop11)
-	i32.const	$push43=, 1
-	i32.and 	$push13=, $pop12, $pop43
-	i32.eqz 	$push54=, $pop13
-	br_if   	3, $pop54       # 3: down to label6
-# BB#7:                                 # %land.lhs.true49
-	i32.const	$push44=, 1
-	i32.add 	$push14=, $0, $pop44
+	i32.const	$push39=, 1
+	i32.and 	$push13=, $pop12, $pop39
+	i32.eqz 	$push46=, $pop13
+	br_if   	3, $pop46       # 3: down to label6
+# %bb.7:                                # %land.lhs.true49
+	i32.const	$push40=, 1
+	i32.add 	$push14=, $0, $pop40
 	i32.load8_u	$push15=, 0($pop14)
 	i32.const	$push16=, 7
 	i32.shr_u	$push17=, $pop15, $pop16
-	i32.eqz 	$push55=, $pop17
-	br_if   	4, $pop55       # 4: down to label5
-# BB#8:                                 # %land.lhs.true65
+	i32.eqz 	$push47=, $pop17
+	br_if   	4, $pop47       # 4: down to label5
+# %bb.8:                                # %land.lhs.true65
 	i32.const	$push18=, 1
-	i32.add 	$push46=, $0, $pop18
-	tee_local	$push45=, $1=, $pop46
-	i32.load8_u	$push19=, 0($pop45)
+	i32.add 	$1=, $0, $pop18
+	i32.load8_u	$push19=, 0($1)
 	i32.const	$push20=, 64
 	i32.and 	$push21=, $pop19, $pop20
-	i32.eqz 	$push56=, $pop21
-	br_if   	5, $pop56       # 5: down to label4
-# BB#9:                                 # %land.lhs.true81
+	i32.eqz 	$push48=, $pop21
+	br_if   	5, $pop48       # 5: down to label4
+# %bb.9:                                # %land.lhs.true81
 	i32.load8_u	$push22=, 0($1)
 	i32.const	$push23=, 32
 	i32.and 	$push24=, $pop22, $pop23
-	i32.eqz 	$push57=, $pop24
-	br_if   	6, $pop57       # 6: down to label3
-# BB#10:                                # %land.lhs.true97
+	i32.eqz 	$push49=, $pop24
+	br_if   	6, $pop49       # 6: down to label3
+# %bb.10:                               # %land.lhs.true97
 	i32.const	$push25=, 1
-	i32.add 	$push48=, $0, $pop25
-	tee_local	$push47=, $1=, $pop48
-	i32.load8_u	$push26=, 0($pop47)
+	i32.add 	$1=, $0, $pop25
+	i32.load8_u	$push26=, 0($1)
 	i32.const	$push27=, 16
 	i32.and 	$push28=, $pop26, $pop27
-	i32.eqz 	$push58=, $pop28
-	br_if   	7, $pop58       # 7: down to label2
-# BB#11:                                # %land.lhs.true113
+	i32.eqz 	$push50=, $pop28
+	br_if   	7, $pop50       # 7: down to label2
+# %bb.11:                               # %land.lhs.true113
 	i32.load8_u	$push29=, 0($1)
 	i32.const	$push30=, 8
 	i32.and 	$push31=, $pop29, $pop30
-	i32.eqz 	$push59=, $pop31
-	br_if   	8, $pop59       # 8: down to label1
-# BB#12:                                # %land.lhs.true129
+	i32.eqz 	$push51=, $pop31
+	br_if   	8, $pop51       # 8: down to label1
+# %bb.12:                               # %land.lhs.true129
 	i32.const	$push32=, 1
 	i32.add 	$push33=, $0, $pop32
 	i32.load8_u	$push34=, 0($pop33)
 	i32.const	$push35=, 4
 	i32.and 	$push36=, $pop34, $pop35
-	i32.eqz 	$push60=, $pop36
-	br_if   	9, $pop60       # 9: down to label0
+	i32.eqz 	$push52=, $pop36
+	br_if   	9, $pop52       # 9: down to label0
 .LBB3_13:                               # %if.end137
 	end_block                       # label9:
 	return
@@ -197,7 +193,7 @@ mark_cell:                              # @mark_cell
 	.type	bar_2,@function
 bar_2:                                  # @bar_2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($1)
 	i32.const	$push1=, 2
 	i32.add 	$push2=, $pop0, $pop1
@@ -227,5 +223,5 @@ gi:
 	.size	gi, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51023.c.s b/test/torture-s/pr51023.c.s
index 07ea4c49a..ed75910db 100644
--- a/test/torture-s/pr51023.c.s
+++ b/test/torture-s/pr51023.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push3=, 16
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -31,4 +31,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr51323.c.s b/test/torture-s/pr51323.c.s
index f54490d44..a216697d8 100644
--- a/test/torture-s/pr51323.c.s
+++ b/test/torture-s/pr51323.c.s
@@ -6,19 +6,19 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push1=, 9
 	i32.ne  	$push2=, $2, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	br_if   	0, $1           # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push0=, v($pop3)
 	i32.ne  	$push4=, $pop0, $0
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -34,7 +34,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($1)
 	i32.const	$push1=, 0
 	call    	foo@FUNCTION, $pop0, $pop1, $0
@@ -50,14 +50,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $0
 	i32.const	$push1=, 0
 	i32.const	$push0=, 3
 	i32.store	v($pop1), $pop0
@@ -112,5 +111,5 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51466.c.s b/test/torture-s/pr51466.c.s
index 33c08b4e1..1b024c7a9 100644
--- a/test/torture-s/pr51466.c.s
+++ b/test/torture-s/pr51466.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
@@ -30,17 +30,16 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
 	i32.sub 	$push8=, $pop5, $pop7
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push10=, $pop8, $pop1
-	tee_local	$push9=, $0=, $pop10
+	i32.add 	$0=, $pop8, $pop1
 	i32.const	$push2=, 6
-	i32.store	0($pop9), $pop2
+	i32.store	0($0), $pop2
 	i32.const	$push3=, 8
 	i32.store	0($0), $pop3
 	i32.load	$push4=, 0($0)
@@ -57,18 +56,16 @@ baz:                                    # @baz
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push11=, $pop5, $pop7
-	tee_local	$push10=, $1=, $pop11
+	i32.sub 	$1=, $pop5, $pop7
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
-	i32.add 	$push9=, $pop10, $pop1
-	tee_local	$push8=, $0=, $pop9
+	i32.add 	$0=, $1, $pop1
 	i32.const	$push2=, 6
-	i32.store	0($pop8), $pop2
+	i32.store	0($0), $pop2
 	i32.const	$push3=, 8
 	i32.store	0($1), $pop3
 	i32.load	$push4=, 0($0)
@@ -83,7 +80,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.call	$drop=, foo@FUNCTION, $pop0
 	block   	
@@ -92,19 +89,19 @@ main:                                   # @main
 	i32.const	$push12=, 8
 	i32.ne  	$push3=, $pop2, $pop12
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false3
+# %bb.1:                                # %lor.lhs.false3
 	i32.const	$push4=, 0
 	i32.call	$push5=, baz@FUNCTION, $pop4
 	i32.const	$push13=, 8
 	i32.ne  	$push6=, $pop5, $pop13
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false6
+# %bb.2:                                # %lor.lhs.false6
 	i32.const	$push7=, 1
 	i32.call	$push8=, baz@FUNCTION, $pop7
 	i32.const	$push9=, 6
 	i32.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push11=, 0
 	return  	$pop11
 .LBB3_4:                                # %if.then
@@ -116,5 +113,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51581-1.c.s b/test/torture-s/pr51581-1.c.s
index c75bb3dba..81b66756a 100644
--- a/test/torture-s/pr51581-1.c.s
+++ b/test/torture-s/pr51581-1.c.s
@@ -6,24 +6,23 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push9=, c+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, a+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, c+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, a+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 3
-	i32.div_s	$push3=, $pop2, $pop7
+	i32.const	$push5=, 3
+	i32.div_s	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label0
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -36,24 +35,23 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push9=, d+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, b+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, d+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, b+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 3
-	i32.div_u	$push3=, $pop2, $pop7
+	i32.const	$push5=, 3
+	i32.div_u	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label1
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label1
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -66,24 +64,23 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push9=, c+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, a+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, c+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, a+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 18
-	i32.div_s	$push3=, $pop2, $pop7
+	i32.const	$push5=, 18
+	i32.div_s	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label2
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label2
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -96,24 +93,23 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB3_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push9=, d+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, b+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, d+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, b+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 18
-	i32.div_u	$push3=, $pop2, $pop7
+	i32.const	$push5=, 18
+	i32.div_u	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label3
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label3
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -126,24 +122,23 @@ f4:                                     # @f4
 	.type	f5,@function
 f5:                                     # @f5
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB4_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
-	i32.const	$push9=, c+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, a+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, c+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, a+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 19
-	i32.div_s	$push3=, $pop2, $pop7
+	i32.const	$push5=, 19
+	i32.div_s	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label4
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label4
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -156,24 +151,23 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB5_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.const	$push9=, d+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, b+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, d+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, b+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 19
-	i32.div_u	$push3=, $pop2, $pop7
+	i32.const	$push5=, 19
+	i32.div_u	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label5
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label5
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -186,32 +180,30 @@ f6:                                     # @f6
 	.type	f7,@function
 f7:                                     # @f7
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB6_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.const	$push17=, c+16384
-	i32.add 	$push7=, $1, $pop17
-	i32.const	$push16=, a+16384
-	i32.add 	$push0=, $1, $pop16
-	i32.load	$push15=, 0($pop0)
-	tee_local	$push14=, $0=, $pop15
-	i64.extend_s/i32	$push2=, $pop14
-	i64.const	$push13=, 1431655766
-	i64.mul 	$push3=, $pop2, $pop13
-	i64.const	$push12=, 32
-	i64.shr_u	$push4=, $pop3, $pop12
+	i32.const	$push13=, a+16384
+	i32.add 	$push0=, $1, $pop13
+	i32.load	$0=, 0($pop0)
+	i32.const	$push12=, c+16384
+	i32.add 	$push7=, $1, $pop12
+	i64.extend_s/i32	$push2=, $0
+	i64.const	$push11=, 1431655766
+	i64.mul 	$push3=, $pop2, $pop11
+	i64.const	$push10=, 32
+	i64.shr_u	$push4=, $pop3, $pop10
 	i32.wrap/i64	$push5=, $pop4
-	i32.const	$push11=, 31
-	i32.shr_s	$push1=, $0, $pop11
+	i32.const	$push9=, 31
+	i32.shr_s	$push1=, $0, $pop9
 	i32.sub 	$push6=, $pop5, $pop1
 	i32.store	0($pop7), $pop6
-	i32.const	$push10=, 4
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
-	br_if   	0, $pop8        # 0: up to label6
-# BB#2:                                 # %for.end
+	i32.const	$push8=, 4
+	i32.add 	$1=, $1, $pop8
+	br_if   	0, $1           # 0: up to label6
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -224,26 +216,25 @@ f7:                                     # @f7
 	.type	f8,@function
 f8:                                     # @f8
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB7_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.const	$push11=, d+16384
-	i32.add 	$push0=, $0, $pop11
-	i32.const	$push10=, b+16384
-	i32.add 	$push1=, $0, $pop10
+	i32.const	$push9=, d+16384
+	i32.add 	$push0=, $0, $pop9
+	i32.const	$push8=, b+16384
+	i32.add 	$push1=, $0, $pop8
 	i64.load32_u	$push2=, 0($pop1)
-	i64.const	$push9=, 2863311531
-	i64.mul 	$push3=, $pop2, $pop9
-	i64.const	$push8=, 33
-	i64.shr_u	$push4=, $pop3, $pop8
+	i64.const	$push7=, 2863311531
+	i64.mul 	$push3=, $pop2, $pop7
+	i64.const	$push6=, 33
+	i64.shr_u	$push4=, $pop3, $pop6
 	i64.store32	0($pop0), $pop4
-	i32.const	$push7=, 4
-	i32.add 	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	br_if   	0, $pop5        # 0: up to label7
-# BB#2:                                 # %for.end
+	i32.const	$push5=, 4
+	i32.add 	$0=, $0, $pop5
+	br_if   	0, $0           # 0: up to label7
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -256,32 +247,30 @@ f8:                                     # @f8
 	.type	f9,@function
 f9:                                     # @f9
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB8_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
-	i32.const	$push17=, c+16384
-	i32.add 	$push7=, $1, $pop17
-	i32.const	$push16=, a+16384
-	i32.add 	$push0=, $1, $pop16
-	i32.load	$push15=, 0($pop0)
-	tee_local	$push14=, $0=, $pop15
-	i64.extend_s/i32	$push2=, $pop14
-	i64.const	$push13=, 954437177
-	i64.mul 	$push3=, $pop2, $pop13
-	i64.const	$push12=, 34
-	i64.shr_s	$push4=, $pop3, $pop12
+	i32.const	$push13=, a+16384
+	i32.add 	$push0=, $1, $pop13
+	i32.load	$0=, 0($pop0)
+	i32.const	$push12=, c+16384
+	i32.add 	$push7=, $1, $pop12
+	i64.extend_s/i32	$push2=, $0
+	i64.const	$push11=, 954437177
+	i64.mul 	$push3=, $pop2, $pop11
+	i64.const	$push10=, 34
+	i64.shr_s	$push4=, $pop3, $pop10
 	i32.wrap/i64	$push5=, $pop4
-	i32.const	$push11=, 31
-	i32.shr_s	$push1=, $0, $pop11
+	i32.const	$push9=, 31
+	i32.shr_s	$push1=, $0, $pop9
 	i32.sub 	$push6=, $pop5, $pop1
 	i32.store	0($pop7), $pop6
-	i32.const	$push10=, 4
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
-	br_if   	0, $pop8        # 0: up to label8
-# BB#2:                                 # %for.end
+	i32.const	$push8=, 4
+	i32.add 	$1=, $1, $pop8
+	br_if   	0, $1           # 0: up to label8
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -294,26 +283,25 @@ f9:                                     # @f9
 	.type	f10,@function
 f10:                                    # @f10
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB9_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.const	$push11=, d+16384
-	i32.add 	$push0=, $0, $pop11
-	i32.const	$push10=, b+16384
-	i32.add 	$push1=, $0, $pop10
+	i32.const	$push9=, d+16384
+	i32.add 	$push0=, $0, $pop9
+	i32.const	$push8=, b+16384
+	i32.add 	$push1=, $0, $pop8
 	i64.load32_u	$push2=, 0($pop1)
-	i64.const	$push9=, 954437177
-	i64.mul 	$push3=, $pop2, $pop9
-	i64.const	$push8=, 34
-	i64.shr_u	$push4=, $pop3, $pop8
+	i64.const	$push7=, 954437177
+	i64.mul 	$push3=, $pop2, $pop7
+	i64.const	$push6=, 34
+	i64.shr_u	$push4=, $pop3, $pop6
 	i64.store32	0($pop0), $pop4
-	i32.const	$push7=, 4
-	i32.add 	$push6=, $0, $pop7
-	tee_local	$push5=, $0=, $pop6
-	br_if   	0, $pop5        # 0: up to label9
-# BB#2:                                 # %for.end
+	i32.const	$push5=, 4
+	i32.add 	$0=, $0, $pop5
+	br_if   	0, $0           # 0: up to label9
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -326,32 +314,30 @@ f10:                                    # @f10
 	.type	f11,@function
 f11:                                    # @f11
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB10_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label10:
-	i32.const	$push17=, c+16384
-	i32.add 	$push7=, $1, $pop17
-	i32.const	$push16=, a+16384
-	i32.add 	$push0=, $1, $pop16
-	i32.load	$push15=, 0($pop0)
-	tee_local	$push14=, $0=, $pop15
-	i64.extend_s/i32	$push2=, $pop14
-	i64.const	$push13=, 1808407283
-	i64.mul 	$push3=, $pop2, $pop13
-	i64.const	$push12=, 35
-	i64.shr_s	$push4=, $pop3, $pop12
+	i32.const	$push13=, a+16384
+	i32.add 	$push0=, $1, $pop13
+	i32.load	$0=, 0($pop0)
+	i32.const	$push12=, c+16384
+	i32.add 	$push7=, $1, $pop12
+	i64.extend_s/i32	$push2=, $0
+	i64.const	$push11=, 1808407283
+	i64.mul 	$push3=, $pop2, $pop11
+	i64.const	$push10=, 35
+	i64.shr_s	$push4=, $pop3, $pop10
 	i32.wrap/i64	$push5=, $pop4
-	i32.const	$push11=, 31
-	i32.shr_s	$push1=, $0, $pop11
+	i32.const	$push9=, 31
+	i32.shr_s	$push1=, $0, $pop9
 	i32.sub 	$push6=, $pop5, $pop1
 	i32.store	0($pop7), $pop6
-	i32.const	$push10=, 4
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
-	br_if   	0, $pop8        # 0: up to label10
-# BB#2:                                 # %for.end
+	i32.const	$push8=, 4
+	i32.add 	$1=, $1, $pop8
+	br_if   	0, $1           # 0: up to label10
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -363,37 +349,34 @@ f11:                                    # @f11
 	.globl	f12
 	.type	f12,@function
 f12:                                    # @f12
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$1=, -16384
+	.local  	i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$2=, -16384
 .LBB11_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label11:
-	i32.const	$push21=, d+16384
-	i32.add 	$push8=, $1, $pop21
-	i32.const	$push20=, b+16384
-	i32.add 	$push0=, $1, $pop20
-	i32.load	$push19=, 0($pop0)
-	tee_local	$push18=, $0=, $pop19
+	i32.const	$push15=, b+16384
+	i32.add 	$push0=, $2, $pop15
+	i32.load	$0=, 0($pop0)
 	i64.extend_u/i32	$push1=, $0
-	i64.const	$push17=, 2938661835
-	i64.mul 	$push2=, $pop1, $pop17
-	i64.const	$push16=, 32
-	i64.shr_u	$push3=, $pop2, $pop16
-	i32.wrap/i64	$push15=, $pop3
-	tee_local	$push14=, $0=, $pop15
-	i32.sub 	$push4=, $pop18, $pop14
-	i32.const	$push13=, 1
-	i32.shr_u	$push5=, $pop4, $pop13
-	i32.add 	$push6=, $pop5, $0
-	i32.const	$push12=, 4
-	i32.shr_u	$push7=, $pop6, $pop12
+	i64.const	$push14=, 2938661835
+	i64.mul 	$push2=, $pop1, $pop14
+	i64.const	$push13=, 32
+	i64.shr_u	$push3=, $pop2, $pop13
+	i32.wrap/i64	$1=, $pop3
+	i32.const	$push12=, d+16384
+	i32.add 	$push8=, $2, $pop12
+	i32.sub 	$push4=, $0, $1
+	i32.const	$push11=, 1
+	i32.shr_u	$push5=, $pop4, $pop11
+	i32.add 	$push6=, $pop5, $1
+	i32.const	$push10=, 4
+	i32.shr_u	$push7=, $pop6, $pop10
 	i32.store	0($pop8), $pop7
-	i32.const	$push11=, 4
-	i32.add 	$push10=, $1, $pop11
-	tee_local	$push9=, $1=, $pop10
-	br_if   	0, $pop9        # 0: up to label11
-# BB#2:                                 # %for.end
+	i32.const	$push9=, 4
+	i32.add 	$2=, $2, $pop9
+	br_if   	0, $2           # 0: up to label11
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -407,288 +390,281 @@ f12:                                    # @f12
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$1=, 0
-	i32.const	$0=, -16384
+# %bb.0:                                # %entry
+	i32.const	$0=, 0
+	i32.const	$1=, -16384
 .LBB12_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
 	#APP
 	#NO_APP
-	i32.const	$push90=, b+16384
-	i32.add 	$push0=, $0, $pop90
-	i32.store	0($pop0), $1
-	i32.const	$push89=, a+16384
-	i32.add 	$push2=, $0, $pop89
-	i32.const	$push88=, -2048
-	i32.add 	$push1=, $1, $pop88
+	i32.const	$push89=, b+16384
+	i32.add 	$push0=, $1, $pop89
+	i32.store	0($pop0), $0
+	i32.const	$push88=, a+16384
+	i32.add 	$push2=, $1, $pop88
+	i32.const	$push87=, -2048
+	i32.add 	$push1=, $0, $pop87
 	i32.store	0($pop2), $pop1
-	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
+	i32.add 	$1=, $1, $pop86
+	i32.const	$push85=, 1
+	i32.add 	$0=, $0, $pop85
+	br_if   	0, $1           # 0: up to label12
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$1=, 0
-	i32.const	$push94=, 0
+	i32.const	$push92=, 0
 	i32.const	$push3=, 2147483647
-	i32.store	a+16380($pop94), $pop3
-	i32.const	$push93=, 0
+	i32.store	a+16380($pop92), $pop3
+	i32.const	$push91=, 0
 	i64.const	$push4=, -9223372030412324864
-	i64.store	a($pop93), $pop4
-	i32.const	$0=, -1
-	i32.const	$push92=, 0
-	i32.const	$push91=, -1
-	i32.store	b+16380($pop92), $pop91
+	i64.store	a($pop91), $pop4
+	i32.const	$push90=, 0
+	i32.const	$push5=, -1
+	i32.store	b+16380($pop90), $pop5
 	call    	f1@FUNCTION
 	call    	f2@FUNCTION
+	i32.const	$0=, 0
 .LBB12_3:                               # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label14:
-	i32.const	$push97=, c
-	i32.add 	$push8=, $1, $pop97
-	i32.load	$push9=, 0($pop8)
-	i32.const	$push96=, a
-	i32.add 	$push5=, $1, $pop96
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push95=, 3
-	i32.div_s	$push7=, $pop6, $pop95
-	i32.ne  	$push10=, $pop9, $pop7
-	br_if   	1, $pop10       # 1: down to label13
-# BB#4:                                 # %lor.lhs.false
+	i32.const	$push95=, c
+	i32.add 	$push9=, $1, $pop95
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push94=, a
+	i32.add 	$push6=, $1, $pop94
+	i32.load	$push7=, 0($pop6)
+	i32.const	$push93=, 3
+	i32.div_s	$push8=, $pop7, $pop93
+	i32.ne  	$push11=, $pop10, $pop8
+	br_if   	1, $pop11       # 1: down to label13
+# %bb.4:                                # %lor.lhs.false
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push100=, d
-	i32.add 	$push14=, $1, $pop100
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push99=, b
-	i32.add 	$push11=, $1, $pop99
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push98=, 3
-	i32.div_u	$push13=, $pop12, $pop98
-	i32.ne  	$push16=, $pop15, $pop13
-	br_if   	1, $pop16       # 1: down to label13
-# BB#5:                                 # %for.cond2
+	i32.const	$push98=, d
+	i32.add 	$push15=, $1, $pop98
+	i32.load	$push16=, 0($pop15)
+	i32.const	$push97=, b
+	i32.add 	$push12=, $1, $pop97
+	i32.load	$push13=, 0($pop12)
+	i32.const	$push96=, 3
+	i32.div_u	$push14=, $pop13, $pop96
+	i32.ne  	$push17=, $pop16, $pop14
+	br_if   	1, $pop17       # 1: down to label13
+# %bb.5:                                # %for.cond2
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push105=, 4
-	i32.add 	$1=, $1, $pop105
-	i32.const	$push104=, 1
-	i32.add 	$push103=, $0, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 4094
-	i32.le_u	$push17=, $pop102, $pop101
-	br_if   	0, $pop17       # 0: up to label14
-# BB#6:                                 # %for.end14
+	i32.const	$push101=, 1
+	i32.add 	$0=, $0, $pop101
+	i32.const	$push100=, 4
+	i32.add 	$1=, $1, $pop100
+	i32.const	$push99=, 4095
+	i32.le_u	$push18=, $0, $pop99
+	br_if   	0, $pop18       # 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    	                # label15:
-	i32.const	$push108=, c
-	i32.add 	$push21=, $1, $pop108
-	i32.load	$push22=, 0($pop21)
-	i32.const	$push107=, a
-	i32.add 	$push18=, $1, $pop107
-	i32.load	$push19=, 0($pop18)
-	i32.const	$push106=, 18
-	i32.div_s	$push20=, $pop19, $pop106
-	i32.ne  	$push23=, $pop22, $pop20
-	br_if   	1, $pop23       # 1: down to label13
-# BB#8:                                 # %lor.lhs.false22
+	i32.const	$push104=, c
+	i32.add 	$push22=, $1, $pop104
+	i32.load	$push23=, 0($pop22)
+	i32.const	$push103=, a
+	i32.add 	$push19=, $1, $pop103
+	i32.load	$push20=, 0($pop19)
+	i32.const	$push102=, 18
+	i32.div_s	$push21=, $pop20, $pop102
+	i32.ne  	$push24=, $pop23, $pop21
+	br_if   	1, $pop24       # 1: down to label13
+# %bb.8:                                # %lor.lhs.false22
                                         #   in Loop: Header=BB12_7 Depth=1
-	i32.const	$push111=, d
-	i32.add 	$push27=, $1, $pop111
-	i32.load	$push28=, 0($pop27)
-	i32.const	$push110=, b
-	i32.add 	$push24=, $1, $pop110
-	i32.load	$push25=, 0($pop24)
-	i32.const	$push109=, 18
-	i32.div_u	$push26=, $pop25, $pop109
-	i32.ne  	$push29=, $pop28, $pop26
-	br_if   	1, $pop29       # 1: down to label13
-# BB#9:                                 # %for.cond15
+	i32.const	$push107=, d
+	i32.add 	$push28=, $1, $pop107
+	i32.load	$push29=, 0($pop28)
+	i32.const	$push106=, b
+	i32.add 	$push25=, $1, $pop106
+	i32.load	$push26=, 0($pop25)
+	i32.const	$push105=, 18
+	i32.div_u	$push27=, $pop26, $pop105
+	i32.ne  	$push30=, $pop29, $pop27
+	br_if   	1, $pop30       # 1: down to label13
+# %bb.9:                                # %for.cond15
                                         #   in Loop: Header=BB12_7 Depth=1
-	i32.const	$push116=, 4
-	i32.add 	$1=, $1, $pop116
-	i32.const	$push115=, 1
-	i32.add 	$push114=, $0, $pop115
-	tee_local	$push113=, $0=, $pop114
-	i32.const	$push112=, 4094
-	i32.le_u	$push30=, $pop113, $pop112
-	br_if   	0, $pop30       # 0: up to label15
-# BB#10:                                # %for.end31
+	i32.const	$push110=, 1
+	i32.add 	$0=, $0, $pop110
+	i32.const	$push109=, 4
+	i32.add 	$1=, $1, $pop109
+	i32.const	$push108=, 4095
+	i32.le_u	$push31=, $0, $pop108
+	br_if   	0, $pop31       # 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    	                # label16:
-	i32.const	$push119=, c
-	i32.add 	$push34=, $1, $pop119
-	i32.load	$push35=, 0($pop34)
-	i32.const	$push118=, a
-	i32.add 	$push31=, $1, $pop118
-	i32.load	$push32=, 0($pop31)
-	i32.const	$push117=, 19
-	i32.div_s	$push33=, $pop32, $pop117
-	i32.ne  	$push36=, $pop35, $pop33
-	br_if   	1, $pop36       # 1: down to label13
-# BB#12:                                # %lor.lhs.false39
+	i32.const	$push113=, c
+	i32.add 	$push35=, $1, $pop113
+	i32.load	$push36=, 0($pop35)
+	i32.const	$push112=, a
+	i32.add 	$push32=, $1, $pop112
+	i32.load	$push33=, 0($pop32)
+	i32.const	$push111=, 19
+	i32.div_s	$push34=, $pop33, $pop111
+	i32.ne  	$push37=, $pop36, $pop34
+	br_if   	1, $pop37       # 1: down to label13
+# %bb.12:                               # %lor.lhs.false39
                                         #   in Loop: Header=BB12_11 Depth=1
-	i32.const	$push122=, d
-	i32.add 	$push40=, $1, $pop122
-	i32.load	$push41=, 0($pop40)
-	i32.const	$push121=, b
-	i32.add 	$push37=, $1, $pop121
-	i32.load	$push38=, 0($pop37)
-	i32.const	$push120=, 19
-	i32.div_u	$push39=, $pop38, $pop120
-	i32.ne  	$push42=, $pop41, $pop39
-	br_if   	1, $pop42       # 1: down to label13
-# BB#13:                                # %for.cond32
+	i32.const	$push116=, d
+	i32.add 	$push41=, $1, $pop116
+	i32.load	$push42=, 0($pop41)
+	i32.const	$push115=, b
+	i32.add 	$push38=, $1, $pop115
+	i32.load	$push39=, 0($pop38)
+	i32.const	$push114=, 19
+	i32.div_u	$push40=, $pop39, $pop114
+	i32.ne  	$push43=, $pop42, $pop40
+	br_if   	1, $pop43       # 1: down to label13
+# %bb.13:                               # %for.cond32
                                         #   in Loop: Header=BB12_11 Depth=1
-	i32.const	$push127=, 4
-	i32.add 	$1=, $1, $pop127
-	i32.const	$push126=, 1
-	i32.add 	$push125=, $0, $pop126
-	tee_local	$push124=, $0=, $pop125
-	i32.const	$push123=, 4094
-	i32.le_u	$push43=, $pop124, $pop123
-	br_if   	0, $pop43       # 0: up to label16
-# BB#14:                                # %for.end48
+	i32.const	$push119=, 1
+	i32.add 	$0=, $0, $pop119
+	i32.const	$push118=, 4
+	i32.add 	$1=, $1, $pop118
+	i32.const	$push117=, 4095
+	i32.le_u	$push44=, $0, $pop117
+	br_if   	0, $pop44       # 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    	                # label17:
-	i32.const	$push130=, c
-	i32.add 	$push47=, $1, $pop130
-	i32.load	$push48=, 0($pop47)
-	i32.const	$push129=, a
-	i32.add 	$push44=, $1, $pop129
-	i32.load	$push45=, 0($pop44)
-	i32.const	$push128=, 3
-	i32.div_s	$push46=, $pop45, $pop128
-	i32.ne  	$push49=, $pop48, $pop46
-	br_if   	1, $pop49       # 1: down to label13
-# BB#16:                                # %lor.lhs.false56
+	i32.const	$push122=, c
+	i32.add 	$push48=, $1, $pop122
+	i32.load	$push49=, 0($pop48)
+	i32.const	$push121=, a
+	i32.add 	$push45=, $1, $pop121
+	i32.load	$push46=, 0($pop45)
+	i32.const	$push120=, 3
+	i32.div_s	$push47=, $pop46, $pop120
+	i32.ne  	$push50=, $pop49, $pop47
+	br_if   	1, $pop50       # 1: down to label13
+# %bb.16:                               # %lor.lhs.false56
                                         #   in Loop: Header=BB12_15 Depth=1
-	i32.const	$push133=, d
-	i32.add 	$push53=, $1, $pop133
-	i32.load	$push54=, 0($pop53)
-	i32.const	$push132=, b
-	i32.add 	$push50=, $1, $pop132
-	i32.load	$push51=, 0($pop50)
-	i32.const	$push131=, 3
-	i32.div_u	$push52=, $pop51, $pop131
-	i32.ne  	$push55=, $pop54, $pop52
-	br_if   	1, $pop55       # 1: down to label13
-# BB#17:                                # %for.cond49
+	i32.const	$push125=, d
+	i32.add 	$push54=, $1, $pop125
+	i32.load	$push55=, 0($pop54)
+	i32.const	$push124=, b
+	i32.add 	$push51=, $1, $pop124
+	i32.load	$push52=, 0($pop51)
+	i32.const	$push123=, 3
+	i32.div_u	$push53=, $pop52, $pop123
+	i32.ne  	$push56=, $pop55, $pop53
+	br_if   	1, $pop56       # 1: down to label13
+# %bb.17:                               # %for.cond49
                                         #   in Loop: Header=BB12_15 Depth=1
-	i32.const	$push138=, 4
-	i32.add 	$1=, $1, $pop138
-	i32.const	$push137=, 1
-	i32.add 	$push136=, $0, $pop137
-	tee_local	$push135=, $0=, $pop136
-	i32.const	$push134=, 4094
-	i32.le_u	$push56=, $pop135, $pop134
-	br_if   	0, $pop56       # 0: up to label17
-# BB#18:                                # %for.end65
+	i32.const	$push128=, 1
+	i32.add 	$0=, $0, $pop128
+	i32.const	$push127=, 4
+	i32.add 	$1=, $1, $pop127
+	i32.const	$push126=, 4095
+	i32.le_u	$push57=, $0, $pop126
+	br_if   	0, $pop57       # 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    	                # label18:
-	i32.const	$push141=, c
-	i32.add 	$push60=, $1, $pop141
-	i32.load	$push61=, 0($pop60)
-	i32.const	$push140=, a
-	i32.add 	$push57=, $1, $pop140
-	i32.load	$push58=, 0($pop57)
-	i32.const	$push139=, 18
-	i32.div_s	$push59=, $pop58, $pop139
-	i32.ne  	$push62=, $pop61, $pop59
-	br_if   	1, $pop62       # 1: down to label13
-# BB#20:                                # %lor.lhs.false73
+	i32.const	$push131=, c
+	i32.add 	$push61=, $1, $pop131
+	i32.load	$push62=, 0($pop61)
+	i32.const	$push130=, a
+	i32.add 	$push58=, $1, $pop130
+	i32.load	$push59=, 0($pop58)
+	i32.const	$push129=, 18
+	i32.div_s	$push60=, $pop59, $pop129
+	i32.ne  	$push63=, $pop62, $pop60
+	br_if   	1, $pop63       # 1: down to label13
+# %bb.20:                               # %lor.lhs.false73
                                         #   in Loop: Header=BB12_19 Depth=1
-	i32.const	$push144=, d
-	i32.add 	$push66=, $1, $pop144
-	i32.load	$push67=, 0($pop66)
-	i32.const	$push143=, b
-	i32.add 	$push63=, $1, $pop143
-	i32.load	$push64=, 0($pop63)
-	i32.const	$push142=, 18
-	i32.div_u	$push65=, $pop64, $pop142
-	i32.ne  	$push68=, $pop67, $pop65
-	br_if   	1, $pop68       # 1: down to label13
-# BB#21:                                # %for.cond66
+	i32.const	$push134=, d
+	i32.add 	$push67=, $1, $pop134
+	i32.load	$push68=, 0($pop67)
+	i32.const	$push133=, b
+	i32.add 	$push64=, $1, $pop133
+	i32.load	$push65=, 0($pop64)
+	i32.const	$push132=, 18
+	i32.div_u	$push66=, $pop65, $pop132
+	i32.ne  	$push69=, $pop68, $pop66
+	br_if   	1, $pop69       # 1: down to label13
+# %bb.21:                               # %for.cond66
                                         #   in Loop: Header=BB12_19 Depth=1
-	i32.const	$push149=, 4
-	i32.add 	$1=, $1, $pop149
-	i32.const	$push148=, 1
-	i32.add 	$push147=, $0, $pop148
-	tee_local	$push146=, $0=, $pop147
-	i32.const	$push145=, 4094
-	i32.le_u	$push69=, $pop146, $pop145
-	br_if   	0, $pop69       # 0: up to label18
-# BB#22:                                # %for.end82
+	i32.const	$push137=, 1
+	i32.add 	$0=, $0, $pop137
+	i32.const	$push136=, 4
+	i32.add 	$1=, $1, $pop136
+	i32.const	$push135=, 4095
+	i32.le_u	$push70=, $0, $pop135
+	br_if   	0, $pop70       # 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    	                # label19:
-	i32.const	$push152=, c
-	i32.add 	$push73=, $1, $pop152
-	i32.load	$push74=, 0($pop73)
-	i32.const	$push151=, a
-	i32.add 	$push70=, $1, $pop151
-	i32.load	$push71=, 0($pop70)
-	i32.const	$push150=, 19
-	i32.div_s	$push72=, $pop71, $pop150
-	i32.ne  	$push75=, $pop74, $pop72
-	br_if   	1, $pop75       # 1: down to label13
-# BB#24:                                # %lor.lhs.false90
+	i32.const	$push140=, c
+	i32.add 	$push74=, $1, $pop140
+	i32.load	$push75=, 0($pop74)
+	i32.const	$push139=, a
+	i32.add 	$push71=, $1, $pop139
+	i32.load	$push72=, 0($pop71)
+	i32.const	$push138=, 19
+	i32.div_s	$push73=, $pop72, $pop138
+	i32.ne  	$push76=, $pop75, $pop73
+	br_if   	1, $pop76       # 1: down to label13
+# %bb.24:                               # %lor.lhs.false90
                                         #   in Loop: Header=BB12_23 Depth=1
-	i32.const	$push155=, d
-	i32.add 	$push79=, $1, $pop155
-	i32.load	$push80=, 0($pop79)
-	i32.const	$push154=, b
-	i32.add 	$push76=, $1, $pop154
-	i32.load	$push77=, 0($pop76)
-	i32.const	$push153=, 19
-	i32.div_u	$push78=, $pop77, $pop153
-	i32.ne  	$push81=, $pop80, $pop78
-	br_if   	1, $pop81       # 1: down to label13
-# BB#25:                                # %for.cond83
+	i32.const	$push143=, d
+	i32.add 	$push80=, $1, $pop143
+	i32.load	$push81=, 0($pop80)
+	i32.const	$push142=, b
+	i32.add 	$push77=, $1, $pop142
+	i32.load	$push78=, 0($pop77)
+	i32.const	$push141=, 19
+	i32.div_u	$push79=, $pop78, $pop141
+	i32.ne  	$push82=, $pop81, $pop79
+	br_if   	1, $pop82       # 1: down to label13
+# %bb.25:                               # %for.cond83
                                         #   in Loop: Header=BB12_23 Depth=1
-	i32.const	$push160=, 4
-	i32.add 	$1=, $1, $pop160
-	i32.const	$push159=, 1
-	i32.add 	$push158=, $0, $pop159
-	tee_local	$push157=, $0=, $pop158
-	i32.const	$push156=, 4094
-	i32.le_u	$push82=, $pop157, $pop156
-	br_if   	0, $pop82       # 0: up to label19
-# BB#26:                                # %for.end99
+	i32.const	$push146=, 1
+	i32.add 	$0=, $0, $pop146
+	i32.const	$push145=, 4
+	i32.add 	$1=, $1, $pop145
+	i32.const	$push144=, 4095
+	i32.le_u	$push83=, $0, $pop144
+	br_if   	0, $pop83       # 0: up to label19
+# %bb.26:                               # %for.end99
 	end_loop
-	i32.const	$push83=, 0
-	return  	$pop83
+	i32.const	$push84=, 0
+	return  	$pop84
 .LBB12_27:                              # %if.then
 	end_block                       # label13:
 	call    	abort@FUNCTION
@@ -734,5 +710,5 @@ d:
 	.size	d, 16384
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51581-2.c.s b/test/torture-s/pr51581-2.c.s
index af293be3f..79b65b3f4 100644
--- a/test/torture-s/pr51581-2.c.s
+++ b/test/torture-s/pr51581-2.c.s
@@ -6,24 +6,23 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push9=, c+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, a+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, c+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, a+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 3
-	i32.rem_s	$push3=, $pop2, $pop7
+	i32.const	$push5=, 3
+	i32.rem_s	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label0
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -36,24 +35,23 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push9=, d+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, b+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, d+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, b+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 3
-	i32.rem_u	$push3=, $pop2, $pop7
+	i32.const	$push5=, 3
+	i32.rem_u	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label1
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label1
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -66,24 +64,23 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push9=, c+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, a+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, c+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, a+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 18
-	i32.rem_s	$push3=, $pop2, $pop7
+	i32.const	$push5=, 18
+	i32.rem_s	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label2
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label2
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -96,24 +93,23 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB3_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push9=, d+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, b+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, d+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, b+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 18
-	i32.rem_u	$push3=, $pop2, $pop7
+	i32.const	$push5=, 18
+	i32.rem_u	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label3
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label3
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -126,24 +122,23 @@ f4:                                     # @f4
 	.type	f5,@function
 f5:                                     # @f5
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB4_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label4:
-	i32.const	$push9=, c+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, a+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, c+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, a+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 19
-	i32.rem_s	$push3=, $pop2, $pop7
+	i32.const	$push5=, 19
+	i32.rem_s	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label4
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label4
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -156,24 +151,23 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -16384
 .LBB5_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
-	i32.const	$push9=, d+16384
-	i32.add 	$push0=, $0, $pop9
-	i32.const	$push8=, b+16384
-	i32.add 	$push1=, $0, $pop8
+	i32.const	$push7=, d+16384
+	i32.add 	$push0=, $0, $pop7
+	i32.const	$push6=, b+16384
+	i32.add 	$push1=, $0, $pop6
 	i32.load	$push2=, 0($pop1)
-	i32.const	$push7=, 19
-	i32.rem_u	$push3=, $pop2, $pop7
+	i32.const	$push5=, 19
+	i32.rem_u	$push3=, $pop2, $pop5
 	i32.store	0($pop0), $pop3
-	i32.const	$push6=, 4
-	i32.add 	$push5=, $0, $pop6
-	tee_local	$push4=, $0=, $pop5
-	br_if   	0, $pop4        # 0: up to label5
-# BB#2:                                 # %for.end
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
+	br_if   	0, $0           # 0: up to label5
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -186,35 +180,33 @@ f6:                                     # @f6
 	.type	f7,@function
 f7:                                     # @f7
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB6_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.const	$push20=, c+16384
-	i32.add 	$push9=, $1, $pop20
-	i32.const	$push19=, a+16384
-	i32.add 	$push0=, $1, $pop19
-	i32.load	$push18=, 0($pop0)
-	tee_local	$push17=, $0=, $pop18
-	i64.extend_s/i32	$push2=, $pop17
-	i64.const	$push16=, 1431655766
-	i64.mul 	$push3=, $pop2, $pop16
-	i64.const	$push15=, 32
-	i64.shr_u	$push4=, $pop3, $pop15
+	i32.const	$push16=, a+16384
+	i32.add 	$push0=, $1, $pop16
+	i32.load	$0=, 0($pop0)
+	i32.const	$push15=, c+16384
+	i32.add 	$push9=, $1, $pop15
+	i64.extend_s/i32	$push2=, $0
+	i64.const	$push14=, 1431655766
+	i64.mul 	$push3=, $pop2, $pop14
+	i64.const	$push13=, 32
+	i64.shr_u	$push4=, $pop3, $pop13
 	i32.wrap/i64	$push5=, $pop4
-	i32.const	$push14=, 31
-	i32.shr_s	$push1=, $0, $pop14
+	i32.const	$push12=, 31
+	i32.shr_s	$push1=, $0, $pop12
 	i32.sub 	$push6=, $pop5, $pop1
-	i32.const	$push13=, -3
-	i32.mul 	$push7=, $pop6, $pop13
+	i32.const	$push11=, -3
+	i32.mul 	$push7=, $pop6, $pop11
 	i32.add 	$push8=, $pop7, $0
 	i32.store	0($pop9), $pop8
-	i32.const	$push12=, 4
-	i32.add 	$push11=, $1, $pop12
-	tee_local	$push10=, $1=, $pop11
-	br_if   	0, $pop10       # 0: up to label6
-# BB#2:                                 # %for.end
+	i32.const	$push10=, 4
+	i32.add 	$1=, $1, $pop10
+	br_if   	0, $1           # 0: up to label6
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -227,32 +219,30 @@ f7:                                     # @f7
 	.type	f8,@function
 f8:                                     # @f8
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB7_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.const	$push17=, d+16384
-	i32.add 	$push7=, $1, $pop17
-	i32.const	$push16=, b+16384
-	i32.add 	$push0=, $1, $pop16
-	i32.load	$push15=, 0($pop0)
-	tee_local	$push14=, $0=, $pop15
-	i64.extend_u/i32	$push1=, $pop14
-	i64.const	$push13=, 2863311531
-	i64.mul 	$push2=, $pop1, $pop13
-	i64.const	$push12=, 33
-	i64.shr_u	$push3=, $pop2, $pop12
+	i32.const	$push13=, b+16384
+	i32.add 	$push0=, $1, $pop13
+	i32.load	$0=, 0($pop0)
+	i32.const	$push12=, d+16384
+	i32.add 	$push7=, $1, $pop12
+	i64.extend_u/i32	$push1=, $0
+	i64.const	$push11=, 2863311531
+	i64.mul 	$push2=, $pop1, $pop11
+	i64.const	$push10=, 33
+	i64.shr_u	$push3=, $pop2, $pop10
 	i32.wrap/i64	$push4=, $pop3
-	i32.const	$push11=, -3
-	i32.mul 	$push5=, $pop4, $pop11
+	i32.const	$push9=, -3
+	i32.mul 	$push5=, $pop4, $pop9
 	i32.add 	$push6=, $pop5, $0
 	i32.store	0($pop7), $pop6
-	i32.const	$push10=, 4
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
-	br_if   	0, $pop8        # 0: up to label7
-# BB#2:                                 # %for.end
+	i32.const	$push8=, 4
+	i32.add 	$1=, $1, $pop8
+	br_if   	0, $1           # 0: up to label7
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -265,35 +255,33 @@ f8:                                     # @f8
 	.type	f9,@function
 f9:                                     # @f9
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB8_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
-	i32.const	$push20=, c+16384
-	i32.add 	$push9=, $1, $pop20
-	i32.const	$push19=, a+16384
-	i32.add 	$push0=, $1, $pop19
-	i32.load	$push18=, 0($pop0)
-	tee_local	$push17=, $0=, $pop18
-	i64.extend_s/i32	$push2=, $pop17
-	i64.const	$push16=, 954437177
-	i64.mul 	$push3=, $pop2, $pop16
-	i64.const	$push15=, 34
-	i64.shr_s	$push4=, $pop3, $pop15
+	i32.const	$push16=, a+16384
+	i32.add 	$push0=, $1, $pop16
+	i32.load	$0=, 0($pop0)
+	i32.const	$push15=, c+16384
+	i32.add 	$push9=, $1, $pop15
+	i64.extend_s/i32	$push2=, $0
+	i64.const	$push14=, 954437177
+	i64.mul 	$push3=, $pop2, $pop14
+	i64.const	$push13=, 34
+	i64.shr_s	$push4=, $pop3, $pop13
 	i32.wrap/i64	$push5=, $pop4
-	i32.const	$push14=, 31
-	i32.shr_s	$push1=, $0, $pop14
+	i32.const	$push12=, 31
+	i32.shr_s	$push1=, $0, $pop12
 	i32.sub 	$push6=, $pop5, $pop1
-	i32.const	$push13=, -18
-	i32.mul 	$push7=, $pop6, $pop13
+	i32.const	$push11=, -18
+	i32.mul 	$push7=, $pop6, $pop11
 	i32.add 	$push8=, $pop7, $0
 	i32.store	0($pop9), $pop8
-	i32.const	$push12=, 4
-	i32.add 	$push11=, $1, $pop12
-	tee_local	$push10=, $1=, $pop11
-	br_if   	0, $pop10       # 0: up to label8
-# BB#2:                                 # %for.end
+	i32.const	$push10=, 4
+	i32.add 	$1=, $1, $pop10
+	br_if   	0, $1           # 0: up to label8
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -306,32 +294,30 @@ f9:                                     # @f9
 	.type	f10,@function
 f10:                                    # @f10
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB9_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.const	$push17=, d+16384
-	i32.add 	$push7=, $1, $pop17
-	i32.const	$push16=, b+16384
-	i32.add 	$push0=, $1, $pop16
-	i32.load	$push15=, 0($pop0)
-	tee_local	$push14=, $0=, $pop15
-	i64.extend_u/i32	$push1=, $pop14
-	i64.const	$push13=, 954437177
-	i64.mul 	$push2=, $pop1, $pop13
-	i64.const	$push12=, 34
-	i64.shr_u	$push3=, $pop2, $pop12
+	i32.const	$push13=, b+16384
+	i32.add 	$push0=, $1, $pop13
+	i32.load	$0=, 0($pop0)
+	i32.const	$push12=, d+16384
+	i32.add 	$push7=, $1, $pop12
+	i64.extend_u/i32	$push1=, $0
+	i64.const	$push11=, 954437177
+	i64.mul 	$push2=, $pop1, $pop11
+	i64.const	$push10=, 34
+	i64.shr_u	$push3=, $pop2, $pop10
 	i32.wrap/i64	$push4=, $pop3
-	i32.const	$push11=, -18
-	i32.mul 	$push5=, $pop4, $pop11
+	i32.const	$push9=, -18
+	i32.mul 	$push5=, $pop4, $pop9
 	i32.add 	$push6=, $pop5, $0
 	i32.store	0($pop7), $pop6
-	i32.const	$push10=, 4
-	i32.add 	$push9=, $1, $pop10
-	tee_local	$push8=, $1=, $pop9
-	br_if   	0, $pop8        # 0: up to label9
-# BB#2:                                 # %for.end
+	i32.const	$push8=, 4
+	i32.add 	$1=, $1, $pop8
+	br_if   	0, $1           # 0: up to label9
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -344,35 +330,33 @@ f10:                                    # @f10
 	.type	f11,@function
 f11:                                    # @f11
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -16384
 .LBB10_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label10:
-	i32.const	$push20=, c+16384
-	i32.add 	$push9=, $1, $pop20
-	i32.const	$push19=, a+16384
-	i32.add 	$push0=, $1, $pop19
-	i32.load	$push18=, 0($pop0)
-	tee_local	$push17=, $0=, $pop18
-	i64.extend_s/i32	$push2=, $pop17
-	i64.const	$push16=, 1808407283
-	i64.mul 	$push3=, $pop2, $pop16
-	i64.const	$push15=, 35
-	i64.shr_s	$push4=, $pop3, $pop15
+	i32.const	$push16=, a+16384
+	i32.add 	$push0=, $1, $pop16
+	i32.load	$0=, 0($pop0)
+	i32.const	$push15=, c+16384
+	i32.add 	$push9=, $1, $pop15
+	i64.extend_s/i32	$push2=, $0
+	i64.const	$push14=, 1808407283
+	i64.mul 	$push3=, $pop2, $pop14
+	i64.const	$push13=, 35
+	i64.shr_s	$push4=, $pop3, $pop13
 	i32.wrap/i64	$push5=, $pop4
-	i32.const	$push14=, 31
-	i32.shr_s	$push1=, $0, $pop14
+	i32.const	$push12=, 31
+	i32.shr_s	$push1=, $0, $pop12
 	i32.sub 	$push6=, $pop5, $pop1
-	i32.const	$push13=, -19
-	i32.mul 	$push7=, $pop6, $pop13
+	i32.const	$push11=, -19
+	i32.mul 	$push7=, $pop6, $pop11
 	i32.add 	$push8=, $pop7, $0
 	i32.store	0($pop9), $pop8
-	i32.const	$push12=, 4
-	i32.add 	$push11=, $1, $pop12
-	tee_local	$push10=, $1=, $pop11
-	br_if   	0, $pop10       # 0: up to label10
-# BB#2:                                 # %for.end
+	i32.const	$push10=, 4
+	i32.add 	$1=, $1, $pop10
+	br_if   	0, $1           # 0: up to label10
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -385,39 +369,36 @@ f11:                                    # @f11
 	.type	f12,@function
 f12:                                    # @f12
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, -16384
 .LBB11_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label11:
-	i32.const	$push24=, d+16384
-	i32.add 	$push10=, $2, $pop24
-	i32.const	$push23=, b+16384
-	i32.add 	$push0=, $2, $pop23
-	i32.load	$push22=, 0($pop0)
-	tee_local	$push21=, $0=, $pop22
+	i32.const	$push18=, b+16384
+	i32.add 	$push0=, $2, $pop18
+	i32.load	$0=, 0($pop0)
 	i64.extend_u/i32	$push1=, $0
-	i64.const	$push20=, 2938661835
-	i64.mul 	$push2=, $pop1, $pop20
-	i64.const	$push19=, 32
-	i64.shr_u	$push3=, $pop2, $pop19
-	i32.wrap/i64	$push18=, $pop3
-	tee_local	$push17=, $1=, $pop18
-	i32.sub 	$push4=, $pop21, $pop17
-	i32.const	$push16=, 1
-	i32.shr_u	$push5=, $pop4, $pop16
+	i64.const	$push17=, 2938661835
+	i64.mul 	$push2=, $pop1, $pop17
+	i64.const	$push16=, 32
+	i64.shr_u	$push3=, $pop2, $pop16
+	i32.wrap/i64	$1=, $pop3
+	i32.const	$push15=, d+16384
+	i32.add 	$push10=, $2, $pop15
+	i32.sub 	$push4=, $0, $1
+	i32.const	$push14=, 1
+	i32.shr_u	$push5=, $pop4, $pop14
 	i32.add 	$push6=, $pop5, $1
-	i32.const	$push15=, 4
-	i32.shr_u	$push7=, $pop6, $pop15
-	i32.const	$push14=, -19
-	i32.mul 	$push8=, $pop7, $pop14
+	i32.const	$push13=, 4
+	i32.shr_u	$push7=, $pop6, $pop13
+	i32.const	$push12=, -19
+	i32.mul 	$push8=, $pop7, $pop12
 	i32.add 	$push9=, $pop8, $0
 	i32.store	0($pop10), $pop9
-	i32.const	$push13=, 4
-	i32.add 	$push12=, $2, $pop13
-	tee_local	$push11=, $2=, $pop12
-	br_if   	0, $pop11       # 0: up to label11
-# BB#2:                                 # %for.end
+	i32.const	$push11=, 4
+	i32.add 	$2=, $2, $pop11
+	br_if   	0, $2           # 0: up to label11
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -431,288 +412,281 @@ f12:                                    # @f12
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$1=, 0
-	i32.const	$0=, -16384
+# %bb.0:                                # %entry
+	i32.const	$0=, 0
+	i32.const	$1=, -16384
 .LBB12_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
 	#APP
 	#NO_APP
-	i32.const	$push90=, b+16384
-	i32.add 	$push0=, $0, $pop90
-	i32.store	0($pop0), $1
-	i32.const	$push89=, a+16384
-	i32.add 	$push2=, $0, $pop89
-	i32.const	$push88=, -2048
-	i32.add 	$push1=, $1, $pop88
+	i32.const	$push89=, b+16384
+	i32.add 	$push0=, $1, $pop89
+	i32.store	0($pop0), $0
+	i32.const	$push88=, a+16384
+	i32.add 	$push2=, $1, $pop88
+	i32.const	$push87=, -2048
+	i32.add 	$push1=, $0, $pop87
 	i32.store	0($pop2), $pop1
-	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
+	i32.add 	$1=, $1, $pop86
+	i32.const	$push85=, 1
+	i32.add 	$0=, $0, $pop85
+	br_if   	0, $1           # 0: up to label12
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$1=, 0
-	i32.const	$push94=, 0
+	i32.const	$push92=, 0
 	i32.const	$push3=, 2147483647
-	i32.store	a+16380($pop94), $pop3
-	i32.const	$push93=, 0
+	i32.store	a+16380($pop92), $pop3
+	i32.const	$push91=, 0
 	i64.const	$push4=, -9223372030412324864
-	i64.store	a($pop93), $pop4
-	i32.const	$0=, -1
-	i32.const	$push92=, 0
-	i32.const	$push91=, -1
-	i32.store	b+16380($pop92), $pop91
+	i64.store	a($pop91), $pop4
+	i32.const	$push90=, 0
+	i32.const	$push5=, -1
+	i32.store	b+16380($pop90), $pop5
 	call    	f1@FUNCTION
 	call    	f2@FUNCTION
+	i32.const	$0=, 0
 .LBB12_3:                               # %for.body4
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label14:
-	i32.const	$push97=, c
-	i32.add 	$push8=, $1, $pop97
-	i32.load	$push9=, 0($pop8)
-	i32.const	$push96=, a
-	i32.add 	$push5=, $1, $pop96
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push95=, 3
-	i32.rem_s	$push7=, $pop6, $pop95
-	i32.ne  	$push10=, $pop9, $pop7
-	br_if   	1, $pop10       # 1: down to label13
-# BB#4:                                 # %lor.lhs.false
+	i32.const	$push95=, c
+	i32.add 	$push9=, $1, $pop95
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push94=, a
+	i32.add 	$push6=, $1, $pop94
+	i32.load	$push7=, 0($pop6)
+	i32.const	$push93=, 3
+	i32.rem_s	$push8=, $pop7, $pop93
+	i32.ne  	$push11=, $pop10, $pop8
+	br_if   	1, $pop11       # 1: down to label13
+# %bb.4:                                # %lor.lhs.false
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push100=, d
-	i32.add 	$push14=, $1, $pop100
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push99=, b
-	i32.add 	$push11=, $1, $pop99
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push98=, 3
-	i32.rem_u	$push13=, $pop12, $pop98
-	i32.ne  	$push16=, $pop15, $pop13
-	br_if   	1, $pop16       # 1: down to label13
-# BB#5:                                 # %for.cond2
+	i32.const	$push98=, d
+	i32.add 	$push15=, $1, $pop98
+	i32.load	$push16=, 0($pop15)
+	i32.const	$push97=, b
+	i32.add 	$push12=, $1, $pop97
+	i32.load	$push13=, 0($pop12)
+	i32.const	$push96=, 3
+	i32.rem_u	$push14=, $pop13, $pop96
+	i32.ne  	$push17=, $pop16, $pop14
+	br_if   	1, $pop17       # 1: down to label13
+# %bb.5:                                # %for.cond2
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push105=, 4
-	i32.add 	$1=, $1, $pop105
-	i32.const	$push104=, 1
-	i32.add 	$push103=, $0, $pop104
-	tee_local	$push102=, $0=, $pop103
-	i32.const	$push101=, 4094
-	i32.le_u	$push17=, $pop102, $pop101
-	br_if   	0, $pop17       # 0: up to label14
-# BB#6:                                 # %for.end14
+	i32.const	$push101=, 1
+	i32.add 	$0=, $0, $pop101
+	i32.const	$push100=, 4
+	i32.add 	$1=, $1, $pop100
+	i32.const	$push99=, 4095
+	i32.le_u	$push18=, $0, $pop99
+	br_if   	0, $pop18       # 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    	                # label15:
-	i32.const	$push108=, c
-	i32.add 	$push21=, $1, $pop108
-	i32.load	$push22=, 0($pop21)
-	i32.const	$push107=, a
-	i32.add 	$push18=, $1, $pop107
-	i32.load	$push19=, 0($pop18)
-	i32.const	$push106=, 18
-	i32.rem_s	$push20=, $pop19, $pop106
-	i32.ne  	$push23=, $pop22, $pop20
-	br_if   	1, $pop23       # 1: down to label13
-# BB#8:                                 # %lor.lhs.false22
+	i32.const	$push104=, c
+	i32.add 	$push22=, $1, $pop104
+	i32.load	$push23=, 0($pop22)
+	i32.const	$push103=, a
+	i32.add 	$push19=, $1, $pop103
+	i32.load	$push20=, 0($pop19)
+	i32.const	$push102=, 18
+	i32.rem_s	$push21=, $pop20, $pop102
+	i32.ne  	$push24=, $pop23, $pop21
+	br_if   	1, $pop24       # 1: down to label13
+# %bb.8:                                # %lor.lhs.false22
                                         #   in Loop: Header=BB12_7 Depth=1
-	i32.const	$push111=, d
-	i32.add 	$push27=, $1, $pop111
-	i32.load	$push28=, 0($pop27)
-	i32.const	$push110=, b
-	i32.add 	$push24=, $1, $pop110
-	i32.load	$push25=, 0($pop24)
-	i32.const	$push109=, 18
-	i32.rem_u	$push26=, $pop25, $pop109
-	i32.ne  	$push29=, $pop28, $pop26
-	br_if   	1, $pop29       # 1: down to label13
-# BB#9:                                 # %for.cond15
+	i32.const	$push107=, d
+	i32.add 	$push28=, $1, $pop107
+	i32.load	$push29=, 0($pop28)
+	i32.const	$push106=, b
+	i32.add 	$push25=, $1, $pop106
+	i32.load	$push26=, 0($pop25)
+	i32.const	$push105=, 18
+	i32.rem_u	$push27=, $pop26, $pop105
+	i32.ne  	$push30=, $pop29, $pop27
+	br_if   	1, $pop30       # 1: down to label13
+# %bb.9:                                # %for.cond15
                                         #   in Loop: Header=BB12_7 Depth=1
-	i32.const	$push116=, 4
-	i32.add 	$1=, $1, $pop116
-	i32.const	$push115=, 1
-	i32.add 	$push114=, $0, $pop115
-	tee_local	$push113=, $0=, $pop114
-	i32.const	$push112=, 4094
-	i32.le_u	$push30=, $pop113, $pop112
-	br_if   	0, $pop30       # 0: up to label15
-# BB#10:                                # %for.end31
+	i32.const	$push110=, 1
+	i32.add 	$0=, $0, $pop110
+	i32.const	$push109=, 4
+	i32.add 	$1=, $1, $pop109
+	i32.const	$push108=, 4095
+	i32.le_u	$push31=, $0, $pop108
+	br_if   	0, $pop31       # 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    	                # label16:
-	i32.const	$push119=, c
-	i32.add 	$push34=, $1, $pop119
-	i32.load	$push35=, 0($pop34)
-	i32.const	$push118=, a
-	i32.add 	$push31=, $1, $pop118
-	i32.load	$push32=, 0($pop31)
-	i32.const	$push117=, 19
-	i32.rem_s	$push33=, $pop32, $pop117
-	i32.ne  	$push36=, $pop35, $pop33
-	br_if   	1, $pop36       # 1: down to label13
-# BB#12:                                # %lor.lhs.false39
+	i32.const	$push113=, c
+	i32.add 	$push35=, $1, $pop113
+	i32.load	$push36=, 0($pop35)
+	i32.const	$push112=, a
+	i32.add 	$push32=, $1, $pop112
+	i32.load	$push33=, 0($pop32)
+	i32.const	$push111=, 19
+	i32.rem_s	$push34=, $pop33, $pop111
+	i32.ne  	$push37=, $pop36, $pop34
+	br_if   	1, $pop37       # 1: down to label13
+# %bb.12:                               # %lor.lhs.false39
                                         #   in Loop: Header=BB12_11 Depth=1
-	i32.const	$push122=, d
-	i32.add 	$push40=, $1, $pop122
-	i32.load	$push41=, 0($pop40)
-	i32.const	$push121=, b
-	i32.add 	$push37=, $1, $pop121
-	i32.load	$push38=, 0($pop37)
-	i32.const	$push120=, 19
-	i32.rem_u	$push39=, $pop38, $pop120
-	i32.ne  	$push42=, $pop41, $pop39
-	br_if   	1, $pop42       # 1: down to label13
-# BB#13:                                # %for.cond32
+	i32.const	$push116=, d
+	i32.add 	$push41=, $1, $pop116
+	i32.load	$push42=, 0($pop41)
+	i32.const	$push115=, b
+	i32.add 	$push38=, $1, $pop115
+	i32.load	$push39=, 0($pop38)
+	i32.const	$push114=, 19
+	i32.rem_u	$push40=, $pop39, $pop114
+	i32.ne  	$push43=, $pop42, $pop40
+	br_if   	1, $pop43       # 1: down to label13
+# %bb.13:                               # %for.cond32
                                         #   in Loop: Header=BB12_11 Depth=1
-	i32.const	$push127=, 4
-	i32.add 	$1=, $1, $pop127
-	i32.const	$push126=, 1
-	i32.add 	$push125=, $0, $pop126
-	tee_local	$push124=, $0=, $pop125
-	i32.const	$push123=, 4094
-	i32.le_u	$push43=, $pop124, $pop123
-	br_if   	0, $pop43       # 0: up to label16
-# BB#14:                                # %for.end48
+	i32.const	$push119=, 1
+	i32.add 	$0=, $0, $pop119
+	i32.const	$push118=, 4
+	i32.add 	$1=, $1, $pop118
+	i32.const	$push117=, 4095
+	i32.le_u	$push44=, $0, $pop117
+	br_if   	0, $pop44       # 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    	                # label17:
-	i32.const	$push130=, c
-	i32.add 	$push47=, $1, $pop130
-	i32.load	$push48=, 0($pop47)
-	i32.const	$push129=, a
-	i32.add 	$push44=, $1, $pop129
-	i32.load	$push45=, 0($pop44)
-	i32.const	$push128=, 3
-	i32.rem_s	$push46=, $pop45, $pop128
-	i32.ne  	$push49=, $pop48, $pop46
-	br_if   	1, $pop49       # 1: down to label13
-# BB#16:                                # %lor.lhs.false56
+	i32.const	$push122=, c
+	i32.add 	$push48=, $1, $pop122
+	i32.load	$push49=, 0($pop48)
+	i32.const	$push121=, a
+	i32.add 	$push45=, $1, $pop121
+	i32.load	$push46=, 0($pop45)
+	i32.const	$push120=, 3
+	i32.rem_s	$push47=, $pop46, $pop120
+	i32.ne  	$push50=, $pop49, $pop47
+	br_if   	1, $pop50       # 1: down to label13
+# %bb.16:                               # %lor.lhs.false56
                                         #   in Loop: Header=BB12_15 Depth=1
-	i32.const	$push133=, d
-	i32.add 	$push53=, $1, $pop133
-	i32.load	$push54=, 0($pop53)
-	i32.const	$push132=, b
-	i32.add 	$push50=, $1, $pop132
-	i32.load	$push51=, 0($pop50)
-	i32.const	$push131=, 3
-	i32.rem_u	$push52=, $pop51, $pop131
-	i32.ne  	$push55=, $pop54, $pop52
-	br_if   	1, $pop55       # 1: down to label13
-# BB#17:                                # %for.cond49
+	i32.const	$push125=, d
+	i32.add 	$push54=, $1, $pop125
+	i32.load	$push55=, 0($pop54)
+	i32.const	$push124=, b
+	i32.add 	$push51=, $1, $pop124
+	i32.load	$push52=, 0($pop51)
+	i32.const	$push123=, 3
+	i32.rem_u	$push53=, $pop52, $pop123
+	i32.ne  	$push56=, $pop55, $pop53
+	br_if   	1, $pop56       # 1: down to label13
+# %bb.17:                               # %for.cond49
                                         #   in Loop: Header=BB12_15 Depth=1
-	i32.const	$push138=, 4
-	i32.add 	$1=, $1, $pop138
-	i32.const	$push137=, 1
-	i32.add 	$push136=, $0, $pop137
-	tee_local	$push135=, $0=, $pop136
-	i32.const	$push134=, 4094
-	i32.le_u	$push56=, $pop135, $pop134
-	br_if   	0, $pop56       # 0: up to label17
-# BB#18:                                # %for.end65
+	i32.const	$push128=, 1
+	i32.add 	$0=, $0, $pop128
+	i32.const	$push127=, 4
+	i32.add 	$1=, $1, $pop127
+	i32.const	$push126=, 4095
+	i32.le_u	$push57=, $0, $pop126
+	br_if   	0, $pop57       # 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    	                # label18:
-	i32.const	$push141=, c
-	i32.add 	$push60=, $1, $pop141
-	i32.load	$push61=, 0($pop60)
-	i32.const	$push140=, a
-	i32.add 	$push57=, $1, $pop140
-	i32.load	$push58=, 0($pop57)
-	i32.const	$push139=, 18
-	i32.rem_s	$push59=, $pop58, $pop139
-	i32.ne  	$push62=, $pop61, $pop59
-	br_if   	1, $pop62       # 1: down to label13
-# BB#20:                                # %lor.lhs.false73
+	i32.const	$push131=, c
+	i32.add 	$push61=, $1, $pop131
+	i32.load	$push62=, 0($pop61)
+	i32.const	$push130=, a
+	i32.add 	$push58=, $1, $pop130
+	i32.load	$push59=, 0($pop58)
+	i32.const	$push129=, 18
+	i32.rem_s	$push60=, $pop59, $pop129
+	i32.ne  	$push63=, $pop62, $pop60
+	br_if   	1, $pop63       # 1: down to label13
+# %bb.20:                               # %lor.lhs.false73
                                         #   in Loop: Header=BB12_19 Depth=1
-	i32.const	$push144=, d
-	i32.add 	$push66=, $1, $pop144
-	i32.load	$push67=, 0($pop66)
-	i32.const	$push143=, b
-	i32.add 	$push63=, $1, $pop143
-	i32.load	$push64=, 0($pop63)
-	i32.const	$push142=, 18
-	i32.rem_u	$push65=, $pop64, $pop142
-	i32.ne  	$push68=, $pop67, $pop65
-	br_if   	1, $pop68       # 1: down to label13
-# BB#21:                                # %for.cond66
+	i32.const	$push134=, d
+	i32.add 	$push67=, $1, $pop134
+	i32.load	$push68=, 0($pop67)
+	i32.const	$push133=, b
+	i32.add 	$push64=, $1, $pop133
+	i32.load	$push65=, 0($pop64)
+	i32.const	$push132=, 18
+	i32.rem_u	$push66=, $pop65, $pop132
+	i32.ne  	$push69=, $pop68, $pop66
+	br_if   	1, $pop69       # 1: down to label13
+# %bb.21:                               # %for.cond66
                                         #   in Loop: Header=BB12_19 Depth=1
-	i32.const	$push149=, 4
-	i32.add 	$1=, $1, $pop149
-	i32.const	$push148=, 1
-	i32.add 	$push147=, $0, $pop148
-	tee_local	$push146=, $0=, $pop147
-	i32.const	$push145=, 4094
-	i32.le_u	$push69=, $pop146, $pop145
-	br_if   	0, $pop69       # 0: up to label18
-# BB#22:                                # %for.end82
+	i32.const	$push137=, 1
+	i32.add 	$0=, $0, $pop137
+	i32.const	$push136=, 4
+	i32.add 	$1=, $1, $pop136
+	i32.const	$push135=, 4095
+	i32.le_u	$push70=, $0, $pop135
+	br_if   	0, $pop70       # 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    	                # label19:
-	i32.const	$push152=, c
-	i32.add 	$push73=, $1, $pop152
-	i32.load	$push74=, 0($pop73)
-	i32.const	$push151=, a
-	i32.add 	$push70=, $1, $pop151
-	i32.load	$push71=, 0($pop70)
-	i32.const	$push150=, 19
-	i32.rem_s	$push72=, $pop71, $pop150
-	i32.ne  	$push75=, $pop74, $pop72
-	br_if   	1, $pop75       # 1: down to label13
-# BB#24:                                # %lor.lhs.false90
+	i32.const	$push140=, c
+	i32.add 	$push74=, $1, $pop140
+	i32.load	$push75=, 0($pop74)
+	i32.const	$push139=, a
+	i32.add 	$push71=, $1, $pop139
+	i32.load	$push72=, 0($pop71)
+	i32.const	$push138=, 19
+	i32.rem_s	$push73=, $pop72, $pop138
+	i32.ne  	$push76=, $pop75, $pop73
+	br_if   	1, $pop76       # 1: down to label13
+# %bb.24:                               # %lor.lhs.false90
                                         #   in Loop: Header=BB12_23 Depth=1
-	i32.const	$push155=, d
-	i32.add 	$push79=, $1, $pop155
-	i32.load	$push80=, 0($pop79)
-	i32.const	$push154=, b
-	i32.add 	$push76=, $1, $pop154
-	i32.load	$push77=, 0($pop76)
-	i32.const	$push153=, 19
-	i32.rem_u	$push78=, $pop77, $pop153
-	i32.ne  	$push81=, $pop80, $pop78
-	br_if   	1, $pop81       # 1: down to label13
-# BB#25:                                # %for.cond83
+	i32.const	$push143=, d
+	i32.add 	$push80=, $1, $pop143
+	i32.load	$push81=, 0($pop80)
+	i32.const	$push142=, b
+	i32.add 	$push77=, $1, $pop142
+	i32.load	$push78=, 0($pop77)
+	i32.const	$push141=, 19
+	i32.rem_u	$push79=, $pop78, $pop141
+	i32.ne  	$push82=, $pop81, $pop79
+	br_if   	1, $pop82       # 1: down to label13
+# %bb.25:                               # %for.cond83
                                         #   in Loop: Header=BB12_23 Depth=1
-	i32.const	$push160=, 4
-	i32.add 	$1=, $1, $pop160
-	i32.const	$push159=, 1
-	i32.add 	$push158=, $0, $pop159
-	tee_local	$push157=, $0=, $pop158
-	i32.const	$push156=, 4094
-	i32.le_u	$push82=, $pop157, $pop156
-	br_if   	0, $pop82       # 0: up to label19
-# BB#26:                                # %for.end99
+	i32.const	$push146=, 1
+	i32.add 	$0=, $0, $pop146
+	i32.const	$push145=, 4
+	i32.add 	$1=, $1, $pop145
+	i32.const	$push144=, 4095
+	i32.le_u	$push83=, $0, $pop144
+	br_if   	0, $pop83       # 0: up to label19
+# %bb.26:                               # %for.end99
 	end_loop
-	i32.const	$push83=, 0
-	return  	$pop83
+	i32.const	$push84=, 0
+	return  	$pop84
 .LBB12_27:                              # %if.then
 	end_block                       # label13:
 	call    	abort@FUNCTION
@@ -758,5 +732,5 @@ d:
 	.size	d, 16384
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51877.c.s b/test/torture-s/pr51877.c.s
index 7a19293f8..1a83354d5 100644
--- a/test/torture-s/pr51877.c.s
+++ b/test/torture-s/pr51877.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.store8	4($0), $1
 	i32.const	$push0=, 28
 	i32.add 	$push1=, $0, $pop0
@@ -14,22 +14,21 @@ bar:                                    # @bar
 	i64.store	0($pop1):p2align=0, $pop2
 	i32.const	$push3=, 21
 	i32.add 	$push4=, $0, $pop3
-	i64.const	$push17=, 0
-	i64.store	0($pop4):p2align=0, $pop17
+	i64.const	$push15=, 0
+	i64.store	0($pop4):p2align=0, $pop15
 	i32.const	$push5=, 13
 	i32.add 	$push6=, $0, $pop5
-	i64.const	$push16=, 0
-	i64.store	0($pop6):p2align=0, $pop16
+	i64.const	$push14=, 0
+	i64.store	0($pop6):p2align=0, $pop14
 	i32.const	$push7=, 5
 	i32.add 	$push8=, $0, $pop7
-	i64.const	$push15=, 0
-	i64.store	0($pop8):p2align=0, $pop15
+	i64.const	$push13=, 0
+	i64.store	0($pop8):p2align=0, $pop13
 	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.add 	$1=, $pop10, $pop11
+	i32.store	0($0), $1
 	i32.const	$push12=, 0
 	i32.store	bar.n($pop12), $1
                                         # fallthrough-return
@@ -42,7 +41,7 @@ bar:                                    # @bar
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -57,20 +56,19 @@ baz:                                    # @baz
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push38=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$2=, $pop35, $pop37
+	i32.const	$push38=, 0
+	i32.store	__stack_pointer($pop38), $2
 	block   	
 	block   	
 	i32.const	$push0=, 6
 	i32.ne  	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push42=, 40
 	i32.add 	$push43=, $2, $pop42
 	i32.const	$push20=, 7
@@ -80,24 +78,24 @@ foo:                                    # @foo
 	i32.add 	$push22=, $2, $pop21
 	i32.load	$push23=, 0($pop22)
 	i32.store	a+32($pop24), $pop23
-	i32.const	$push49=, 0
+	i32.const	$push47=, 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
+	i64.store	a+24($pop47):p2align=2, $pop27
+	i32.const	$push46=, 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
+	i64.store	a+16($pop46):p2align=2, $pop30
+	i32.const	$push45=, 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.store	a+8($pop45):p2align=2, $pop33
+	i32.const	$push44=, 0
 	i64.load	$push34=, 40($2)
-	i64.store	a($pop46):p2align=2, $pop34
+	i64.store	a($pop44):p2align=2, $pop34
 	br      	1               # 1: down to label0
 .LBB2_2:                                # %if.else
 	end_block                       # label1:
@@ -105,26 +103,26 @@ foo:                                    # @foo
 	call    	bar@FUNCTION, $2, $pop2
 	i32.const	$push3=, 32
 	i32.add 	$push4=, $0, $pop3
-	i32.const	$push53=, 32
-	i32.add 	$push5=, $2, $pop53
+	i32.const	$push51=, 32
+	i32.add 	$push5=, $2, $pop51
 	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
+	i32.const	$push50=, 24
+	i32.add 	$push9=, $2, $pop50
 	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
+	i32.const	$push49=, 16
+	i32.add 	$push13=, $2, $pop49
 	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
+	i32.const	$push48=, 8
+	i32.add 	$push17=, $2, $pop48
 	i64.load	$push18=, 0($pop17)
 	i64.store	0($pop16):p2align=2, $pop18
 	i64.load	$push19=, 0($2)
@@ -148,14 +146,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push69=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop66, $pop68
+	i32.const	$push69=, 0
+	i32.store	__stack_pointer($pop69), $0
 	i32.const	$push73=, 40
 	i32.add 	$push74=, $0, $pop73
 	i32.const	$push98=, 3
@@ -222,85 +219,85 @@ main:                                   # @main
 	i32.const	$push24=, 1
 	i32.ne  	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label2
-# BB#1:                                 # %lor.lhs.false
-	i32.const	$push102=, 0
-	i32.load8_u	$push28=, a+4($pop102)
-	i32.const	$push101=, 3
-	i32.ne  	$push29=, $pop28, $pop101
+# %bb.1:                                # %lor.lhs.false
+	i32.const	$push100=, 0
+	i32.load8_u	$push28=, a+4($pop100)
+	i32.const	$push99=, 3
+	i32.ne  	$push29=, $pop28, $pop99
 	br_if   	0, $pop29       # 0: down to label2
-# BB#2:                                 # %lor.lhs.false
-	i32.const	$push103=, 0
-	i32.load	$push26=, b($pop103)
+# %bb.2:                                # %lor.lhs.false
+	i32.const	$push101=, 0
+	i32.load	$push26=, b($pop101)
 	i32.const	$push30=, 2
 	i32.ne  	$push31=, $pop26, $pop30
 	br_if   	0, $pop31       # 0: down to label2
-# BB#3:                                 # %lor.lhs.false
-	i32.const	$push104=, 0
-	i32.load8_u	$push27=, b+4($pop104)
+# %bb.3:                                # %lor.lhs.false
+	i32.const	$push102=, 0
+	i32.load8_u	$push27=, b+4($pop102)
 	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
+# %bb.4:                                # %if.end
 	i32.const	$push36=, b
-	i32.const	$push106=, 0
-	call    	foo@FUNCTION, $pop36, $pop106
-	i32.const	$push105=, 0
-	i32.load	$push37=, a($pop105)
+	i32.const	$push104=, 0
+	call    	foo@FUNCTION, $pop36, $pop104
+	i32.const	$push103=, 0
+	i32.load	$push37=, a($pop103)
 	i32.const	$push38=, 1
 	i32.ne  	$push39=, $pop37, $pop38
 	br_if   	0, $pop39       # 0: down to label2
-# BB#5:                                 # %lor.lhs.false13
+# %bb.5:                                # %lor.lhs.false13
+	i32.const	$push106=, 0
+	i32.load8_u	$push42=, a+4($pop106)
+	i32.const	$push105=, 3
+	i32.ne  	$push43=, $pop42, $pop105
+	br_if   	0, $pop43       # 0: down to label2
+# %bb.6:                                # %lor.lhs.false13
 	i32.const	$push108=, 0
-	i32.load8_u	$push42=, a+4($pop108)
+	i32.load	$push40=, b($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	$push110=, 0
-	i32.load	$push40=, b($pop110)
-	i32.const	$push109=, 3
-	i32.ne  	$push44=, $pop40, $pop109
+	i32.ne  	$push44=, $pop40, $pop107
 	br_if   	0, $pop44       # 0: down to label2
-# BB#7:                                 # %lor.lhs.false13
-	i32.const	$push111=, 0
-	i32.load8_u	$push41=, b+4($pop111)
+# %bb.7:                                # %lor.lhs.false13
+	i32.const	$push109=, 0
+	i32.load8_u	$push41=, b+4($pop109)
 	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
+# %bb.8:                                # %if.end25
 	i32.const	$push50=, b
 	i32.const	$push49=, 6
 	call    	foo@FUNCTION, $pop50, $pop49
-	i32.const	$push112=, 0
-	i32.load	$push51=, a($pop112)
+	i32.const	$push110=, 0
+	i32.load	$push51=, a($pop110)
 	i32.const	$push52=, 4
 	i32.ne  	$push53=, $pop51, $pop52
 	br_if   	0, $pop53       # 0: down to label2
-# BB#9:                                 # %lor.lhs.false28
-	i32.const	$push113=, 0
-	i32.load8_u	$push56=, a+4($pop113)
+# %bb.9:                                # %lor.lhs.false28
+	i32.const	$push111=, 0
+	i32.load8_u	$push56=, a+4($pop111)
 	i32.const	$push57=, 7
 	i32.ne  	$push58=, $pop56, $pop57
 	br_if   	0, $pop58       # 0: down to label2
-# BB#10:                                # %lor.lhs.false28
-	i32.const	$push114=, 0
-	i32.load	$push54=, b($pop114)
+# %bb.10:                               # %lor.lhs.false28
+	i32.const	$push112=, 0
+	i32.load	$push54=, b($pop112)
 	i32.const	$push59=, 3
 	i32.ne  	$push60=, $pop54, $pop59
 	br_if   	0, $pop60       # 0: down to label2
-# BB#11:                                # %lor.lhs.false28
-	i32.const	$push115=, 0
-	i32.load8_u	$push55=, b+4($pop115)
+# %bb.11:                               # %lor.lhs.false28
+	i32.const	$push113=, 0
+	i32.load8_u	$push55=, b+4($pop113)
 	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
+# %bb.12:                               # %if.end40
 	i32.const	$push72=, 0
 	i32.const	$push70=, 80
 	i32.add 	$push71=, $0, $pop70
@@ -341,5 +338,5 @@ b:
 	.size	b, 36
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr51933.c.s b/test/torture-s/pr51933.c.s
index 62c6d8c5f..f75c2ec64 100644
--- a/test/torture-s/pr51933.c.s
+++ b/test/torture-s/pr51933.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -21,12 +21,12 @@ bar:                                    # @bar
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load8_u	$push1=, v1($pop0)
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	foo@FUNCTION
 .LBB1_2:                                # %if.end
 	end_block                       # label0:
@@ -34,41 +34,39 @@ bar:                                    # @bar
 	i32.const	$push11=, 1
 	i32.lt_s	$push2=, $0, $pop11
 	br_if   	0, $pop2        # 0: down to label1
-# BB#3:                                 # %for.body.preheader
+# %bb.3:                                # %for.body.preheader
 	copy_local	$4=, $0
 	copy_local	$5=, $2
 .LBB1_4:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.load16_u	$push22=, 0($1)
-	tee_local	$push21=, $3=, $pop22
-	i32.const	$push20=, v2
-	i32.add 	$push4=, $pop21, $pop20
-	i32.const	$push19=, 255
-	i32.and 	$push5=, $3, $pop19
-	i32.const	$push18=, v3
-	i32.add 	$push6=, $pop5, $pop18
-	i32.const	$push17=, 256
-	i32.lt_u	$push3=, $3, $pop17
+	i32.load16_u	$3=, 0($1)
+	i32.const	$push18=, v2
+	i32.add 	$push4=, $3, $pop18
+	i32.const	$push17=, 255
+	i32.and 	$push5=, $3, $pop17
+	i32.const	$push16=, v3
+	i32.add 	$push6=, $pop5, $pop16
+	i32.const	$push15=, 256
+	i32.lt_u	$push3=, $3, $pop15
 	i32.select	$push7=, $pop4, $pop6, $pop3
 	i32.load8_u	$push8=, 0($pop7)
 	i32.store8	0($5), $pop8
-	i32.const	$push16=, 1
-	i32.add 	$5=, $5, $pop16
-	i32.const	$push15=, 2
-	i32.add 	$1=, $1, $pop15
 	i32.const	$push14=, -1
-	i32.add 	$push13=, $4, $pop14
-	tee_local	$push12=, $4=, $pop13
-	br_if   	0, $pop12       # 0: up to label2
+	i32.add 	$4=, $4, $pop14
+	i32.const	$push13=, 1
+	i32.add 	$5=, $5, $pop13
+	i32.const	$push12=, 2
+	i32.add 	$1=, $1, $pop12
+	br_if   	0, $4           # 0: up to label2
 .LBB1_5:                                # %for.end
 	end_loop
 	end_block                       # label1:
 	i32.add 	$push9=, $2, $0
 	i32.const	$push10=, 0
 	i32.store8	0($pop9), $pop10
-	copy_local	$push23=, $0
-                                        # fallthrough-return: $pop23
+	copy_local	$push19=, $0
+                                        # fallthrough-return: $pop19
 	.endfunc
 .Lfunc_end1:
 	.size	bar, .Lfunc_end1-bar
@@ -80,32 +78,30 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
+# %bb.0:                                # %entry
 	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.sub 	$2=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $2
 	i32.const	$1=, 0
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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.const	$push27=, 1
+	i32.add 	$0=, $1, $pop27
+	i32.const	$push26=, v3
+	i32.add 	$push0=, $1, $pop26
+	i32.store8	0($pop0), $0
+	i32.const	$push25=, v2
+	i32.add 	$push1=, $1, $pop25
 	i32.store8	0($pop1), $1
 	copy_local	$1=, $0
-	i32.const	$push26=, 256
-	i32.ne  	$push2=, $0, $pop26
+	i32.const	$push24=, 256
+	i32.ne  	$push2=, $0, $pop24
 	br_if   	0, $pop2        # 0: up to label3
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i64.const	$push3=, 28147922879250529
 	i64.store	0($2), $pop3
@@ -129,7 +125,7 @@ main:                                   # @main
 	i32.const	$push9=, 18
 	i32.call	$push11=, memcmp@FUNCTION, $pop23, $pop10, $pop9
 	br_if   	0, $pop11       # 0: down to label4
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push19=, 0
 	i32.const	$push17=, 80
 	i32.add 	$push18=, $2, $pop17
@@ -171,6 +167,6 @@ v3:
 	.size	.L.str, 18
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8496969e3..dfa819432 100644
--- a/test/torture-s/pr52129.c.s
+++ b/test/torture-s/pr52129.c.s
@@ -7,30 +7,30 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, t+2
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push2=, 0($1)
 	i32.const	$push3=, t+69
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false2
+# %bb.2:                                # %lor.lhs.false2
 	i32.const	$push6=, t+81
 	i32.ne  	$push7=, $3, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false2
+# %bb.3:                                # %lor.lhs.false2
 	i32.const	$push8=, t+17
 	i32.ne  	$push9=, $2, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#4:                                 # %lor.lhs.false2
+# %bb.4:                                # %lor.lhs.false2
 	i32.load	$push5=, 4($1)
 	i32.const	$push10=, 27
 	i32.ne  	$push11=, $pop5, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#5:                                 # %if.end
+# %bb.5:                                # %if.end
 	i32.const	$push12=, 29
 	return  	$pop12
 .LBB0_6:                                # %if.then
@@ -49,23 +49,21 @@ bar:                                    # @bar
 	.param  	i32, i32, i32, i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $6=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
+	i32.sub 	$6=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $6
 	i64.load	$push0=, 0($3):p2align=2
 	i64.store	8($6), $pop0
+	i32.add 	$5=, $5, $4
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $6, $pop11
-	i32.add 	$push14=, $5, $4
-	tee_local	$push13=, $5=, $pop14
 	i32.const	$push1=, 64
 	i32.add 	$push2=, $5, $pop1
-	i32.call	$drop=, foo@FUNCTION, $0, $pop12, $pop13, $pop2
+	i32.call	$drop=, foo@FUNCTION, $0, $pop12, $5, $pop2
 	i32.const	$push10=, 0
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $6, $pop8
@@ -83,14 +81,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push16=, $pop5, $pop7
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop8), $pop15
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i32.const	$push0=, 0
 	i64.load	$push1=, .Lmain.s($pop0):p2align=2
 	i64.store	8($0), $pop1
@@ -127,5 +124,5 @@ t:
 	.size	.Lmain.s, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52209.c.s b/test/torture-s/pr52209.c.s
index 13c374a35..6a104fd3b 100644
--- a/test/torture-s/pr52209.c.s
+++ b/test/torture-s/pr52209.c.s
@@ -7,23 +7,26 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push11=, 0
+	i32.load8_u	$0=, c($pop11)
+	i32.const	$push10=, 0
 	i32.const	$push9=, 0
-	i32.const	$push8=, 0
-	i32.const	$push7=, 0
-	i32.load8_u	$push0=, c($pop7)
-	i32.const	$push1=, 1
-	i32.and 	$push6=, $pop0, $pop1
-	tee_local	$push5=, $0=, $pop6
-	i32.sub 	$push2=, $pop8, $pop5
+	i32.const	$push0=, 1
+	i32.and 	$push1=, $0, $pop0
+	i32.sub 	$push2=, $pop9, $pop1
 	i32.const	$push3=, -1
 	i32.xor 	$push4=, $pop2, $pop3
-	i32.store	b($pop9), $pop4
+	i32.store	b($pop10), $pop4
 	block   	
-	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push10=, 0
-	return  	$pop10
+	i32.const	$push5=, 7
+	i32.shl 	$push6=, $0, $pop5
+	i32.const	$push7=, 128
+	i32.and 	$push8=, $pop6, $pop7
+	br_if   	0, $pop8        # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push12=, 0
+	return  	$pop12
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -51,5 +54,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52286.c.s b/test/torture-s/pr52286.c.s
index ce9a705c1..c31189c5b 100644
--- a/test/torture-s/pr52286.c.s
+++ b/test/torture-s/pr52286.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 	#APP
 	#NO_APP
@@ -15,7 +15,7 @@ main:                                   # @main
 	i32.const	$push0=, -1
 	i32.le_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, 0
 	return  	$pop2
 .LBB0_2:                                # %if.then
@@ -27,5 +27,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52760.c.s b/test/torture-s/pr52760.c.s
index a37797521..e63a6d2d7 100644
--- a/test/torture-s/pr52760.c.s
+++ b/test/torture-s/pr52760.c.s
@@ -6,79 +6,71 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# %bb.0:                                # %entry
 	block   	
 	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.preheader
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.load16_u	$push58=, 0($1)
-	tee_local	$push57=, $2=, $pop58
-	i32.const	$push56=, 24
-	i32.shl 	$push2=, $pop57, $pop56
-	i32.const	$push55=, 8
-	i32.shl 	$push3=, $2, $pop55
-	i32.const	$push54=, 16711680
-	i32.and 	$push4=, $pop3, $pop54
+	i32.load16_u	$2=, 0($1)
+	i32.const	$push42=, 24
+	i32.shl 	$push2=, $2, $pop42
+	i32.const	$push41=, 8
+	i32.shl 	$push3=, $2, $pop41
+	i32.const	$push40=, 16711680
+	i32.and 	$push4=, $pop3, $pop40
 	i32.or  	$push5=, $pop2, $pop4
-	i32.const	$push53=, 16
-	i32.shr_u	$push6=, $pop5, $pop53
+	i32.const	$push39=, 16
+	i32.shr_u	$push6=, $pop5, $pop39
 	i32.store16	0($1), $pop6
-	i32.const	$push52=, 2
-	i32.add 	$push51=, $1, $pop52
-	tee_local	$push50=, $2=, $pop51
-	i32.load16_u	$push49=, 0($2)
-	tee_local	$push48=, $2=, $pop49
-	i32.const	$push47=, 24
-	i32.shl 	$push7=, $pop48, $pop47
-	i32.const	$push46=, 8
-	i32.shl 	$push8=, $2, $pop46
-	i32.const	$push45=, 16711680
-	i32.and 	$push9=, $pop8, $pop45
+	i32.const	$push38=, 2
+	i32.add 	$2=, $1, $pop38
+	i32.load16_u	$3=, 0($2)
+	i32.const	$push37=, 24
+	i32.shl 	$push7=, $3, $pop37
+	i32.const	$push36=, 8
+	i32.shl 	$push8=, $3, $pop36
+	i32.const	$push35=, 16711680
+	i32.and 	$push9=, $pop8, $pop35
 	i32.or  	$push10=, $pop7, $pop9
-	i32.const	$push44=, 16
-	i32.shr_u	$push11=, $pop10, $pop44
-	i32.store16	0($pop50), $pop11
-	i32.const	$push43=, 4
-	i32.add 	$push42=, $1, $pop43
-	tee_local	$push41=, $2=, $pop42
-	i32.load16_u	$push40=, 0($2)
-	tee_local	$push39=, $2=, $pop40
-	i32.const	$push38=, 24
-	i32.shl 	$push12=, $pop39, $pop38
-	i32.const	$push37=, 8
-	i32.shl 	$push13=, $2, $pop37
-	i32.const	$push36=, 16711680
-	i32.and 	$push14=, $pop13, $pop36
+	i32.const	$push34=, 16
+	i32.shr_u	$push11=, $pop10, $pop34
+	i32.store16	0($2), $pop11
+	i32.const	$push33=, 4
+	i32.add 	$2=, $1, $pop33
+	i32.load16_u	$3=, 0($2)
+	i32.const	$push32=, 24
+	i32.shl 	$push12=, $3, $pop32
+	i32.const	$push31=, 8
+	i32.shl 	$push13=, $3, $pop31
+	i32.const	$push30=, 16711680
+	i32.and 	$push14=, $pop13, $pop30
 	i32.or  	$push15=, $pop12, $pop14
-	i32.const	$push35=, 16
-	i32.shr_u	$push16=, $pop15, $pop35
-	i32.store16	0($pop41), $pop16
-	i32.const	$push34=, 6
-	i32.add 	$push33=, $1, $pop34
-	tee_local	$push32=, $2=, $pop33
-	i32.load16_u	$push31=, 0($2)
-	tee_local	$push30=, $2=, $pop31
-	i32.const	$push29=, 24
-	i32.shl 	$push17=, $pop30, $pop29
-	i32.const	$push28=, 8
-	i32.shl 	$push18=, $2, $pop28
-	i32.const	$push27=, 16711680
-	i32.and 	$push19=, $pop18, $pop27
+	i32.const	$push29=, 16
+	i32.shr_u	$push16=, $pop15, $pop29
+	i32.store16	0($2), $pop16
+	i32.const	$push28=, 6
+	i32.add 	$2=, $1, $pop28
+	i32.load16_u	$3=, 0($2)
+	i32.const	$push27=, 24
+	i32.shl 	$push17=, $3, $pop27
+	i32.const	$push26=, 8
+	i32.shl 	$push18=, $3, $pop26
+	i32.const	$push25=, 16711680
+	i32.and 	$push19=, $pop18, $pop25
 	i32.or  	$push20=, $pop17, $pop19
-	i32.const	$push26=, 16
-	i32.shr_u	$push21=, $pop20, $pop26
-	i32.store16	0($pop32), $pop21
-	i32.const	$push25=, 8
-	i32.add 	$1=, $1, $pop25
-	i32.const	$push24=, -1
-	i32.add 	$push23=, $0, $pop24
-	tee_local	$push22=, $0=, $pop23
-	br_if   	0, $pop22       # 0: up to label1
+	i32.const	$push24=, 16
+	i32.shr_u	$push21=, $pop20, $pop24
+	i32.store16	0($2), $pop21
+	i32.const	$push23=, 8
+	i32.add 	$1=, $1, $pop23
+	i32.const	$push22=, -1
+	i32.add 	$0=, $0, $pop22
+	br_if   	0, $0           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
@@ -94,14 +86,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push25=, $pop15, $pop17
-	tee_local	$push24=, $0=, $pop25
-	i32.store	__stack_pointer($pop18), $pop24
+	i32.sub 	$0=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $0
 	i64.const	$push0=, 434320308619640833
 	i64.store	8($0), $pop0
 	i32.const	$push1=, 1
@@ -113,22 +104,22 @@ main:                                   # @main
 	i32.const	$push2=, 256
 	i32.ne  	$push4=, $pop3, $pop2
 	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load16_u	$push6=, 10($0)
 	i32.const	$push5=, 770
 	i32.ne  	$push7=, $pop6, $pop5
 	br_if   	0, $pop7        # 0: down to label2
-# BB#2:                                 # %lor.lhs.false5
+# %bb.2:                                # %lor.lhs.false5
 	i32.load16_u	$push9=, 12($0)
 	i32.const	$push8=, 1284
 	i32.ne  	$push10=, $pop9, $pop8
 	br_if   	0, $pop10       # 0: down to label2
-# BB#3:                                 # %lor.lhs.false9
+# %bb.3:                                # %lor.lhs.false9
 	i32.load16_u	$push12=, 14($0)
 	i32.const	$push11=, 1798
 	i32.ne  	$push13=, $pop12, $pop11
 	br_if   	0, $pop13       # 0: down to label2
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push21=, 0
 	i32.const	$push19=, 16
 	i32.add 	$push20=, $0, $pop19
@@ -144,5 +135,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52979-1.c.s b/test/torture-s/pr52979-1.c.s
index 55b5b5bee..24be5302d 100644
--- a/test/torture-s/pr52979-1.c.s
+++ b/test/torture-s/pr52979-1.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -17,22 +17,20 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
-	i32.const	$push26=, 0
-	i64.load32_u	$push3=, a($pop26)
-	i32.const	$push25=, 0
-	i64.load8_u	$push0=, a+4($pop25)
+# %bb.0:                                # %entry
+	i32.const	$push23=, 0
+	i64.load32_u	$push3=, a($pop23)
+	i32.const	$push22=, 0
+	i64.load8_u	$push0=, a+4($pop22)
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
-	i64.or  	$push24=, $pop3, $pop2
-	tee_local	$push23=, $0=, $pop24
+	i64.or  	$0=, $pop3, $pop2
 	i64.const	$push4=, 964220157951
-	i64.and 	$push22=, $pop23, $pop4
-	tee_local	$push21=, $1=, $pop22
+	i64.and 	$1=, $0, $pop4
+	i32.const	$push21=, 0
 	i64.const	$push20=, 32
-	i64.shr_u	$push5=, $pop21, $pop20
-	i64.store8	a+4($pop27), $pop5
+	i64.shr_u	$push5=, $1, $pop20
+	i64.store8	a+4($pop21), $pop5
 	i32.const	$push19=, 0
 	i64.const	$push6=, 2147483648
 	i64.or  	$push7=, $1, $pop6
@@ -49,15 +47,15 @@ bar:                                    # @bar
 	block   	
 	i32.const	$push12=, 0
 	i32.load	$push8=, d($pop12)
-	i32.eqz 	$push30=, $pop8
-	br_if   	0, $pop30       # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push29=, 0
+	i32.eqz 	$push26=, $pop8
+	br_if   	0, $pop26       # 0: down to label0
+# %bb.1:                                # %if.then
+	i32.const	$push25=, 0
 	i64.const	$push9=, 33
 	i64.shl 	$push10=, $0, $pop9
-	i64.const	$push28=, 33
-	i64.shr_s	$push11=, $pop10, $pop28
-	i64.store32	c($pop29), $pop11
+	i64.const	$push24=, 33
+	i64.shr_s	$push11=, $pop10, $pop24
+	i64.store32	c($pop25), $pop11
 .LBB1_2:                                # %if.end
 	end_block                       # label0:
                                         # fallthrough-return
@@ -71,22 +69,20 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i64.load32_u	$push3=, a($pop28)
-	i32.const	$push27=, 0
-	i64.load8_u	$push0=, a+4($pop27)
+# %bb.0:                                # %entry
+	i32.const	$push25=, 0
+	i64.load32_u	$push3=, a($pop25)
+	i32.const	$push24=, 0
+	i64.load8_u	$push0=, a+4($pop24)
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
-	i64.or  	$push26=, $pop3, $pop2
-	tee_local	$push25=, $0=, $pop26
+	i64.or  	$0=, $pop3, $pop2
 	i64.const	$push4=, 964220157951
-	i64.and 	$push24=, $pop25, $pop4
-	tee_local	$push23=, $1=, $pop24
+	i64.and 	$1=, $0, $pop4
+	i32.const	$push23=, 0
 	i64.const	$push22=, 32
-	i64.shr_u	$push5=, $pop23, $pop22
-	i64.store8	a+4($pop29), $pop5
+	i64.shr_u	$push5=, $1, $pop22
+	i64.store8	a+4($pop23), $pop5
 	i32.const	$push21=, 0
 	i64.const	$push6=, 2147483648
 	i64.or  	$push7=, $1, $pop6
@@ -103,25 +99,25 @@ baz:                                    # @baz
 	block   	
 	i32.const	$push14=, 0
 	i32.load	$push8=, d($pop14)
-	i32.eqz 	$push36=, $pop8
-	br_if   	0, $pop36       # 0: down to label1
-# BB#1:                                 # %if.then.i
-	i32.const	$push31=, 0
+	i32.eqz 	$push32=, $pop8
+	br_if   	0, $pop32       # 0: down to label1
+# %bb.1:                                # %if.then.i
+	i32.const	$push27=, 0
 	i64.const	$push9=, 33
 	i64.shl 	$push10=, $0, $pop9
-	i64.const	$push30=, 33
-	i64.shr_s	$push11=, $pop10, $pop30
-	i64.store32	c($pop31), $pop11
+	i64.const	$push26=, 33
+	i64.shr_s	$push11=, $pop10, $pop26
+	i64.store32	c($pop27), $pop11
 .LBB2_2:                                # %bar.exit
 	end_block                       # label1:
-	i32.const	$push35=, 0
-	i32.const	$push34=, 0
-	i32.load8_u	$push12=, b+4($pop34)
-	i32.store8	a+4($pop35), $pop12
-	i32.const	$push33=, 0
-	i32.const	$push32=, 0
-	i32.load	$push13=, b($pop32):p2align=0
-	i32.store	a($pop33), $pop13
+	i32.const	$push31=, 0
+	i32.const	$push30=, 0
+	i32.load8_u	$push12=, b+4($pop30)
+	i32.store8	a+4($pop31), $pop12
+	i32.const	$push29=, 0
+	i32.const	$push28=, 0
+	i32.load	$push13=, b($pop28):p2align=0
+	i32.store	a($pop29), $pop13
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -134,22 +130,20 @@ baz:                                    # @baz
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push35=, 0
-	i32.const	$push34=, 0
-	i64.load32_u	$push3=, a($pop34)
-	i32.const	$push33=, 0
-	i64.load8_u	$push0=, a+4($pop33)
+# %bb.0:                                # %entry
+	i32.const	$push31=, 0
+	i64.load32_u	$push3=, a($pop31)
+	i32.const	$push30=, 0
+	i64.load8_u	$push0=, a+4($pop30)
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
-	i64.or  	$push32=, $pop3, $pop2
-	tee_local	$push31=, $0=, $pop32
+	i64.or  	$0=, $pop3, $pop2
 	i64.const	$push4=, 964220157951
-	i64.and 	$push30=, $pop31, $pop4
-	tee_local	$push29=, $1=, $pop30
+	i64.and 	$1=, $0, $pop4
+	i32.const	$push29=, 0
 	i64.const	$push28=, 32
-	i64.shr_u	$push5=, $pop29, $pop28
-	i64.store8	a+4($pop35), $pop5
+	i64.shr_u	$push5=, $1, $pop28
+	i64.store8	a+4($pop29), $pop5
 	i32.const	$push27=, 0
 	i64.const	$push6=, 2147483648
 	i64.or  	$push7=, $1, $pop6
@@ -166,35 +160,35 @@ main:                                   # @main
 	block   	
 	i32.const	$push20=, 0
 	i32.load	$push8=, d($pop20)
-	i32.eqz 	$push44=, $pop8
-	br_if   	0, $pop44       # 0: down to label2
-# BB#1:                                 # %if.then.i.i
-	i32.const	$push37=, 0
+	i32.eqz 	$push40=, $pop8
+	br_if   	0, $pop40       # 0: down to label2
+# %bb.1:                                # %if.then.i.i
+	i32.const	$push33=, 0
 	i64.const	$push9=, 33
 	i64.shl 	$push10=, $0, $pop9
-	i64.const	$push36=, 33
-	i64.shr_s	$push11=, $pop10, $pop36
-	i64.store32	c($pop37), $pop11
+	i64.const	$push32=, 33
+	i64.shr_s	$push11=, $pop10, $pop32
+	i64.store32	c($pop33), $pop11
 .LBB3_2:                                # %baz.exit
 	end_block                       # label2:
-	i32.const	$push43=, 0
-	i32.const	$push42=, 0
-	i32.load8_u	$push12=, b+4($pop42)
-	i32.store8	a+4($pop43), $pop12
-	i32.const	$push41=, 0
-	i32.const	$push40=, 0
-	i32.load	$push13=, b($pop40):p2align=0
-	i32.store	a($pop41), $pop13
-	block   	
 	i32.const	$push39=, 0
-	i64.load32_u	$push14=, a($pop39)
+	i32.const	$push38=, 0
+	i32.load8_u	$push12=, b+4($pop38)
+	i32.store8	a+4($pop39), $pop12
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, b($pop36):p2align=0
+	i32.store	a($pop37), $pop13
+	block   	
+	i32.const	$push35=, 0
+	i64.load32_u	$push14=, a($pop35)
 	i64.const	$push15=, 33
 	i64.shl 	$push16=, $pop14, $pop15
-	i64.const	$push38=, 33
-	i64.shr_s	$push17=, $pop16, $pop38
+	i64.const	$push34=, 33
+	i64.shr_s	$push17=, $pop16, $pop34
 	i32.wrap/i64	$push18=, $pop17
 	br_if   	0, $pop18       # 0: down to label3
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push19=, 0
 	return  	$pop19
 .LBB3_4:                                # %if.then
@@ -256,5 +250,5 @@ b:
 	.size	b, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr52979-2.c.s b/test/torture-s/pr52979-2.c.s
index 76635a470..0c09982c8 100644
--- a/test/torture-s/pr52979-2.c.s
+++ b/test/torture-s/pr52979-2.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -17,22 +17,20 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
-	i32.const	$push26=, 0
-	i64.load32_u	$push3=, a($pop26)
-	i32.const	$push25=, 0
-	i64.load8_u	$push0=, a+4($pop25)
+# %bb.0:                                # %entry
+	i32.const	$push23=, 0
+	i64.load32_u	$push3=, a($pop23)
+	i32.const	$push22=, 0
+	i64.load8_u	$push0=, a+4($pop22)
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
-	i64.or  	$push24=, $pop3, $pop2
-	tee_local	$push23=, $0=, $pop24
+	i64.or  	$0=, $pop3, $pop2
 	i64.const	$push4=, 964220157951
-	i64.and 	$push22=, $pop23, $pop4
-	tee_local	$push21=, $1=, $pop22
+	i64.and 	$1=, $0, $pop4
+	i32.const	$push21=, 0
 	i64.const	$push20=, 32
-	i64.shr_u	$push5=, $pop21, $pop20
-	i64.store8	a+4($pop27), $pop5
+	i64.shr_u	$push5=, $1, $pop20
+	i64.store8	a+4($pop21), $pop5
 	i32.const	$push19=, 0
 	i64.const	$push6=, 2147483648
 	i64.or  	$push7=, $1, $pop6
@@ -49,15 +47,15 @@ bar:                                    # @bar
 	block   	
 	i32.const	$push12=, 0
 	i32.load	$push8=, d($pop12)
-	i32.eqz 	$push30=, $pop8
-	br_if   	0, $pop30       # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push29=, 0
+	i32.eqz 	$push26=, $pop8
+	br_if   	0, $pop26       # 0: down to label0
+# %bb.1:                                # %if.then
+	i32.const	$push25=, 0
 	i64.const	$push9=, 33
 	i64.shl 	$push10=, $0, $pop9
-	i64.const	$push28=, 33
-	i64.shr_s	$push11=, $pop10, $pop28
-	i64.store32	c($pop29), $pop11
+	i64.const	$push24=, 33
+	i64.shr_s	$push11=, $pop10, $pop24
+	i64.store32	c($pop25), $pop11
 .LBB1_2:                                # %if.end
 	end_block                       # label0:
                                         # fallthrough-return
@@ -71,22 +69,20 @@ bar:                                    # @bar
 	.type	baz,@function
 baz:                                    # @baz
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i64.load32_u	$push3=, a($pop28)
-	i32.const	$push27=, 0
-	i64.load8_u	$push0=, a+4($pop27)
+# %bb.0:                                # %entry
+	i32.const	$push25=, 0
+	i64.load32_u	$push3=, a($pop25)
+	i32.const	$push24=, 0
+	i64.load8_u	$push0=, a+4($pop24)
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
-	i64.or  	$push26=, $pop3, $pop2
-	tee_local	$push25=, $0=, $pop26
+	i64.or  	$0=, $pop3, $pop2
 	i64.const	$push4=, 964220157951
-	i64.and 	$push24=, $pop25, $pop4
-	tee_local	$push23=, $1=, $pop24
+	i64.and 	$1=, $0, $pop4
+	i32.const	$push23=, 0
 	i64.const	$push22=, 32
-	i64.shr_u	$push5=, $pop23, $pop22
-	i64.store8	a+4($pop29), $pop5
+	i64.shr_u	$push5=, $1, $pop22
+	i64.store8	a+4($pop23), $pop5
 	i32.const	$push21=, 0
 	i64.const	$push6=, 2147483648
 	i64.or  	$push7=, $1, $pop6
@@ -103,25 +99,25 @@ baz:                                    # @baz
 	block   	
 	i32.const	$push14=, 0
 	i32.load	$push8=, d($pop14)
-	i32.eqz 	$push36=, $pop8
-	br_if   	0, $pop36       # 0: down to label1
-# BB#1:                                 # %if.then.i
-	i32.const	$push31=, 0
+	i32.eqz 	$push32=, $pop8
+	br_if   	0, $pop32       # 0: down to label1
+# %bb.1:                                # %if.then.i
+	i32.const	$push27=, 0
 	i64.const	$push9=, 33
 	i64.shl 	$push10=, $0, $pop9
-	i64.const	$push30=, 33
-	i64.shr_s	$push11=, $pop10, $pop30
-	i64.store32	c($pop31), $pop11
+	i64.const	$push26=, 33
+	i64.shr_s	$push11=, $pop10, $pop26
+	i64.store32	c($pop27), $pop11
 .LBB2_2:                                # %bar.exit
 	end_block                       # label1:
-	i32.const	$push35=, 0
-	i32.const	$push34=, 0
-	i32.load8_u	$push12=, b+4($pop34)
-	i32.store8	a+4($pop35), $pop12
-	i32.const	$push33=, 0
-	i32.const	$push32=, 0
-	i32.load	$push13=, b($pop32):p2align=0
-	i32.store	a($pop33), $pop13
+	i32.const	$push31=, 0
+	i32.const	$push30=, 0
+	i32.load8_u	$push12=, b+4($pop30)
+	i32.store8	a+4($pop31), $pop12
+	i32.const	$push29=, 0
+	i32.const	$push28=, 0
+	i32.load	$push13=, b($pop28):p2align=0
+	i32.store	a($pop29), $pop13
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -134,22 +130,20 @@ baz:                                    # @baz
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64
-# BB#0:                                 # %entry
-	i32.const	$push35=, 0
-	i32.const	$push34=, 0
-	i64.load32_u	$push3=, a($pop34)
-	i32.const	$push33=, 0
-	i64.load8_u	$push0=, a+4($pop33)
+# %bb.0:                                # %entry
+	i32.const	$push31=, 0
+	i64.load32_u	$push3=, a($pop31)
+	i32.const	$push30=, 0
+	i64.load8_u	$push0=, a+4($pop30)
 	i64.const	$push1=, 32
 	i64.shl 	$push2=, $pop0, $pop1
-	i64.or  	$push32=, $pop3, $pop2
-	tee_local	$push31=, $0=, $pop32
+	i64.or  	$0=, $pop3, $pop2
 	i64.const	$push4=, 964220157951
-	i64.and 	$push30=, $pop31, $pop4
-	tee_local	$push29=, $1=, $pop30
+	i64.and 	$1=, $0, $pop4
+	i32.const	$push29=, 0
 	i64.const	$push28=, 32
-	i64.shr_u	$push5=, $pop29, $pop28
-	i64.store8	a+4($pop35), $pop5
+	i64.shr_u	$push5=, $1, $pop28
+	i64.store8	a+4($pop29), $pop5
 	i32.const	$push27=, 0
 	i64.const	$push6=, 2147483648
 	i64.or  	$push7=, $1, $pop6
@@ -166,35 +160,35 @@ main:                                   # @main
 	block   	
 	i32.const	$push20=, 0
 	i32.load	$push8=, d($pop20)
-	i32.eqz 	$push44=, $pop8
-	br_if   	0, $pop44       # 0: down to label2
-# BB#1:                                 # %if.then.i.i
-	i32.const	$push37=, 0
+	i32.eqz 	$push40=, $pop8
+	br_if   	0, $pop40       # 0: down to label2
+# %bb.1:                                # %if.then.i.i
+	i32.const	$push33=, 0
 	i64.const	$push9=, 33
 	i64.shl 	$push10=, $0, $pop9
-	i64.const	$push36=, 33
-	i64.shr_s	$push11=, $pop10, $pop36
-	i64.store32	c($pop37), $pop11
+	i64.const	$push32=, 33
+	i64.shr_s	$push11=, $pop10, $pop32
+	i64.store32	c($pop33), $pop11
 .LBB3_2:                                # %baz.exit
 	end_block                       # label2:
-	i32.const	$push43=, 0
-	i32.const	$push42=, 0
-	i32.load8_u	$push12=, b+4($pop42)
-	i32.store8	a+4($pop43), $pop12
-	i32.const	$push41=, 0
-	i32.const	$push40=, 0
-	i32.load	$push13=, b($pop40):p2align=0
-	i32.store	a($pop41), $pop13
-	block   	
 	i32.const	$push39=, 0
-	i64.load32_u	$push14=, a($pop39)
+	i32.const	$push38=, 0
+	i32.load8_u	$push12=, b+4($pop38)
+	i32.store8	a+4($pop39), $pop12
+	i32.const	$push37=, 0
+	i32.const	$push36=, 0
+	i32.load	$push13=, b($pop36):p2align=0
+	i32.store	a($pop37), $pop13
+	block   	
+	i32.const	$push35=, 0
+	i64.load32_u	$push14=, a($pop35)
 	i64.const	$push15=, 33
 	i64.shl 	$push16=, $pop14, $pop15
-	i64.const	$push38=, 33
-	i64.shr_s	$push17=, $pop16, $pop38
+	i64.const	$push34=, 33
+	i64.shr_s	$push17=, $pop16, $pop34
 	i32.wrap/i64	$push18=, $pop17
 	br_if   	0, $pop18       # 0: down to label3
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push19=, 0
 	return  	$pop19
 .LBB3_4:                                # %if.then
@@ -256,5 +250,5 @@ b:
 	.size	b, 5
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53084.c.s b/test/torture-s/pr53084.c.s
index 8e82ee581..883524668 100644
--- a/test/torture-s/pr53084.c.s
+++ b/test/torture-s/pr53084.c.s
@@ -6,21 +6,21 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load8_u	$push0=, 0($0)
 	i32.const	$push5=, 111
 	i32.ne  	$push1=, $pop0, $pop5
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load8_u	$push2=, 1($0)
 	i32.const	$push6=, 111
 	i32.ne  	$push3=, $pop2, $pop6
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false6
+# %bb.2:                                # %lor.lhs.false6
 	i32.load8_u	$push4=, 2($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -36,7 +36,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str+1
 	call    	bar@FUNCTION, $pop0
 	i32.const	$push1=, 0
@@ -52,5 +52,5 @@ main:                                   # @main
 	.size	.L.str, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53160.c.s b/test/torture-s/pr53160.c.s
index 88ed0f2fa..7cb70c1df 100644
--- a/test/torture-s/pr53160.c.s
+++ b/test/torture-s/pr53160.c.s
@@ -5,7 +5,7 @@
 	.globl	foo
 	.type	foo,@function
 foo:                                    # @foo
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push1=, 0
 	i32.store	e($pop0), $pop1
@@ -21,32 +21,30 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push4=, 0
 	i32.load	$push0=, g($pop4)
-	i32.eqz 	$push19=, $pop0
-	br_if   	0, $pop19       # 0: down to label0
-# BB#1:                                 # %if.then
+	i32.eqz 	$push15=, $pop0
+	br_if   	0, $pop15       # 0: down to label0
+# %bb.1:                                # %if.then
 	i32.const	$push5=, 0
 	i32.load	$drop=, b($pop5)
 .LBB1_2:                                # %if.end
 	end_block                       # label0:
-	i32.const	$push18=, 0
+	i32.const	$push14=, 0
 	i32.const	$push1=, -1
-	i32.store	d($pop18), $pop1
-	i32.const	$push17=, 0
-	i32.const	$push16=, 0
-	i32.load8_s	$push15=, f($pop16)
-	tee_local	$push14=, $0=, $pop15
-	i32.store16	i($pop17), $pop14
+	i32.store	d($pop14), $pop1
 	i32.const	$push13=, 0
+	i32.load8_s	$0=, f($pop13)
 	i32.const	$push12=, 0
+	i32.store16	i($pop12), $0
 	i32.const	$push11=, 0
-	i32.load	$push2=, c($pop11)
-	i32.select	$push10=, $0, $pop12, $pop2
-	tee_local	$push9=, $0=, $pop10
-	i32.store	h($pop13), $pop9
+	i32.const	$push10=, 0
+	i32.load	$push2=, c($pop10)
+	i32.select	$0=, $0, $pop11, $pop2
+	i32.const	$push9=, 0
+	i32.store	h($pop9), $0
 	i32.const	$push8=, 0
 	i32.store	a($pop8), $0
 	i32.const	$push7=, 0
@@ -54,7 +52,7 @@ main:                                   # @main
 	i32.store	e($pop7), $pop6
 	block   	
 	br_if   	0, $0           # 0: down to label1
-# BB#3:                                 # %if.end16
+# %bb.3:                                # %if.end16
 	i32.const	$push3=, 0
 	return  	$pop3
 .LBB1_4:                                # %if.then15
@@ -146,5 +144,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53465.c.s b/test/torture-s/pr53465.c.s
index 455af7eac..0535e7fd2 100644
--- a/test/torture-s/pr53465.c.s
+++ b/test/torture-s/pr53465.c.s
@@ -7,43 +7,41 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push3=, 1
 	i32.lt_s	$push0=, $1, $pop3
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$3=, 0
-                                        # implicit-def: %vreg29
+                                        # implicit-def: %29
 	i32.const	$5=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
 	copy_local	$2=, $4
-	i32.load	$push5=, 0($0)
-	tee_local	$push4=, $4=, $pop5
-	i32.eqz 	$push10=, $pop4
-	br_if   	1, $pop10       # 1: down to label1
-# BB#3:                                 # %if.end
+	i32.load	$4=, 0($0)
+	i32.eqz 	$push6=, $4
+	br_if   	1, $pop6        # 1: down to label1
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	block   	
-	i32.eqz 	$push11=, $5
-	br_if   	0, $pop11       # 0: down to label3
-# BB#4:                                 # %if.end
+	i32.eqz 	$push7=, $5
+	br_if   	0, $pop7        # 0: down to label3
+# %bb.4:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.le_s	$push1=, $4, $2
 	br_if   	3, $pop1        # 3: down to label0
 .LBB0_5:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
-	i32.const	$push9=, 4
-	i32.add 	$0=, $0, $pop9
+	i32.const	$push5=, 1
+	i32.add 	$3=, $3, $pop5
+	i32.const	$push4=, 4
+	i32.add 	$0=, $0, $pop4
 	i32.const	$5=, 1
-	i32.const	$push8=, 1
-	i32.add 	$push7=, $3, $pop8
-	tee_local	$push6=, $3=, $pop7
-	i32.lt_s	$push2=, $pop6, $1
+	i32.lt_s	$push2=, $3, $1
 	br_if   	0, $pop2        # 0: up to label2
 .LBB0_6:                                # %for.end
 	end_loop
@@ -63,7 +61,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %for.cond.i.1
+# %bb.0:                                # %for.cond.i.1
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -71,5 +69,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53645-2.c.s b/test/torture-s/pr53645-2.c.s
index 4cf8881ee..205c9827e 100644
--- a/test/torture-s/pr53645-2.c.s
+++ b/test/torture-s/pr53645-2.c.s
@@ -6,67 +6,55 @@
 	.type	uq44444444,@function
 uq44444444:                             # @uq44444444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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	$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	$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	$push32=, $pop31, $pop40
-	i32.store16	0($pop29), $pop32
+	i32.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
 	i32.const	$push39=, 2
-	i32.add 	$push33=, $0, $pop39
+	i32.shr_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
 	i32.const	$push38=, 2
-	i32.add 	$push34=, $1, $pop38
-	i32.load16_u	$push35=, 0($pop34)
+	i32.shr_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
 	i32.const	$push37=, 2
-	i32.shr_u	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.shr_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push35=, 2
+	i32.shr_u	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push33=, 2
+	i32.shr_u	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push31=, 2
+	i32.shr_u	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 2
+	i32.shr_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -78,67 +66,55 @@ uq44444444:                             # @uq44444444
 	.type	ur44444444,@function
 ur44444444:                             # @ur44444444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 3
+	i32.and 	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
 	i32.const	$push38=, 3
-	i32.and 	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.and 	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
+	i32.const	$push37=, 3
+	i32.and 	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push35=, 3
+	i32.and 	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push33=, 3
+	i32.and 	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push31=, 3
+	i32.and 	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 3
+	i32.and 	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -150,67 +126,55 @@ ur44444444:                             # @ur44444444
 	.type	sq44444444,@function
 sq44444444:                             # @sq44444444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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	$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	$push27=, $pop26, $pop42
-	i32.store16	0($pop24), $pop27
-	i32.const	$push41=, 4
-	i32.add 	$push28=, $0, $pop41
-	i32.const	$push40=, 4
-	i32.add 	$push29=, $1, $pop40
-	i32.load16_s	$push30=, 0($pop29)
+	i32.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
 	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.div_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
+	i32.const	$push38=, 4
+	i32.div_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
 	i32.const	$push37=, 4
-	i32.div_s	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.div_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push35=, 4
+	i32.div_s	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push33=, 4
+	i32.div_s	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push31=, 4
+	i32.div_s	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 4
+	i32.div_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -222,67 +186,55 @@ sq44444444:                             # @sq44444444
 	.type	sr44444444,@function
 sr44444444:                             # @sr44444444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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	$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	$push27=, $pop26, $pop42
-	i32.store16	0($pop24), $pop27
-	i32.const	$push41=, 4
-	i32.add 	$push28=, $0, $pop41
-	i32.const	$push40=, 4
-	i32.add 	$push29=, $1, $pop40
-	i32.load16_s	$push30=, 0($pop29)
+	i32.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
 	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.rem_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
+	i32.const	$push38=, 4
+	i32.rem_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
 	i32.const	$push37=, 4
-	i32.rem_s	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.rem_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push35=, 4
+	i32.rem_s	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push33=, 4
+	i32.rem_s	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push31=, 4
+	i32.rem_s	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 4
+	i32.rem_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -294,65 +246,53 @@ sr44444444:                             # @sr44444444
 	.type	uq1428166432128,@function
 uq1428166432128:                        # @uq1428166432128
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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.load16_u	$push1=, 8($1)
+	i32.const	$push2=, 4
+	i32.shr_u	$push3=, $pop1, $pop2
+	i32.store16	8($0), $pop3
+	i32.load16_u	$push4=, 4($1)
+	i32.const	$push5=, 1
 	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
+	i32.store16	4($0), $pop6
+	i32.load16_u	$push7=, 2($1)
+	i32.const	$push8=, 2
+	i32.shr_u	$push9=, $pop7, $pop8
+	i32.store16	2($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_u	$push13=, 0($pop12)
+	i32.const	$push14=, 7
+	i32.shr_u	$push15=, $pop13, $pop14
+	i32.store16	0($pop11), $pop15
+	i32.const	$push16=, 12
+	i32.add 	$push17=, $0, $pop16
+	i32.const	$push36=, 12
+	i32.add 	$push18=, $1, $pop36
+	i32.load16_u	$push19=, 0($pop18)
+	i32.const	$push20=, 5
+	i32.shr_u	$push21=, $pop19, $pop20
+	i32.store16	0($pop17), $pop21
+	i32.const	$push22=, 10
+	i32.add 	$push23=, $0, $pop22
+	i32.const	$push35=, 10
+	i32.add 	$push24=, $1, $pop35
+	i32.load16_u	$push25=, 0($pop24)
+	i32.const	$push26=, 6
+	i32.shr_u	$push27=, $pop25, $pop26
+	i32.store16	0($pop23), $pop27
+	i32.const	$push34=, 6
+	i32.add 	$push28=, $0, $pop34
+	i32.const	$push33=, 6
+	i32.add 	$push29=, $1, $pop33
+	i32.load16_u	$push30=, 0($pop29)
+	i32.const	$push31=, 3
+	i32.shr_u	$push32=, $pop30, $pop31
+	i32.store16	0($pop28), $pop32
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
@@ -364,65 +304,53 @@ uq1428166432128:                        # @uq1428166432128
 	.type	ur1428166432128,@function
 ur1428166432128:                        # @ur1428166432128
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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.load16_u	$push1=, 8($1)
+	i32.const	$push2=, 15
+	i32.and 	$push3=, $pop1, $pop2
+	i32.store16	8($0), $pop3
+	i32.load16_u	$push4=, 4($1)
+	i32.const	$push5=, 1
 	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
+	i32.store16	4($0), $pop6
+	i32.load16_u	$push7=, 2($1)
+	i32.const	$push8=, 3
+	i32.and 	$push9=, $pop7, $pop8
+	i32.store16	2($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_u	$push13=, 0($pop12)
+	i32.const	$push14=, 127
+	i32.and 	$push15=, $pop13, $pop14
+	i32.store16	0($pop11), $pop15
+	i32.const	$push16=, 12
+	i32.add 	$push17=, $0, $pop16
+	i32.const	$push36=, 12
+	i32.add 	$push18=, $1, $pop36
+	i32.load16_u	$push19=, 0($pop18)
+	i32.const	$push20=, 31
+	i32.and 	$push21=, $pop19, $pop20
+	i32.store16	0($pop17), $pop21
+	i32.const	$push22=, 10
+	i32.add 	$push23=, $0, $pop22
+	i32.const	$push35=, 10
+	i32.add 	$push24=, $1, $pop35
+	i32.load16_u	$push25=, 0($pop24)
+	i32.const	$push26=, 63
+	i32.and 	$push27=, $pop25, $pop26
+	i32.store16	0($pop23), $pop27
+	i32.const	$push28=, 6
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push34=, 6
+	i32.add 	$push30=, $1, $pop34
+	i32.load16_u	$push31=, 0($pop30)
+	i32.const	$push32=, 7
+	i32.and 	$push33=, $pop31, $pop32
+	i32.store16	0($pop29), $pop33
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -434,65 +362,53 @@ ur1428166432128:                        # @ur1428166432128
 	.type	sq1428166432128,@function
 sq1428166432128:                        # @sq1428166432128
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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.load16_s	$push1=, 8($1)
+	i32.const	$push2=, 16
+	i32.div_s	$push3=, $pop1, $pop2
+	i32.store16	8($0), $pop3
+	i32.load16_s	$push4=, 4($1)
+	i32.const	$push5=, 2
 	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.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
+	i32.store16	4($0), $pop6
+	i32.load16_s	$push7=, 2($1)
+	i32.const	$push8=, 4
+	i32.div_s	$push9=, $pop7, $pop8
+	i32.store16	2($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_s	$push13=, 0($pop12)
+	i32.const	$push14=, 128
+	i32.div_s	$push15=, $pop13, $pop14
+	i32.store16	0($pop11), $pop15
+	i32.const	$push16=, 12
+	i32.add 	$push17=, $0, $pop16
+	i32.const	$push36=, 12
+	i32.add 	$push18=, $1, $pop36
+	i32.load16_s	$push19=, 0($pop18)
+	i32.const	$push20=, 32
+	i32.div_s	$push21=, $pop19, $pop20
+	i32.store16	0($pop17), $pop21
+	i32.const	$push22=, 10
+	i32.add 	$push23=, $0, $pop22
+	i32.const	$push35=, 10
+	i32.add 	$push24=, $1, $pop35
+	i32.load16_s	$push25=, 0($pop24)
+	i32.const	$push26=, 64
+	i32.div_s	$push27=, $pop25, $pop26
+	i32.store16	0($pop23), $pop27
+	i32.const	$push28=, 6
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push34=, 6
+	i32.add 	$push30=, $1, $pop34
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push32=, 8
+	i32.div_s	$push33=, $pop31, $pop32
+	i32.store16	0($pop29), $pop33
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -504,65 +420,53 @@ sq1428166432128:                        # @sq1428166432128
 	.type	sr1428166432128,@function
 sr1428166432128:                        # @sr1428166432128
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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.load16_s	$push1=, 8($1)
+	i32.const	$push2=, 16
+	i32.rem_s	$push3=, $pop1, $pop2
+	i32.store16	8($0), $pop3
+	i32.load16_s	$push4=, 4($1)
+	i32.const	$push5=, 2
 	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.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
+	i32.store16	4($0), $pop6
+	i32.load16_s	$push7=, 2($1)
+	i32.const	$push8=, 4
+	i32.rem_s	$push9=, $pop7, $pop8
+	i32.store16	2($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_s	$push13=, 0($pop12)
+	i32.const	$push14=, 128
+	i32.rem_s	$push15=, $pop13, $pop14
+	i32.store16	0($pop11), $pop15
+	i32.const	$push16=, 12
+	i32.add 	$push17=, $0, $pop16
+	i32.const	$push36=, 12
+	i32.add 	$push18=, $1, $pop36
+	i32.load16_s	$push19=, 0($pop18)
+	i32.const	$push20=, 32
+	i32.rem_s	$push21=, $pop19, $pop20
+	i32.store16	0($pop17), $pop21
+	i32.const	$push22=, 10
+	i32.add 	$push23=, $0, $pop22
+	i32.const	$push35=, 10
+	i32.add 	$push24=, $1, $pop35
+	i32.load16_s	$push25=, 0($pop24)
+	i32.const	$push26=, 64
+	i32.rem_s	$push27=, $pop25, $pop26
+	i32.store16	0($pop23), $pop27
+	i32.const	$push28=, 6
+	i32.add 	$push29=, $0, $pop28
+	i32.const	$push34=, 6
+	i32.add 	$push30=, $1, $pop34
+	i32.load16_s	$push31=, 0($pop30)
+	i32.const	$push32=, 8
+	i32.rem_s	$push33=, $pop31, $pop32
+	i32.store16	0($pop29), $pop33
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end7:
@@ -574,67 +478,55 @@ sr1428166432128:                        # @sr1428166432128
 	.type	uq33333333,@function
 uq33333333:                             # @uq33333333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 3
+	i32.div_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
 	i32.const	$push38=, 3
-	i32.div_u	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.div_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
+	i32.const	$push37=, 3
+	i32.div_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push35=, 3
+	i32.div_u	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push33=, 3
+	i32.div_u	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push31=, 3
+	i32.div_u	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 3
+	i32.div_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end8:
@@ -646,67 +538,55 @@ uq33333333:                             # @uq33333333
 	.type	ur33333333,@function
 ur33333333:                             # @ur33333333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 3
+	i32.rem_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
 	i32.const	$push38=, 3
-	i32.rem_u	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.rem_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
+	i32.const	$push37=, 3
+	i32.rem_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push35=, 3
+	i32.rem_u	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push33=, 3
+	i32.rem_u	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push31=, 3
+	i32.rem_u	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 3
+	i32.rem_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
@@ -718,67 +598,55 @@ ur33333333:                             # @ur33333333
 	.type	sq33333333,@function
 sq33333333:                             # @sq33333333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
+	i32.const	$push39=, 3
+	i32.div_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
 	i32.const	$push38=, 3
-	i32.div_s	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.div_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
+	i32.const	$push37=, 3
+	i32.div_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push35=, 3
+	i32.div_s	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push33=, 3
+	i32.div_s	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push31=, 3
+	i32.div_s	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 3
+	i32.div_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
@@ -790,67 +658,55 @@ sq33333333:                             # @sq33333333
 	.type	sr33333333,@function
 sr33333333:                             # @sr33333333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
+	i32.const	$push39=, 3
+	i32.rem_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
 	i32.const	$push38=, 3
-	i32.rem_s	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.rem_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
+	i32.const	$push37=, 3
+	i32.rem_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push35=, 3
+	i32.rem_s	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push33=, 3
+	i32.rem_s	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push31=, 3
+	i32.rem_s	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 3
+	i32.rem_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end11:
@@ -862,67 +718,55 @@ sr33333333:                             # @sr33333333
 	.type	uq65656565,@function
 uq65656565:                             # @uq65656565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.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
+	i32.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 6
+	i32.div_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
+	i32.const	$push6=, 5
+	i32.div_u	$push7=, $pop5, $pop6
+	i32.store16	2($0), $pop7
+	i32.load16_u	$push8=, 0($1)
+	i32.const	$push38=, 6
+	i32.div_u	$push9=, $pop8, $pop38
+	i32.store16	0($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_u	$push13=, 0($pop12)
+	i32.const	$push36=, 5
+	i32.div_u	$push14=, $pop13, $pop36
+	i32.store16	0($pop11), $pop14
+	i32.const	$push15=, 12
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push35=, 12
+	i32.add 	$push17=, $1, $pop35
+	i32.load16_u	$push18=, 0($pop17)
+	i32.const	$push34=, 6
+	i32.div_u	$push19=, $pop18, $pop34
+	i32.store16	0($pop16), $pop19
+	i32.const	$push20=, 10
+	i32.add 	$push21=, $0, $pop20
+	i32.const	$push33=, 10
+	i32.add 	$push22=, $1, $pop33
+	i32.load16_u	$push23=, 0($pop22)
+	i32.const	$push32=, 5
+	i32.div_u	$push24=, $pop23, $pop32
+	i32.store16	0($pop21), $pop24
+	i32.const	$push31=, 6
+	i32.add 	$push25=, $0, $pop31
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 5
+	i32.div_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
@@ -934,67 +778,55 @@ uq65656565:                             # @uq65656565
 	.type	ur65656565,@function
 ur65656565:                             # @ur65656565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.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
+	i32.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 6
+	i32.rem_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
+	i32.const	$push6=, 5
+	i32.rem_u	$push7=, $pop5, $pop6
+	i32.store16	2($0), $pop7
+	i32.load16_u	$push8=, 0($1)
+	i32.const	$push38=, 6
+	i32.rem_u	$push9=, $pop8, $pop38
+	i32.store16	0($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_u	$push13=, 0($pop12)
+	i32.const	$push36=, 5
+	i32.rem_u	$push14=, $pop13, $pop36
+	i32.store16	0($pop11), $pop14
+	i32.const	$push15=, 12
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push35=, 12
+	i32.add 	$push17=, $1, $pop35
+	i32.load16_u	$push18=, 0($pop17)
+	i32.const	$push34=, 6
+	i32.rem_u	$push19=, $pop18, $pop34
+	i32.store16	0($pop16), $pop19
+	i32.const	$push20=, 10
+	i32.add 	$push21=, $0, $pop20
+	i32.const	$push33=, 10
+	i32.add 	$push22=, $1, $pop33
+	i32.load16_u	$push23=, 0($pop22)
+	i32.const	$push32=, 5
+	i32.rem_u	$push24=, $pop23, $pop32
+	i32.store16	0($pop21), $pop24
+	i32.const	$push31=, 6
+	i32.add 	$push25=, $0, $pop31
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 5
+	i32.rem_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end13:
@@ -1006,67 +838,55 @@ ur65656565:                             # @ur65656565
 	.type	sq65656565,@function
 sq65656565:                             # @sq65656565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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.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
+	i32.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
+	i32.const	$push39=, 6
+	i32.div_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
+	i32.const	$push6=, 5
+	i32.div_s	$push7=, $pop5, $pop6
+	i32.store16	2($0), $pop7
+	i32.load16_s	$push8=, 0($1)
+	i32.const	$push38=, 6
+	i32.div_s	$push9=, $pop8, $pop38
+	i32.store16	0($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_s	$push13=, 0($pop12)
+	i32.const	$push36=, 5
+	i32.div_s	$push14=, $pop13, $pop36
+	i32.store16	0($pop11), $pop14
+	i32.const	$push15=, 12
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push35=, 12
+	i32.add 	$push17=, $1, $pop35
+	i32.load16_s	$push18=, 0($pop17)
+	i32.const	$push34=, 6
+	i32.div_s	$push19=, $pop18, $pop34
+	i32.store16	0($pop16), $pop19
+	i32.const	$push20=, 10
+	i32.add 	$push21=, $0, $pop20
+	i32.const	$push33=, 10
+	i32.add 	$push22=, $1, $pop33
+	i32.load16_s	$push23=, 0($pop22)
+	i32.const	$push32=, 5
+	i32.div_s	$push24=, $pop23, $pop32
+	i32.store16	0($pop21), $pop24
+	i32.const	$push31=, 6
+	i32.add 	$push25=, $0, $pop31
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 5
+	i32.div_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end14:
@@ -1078,67 +898,55 @@ sq65656565:                             # @sq65656565
 	.type	sr65656565,@function
 sr65656565:                             # @sr65656565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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.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
+	i32.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
+	i32.const	$push39=, 6
+	i32.rem_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
+	i32.const	$push6=, 5
+	i32.rem_s	$push7=, $pop5, $pop6
+	i32.store16	2($0), $pop7
+	i32.load16_s	$push8=, 0($1)
+	i32.const	$push38=, 6
+	i32.rem_s	$push9=, $pop8, $pop38
+	i32.store16	0($0), $pop9
+	i32.const	$push10=, 14
+	i32.add 	$push11=, $0, $pop10
+	i32.const	$push37=, 14
+	i32.add 	$push12=, $1, $pop37
+	i32.load16_s	$push13=, 0($pop12)
+	i32.const	$push36=, 5
+	i32.rem_s	$push14=, $pop13, $pop36
+	i32.store16	0($pop11), $pop14
+	i32.const	$push15=, 12
+	i32.add 	$push16=, $0, $pop15
+	i32.const	$push35=, 12
+	i32.add 	$push17=, $1, $pop35
+	i32.load16_s	$push18=, 0($pop17)
+	i32.const	$push34=, 6
+	i32.rem_s	$push19=, $pop18, $pop34
+	i32.store16	0($pop16), $pop19
+	i32.const	$push20=, 10
+	i32.add 	$push21=, $0, $pop20
+	i32.const	$push33=, 10
+	i32.add 	$push22=, $1, $pop33
+	i32.load16_s	$push23=, 0($pop22)
+	i32.const	$push32=, 5
+	i32.rem_s	$push24=, $pop23, $pop32
+	i32.store16	0($pop21), $pop24
+	i32.const	$push31=, 6
+	i32.add 	$push25=, $0, $pop31
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 5
+	i32.rem_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end15:
@@ -1150,67 +958,55 @@ sr65656565:                             # @sr65656565
 	.type	uq14141461461414,@function
 uq14141461461414:                       # @uq14141461461414
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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	$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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
 	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.div_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
+	i32.const	$push38=, 14
+	i32.div_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
 	i32.const	$push37=, 14
-	i32.div_u	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.div_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push36=, 14
+	i32.add 	$push9=, $0, $pop36
+	i32.const	$push35=, 14
+	i32.add 	$push10=, $1, $pop35
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push34=, 14
+	i32.div_u	$push12=, $pop11, $pop34
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 12
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push33=, 12
+	i32.add 	$push15=, $1, $pop33
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push32=, 14
+	i32.div_u	$push17=, $pop16, $pop32
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 10
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push31=, 10
+	i32.add 	$push20=, $1, $pop31
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push22=, 6
+	i32.div_u	$push23=, $pop21, $pop22
+	i32.store16	0($pop19), $pop23
+	i32.const	$push30=, 6
+	i32.add 	$push24=, $0, $pop30
+	i32.const	$push29=, 6
+	i32.add 	$push25=, $1, $pop29
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push28=, 6
+	i32.div_u	$push27=, $pop26, $pop28
+	i32.store16	0($pop24), $pop27
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end16:
@@ -1222,67 +1018,55 @@ uq14141461461414:                       # @uq14141461461414
 	.type	ur14141461461414,@function
 ur14141461461414:                       # @ur14141461461414
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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	$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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
 	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.rem_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
+	i32.const	$push38=, 14
+	i32.rem_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
 	i32.const	$push37=, 14
-	i32.rem_u	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.rem_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push36=, 14
+	i32.add 	$push9=, $0, $pop36
+	i32.const	$push35=, 14
+	i32.add 	$push10=, $1, $pop35
+	i32.load16_u	$push11=, 0($pop10)
+	i32.const	$push34=, 14
+	i32.rem_u	$push12=, $pop11, $pop34
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 12
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push33=, 12
+	i32.add 	$push15=, $1, $pop33
+	i32.load16_u	$push16=, 0($pop15)
+	i32.const	$push32=, 14
+	i32.rem_u	$push17=, $pop16, $pop32
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 10
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push31=, 10
+	i32.add 	$push20=, $1, $pop31
+	i32.load16_u	$push21=, 0($pop20)
+	i32.const	$push22=, 6
+	i32.rem_u	$push23=, $pop21, $pop22
+	i32.store16	0($pop19), $pop23
+	i32.const	$push30=, 6
+	i32.add 	$push24=, $0, $pop30
+	i32.const	$push29=, 6
+	i32.add 	$push25=, $1, $pop29
+	i32.load16_u	$push26=, 0($pop25)
+	i32.const	$push28=, 6
+	i32.rem_u	$push27=, $pop26, $pop28
+	i32.store16	0($pop24), $pop27
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end17:
@@ -1294,67 +1078,55 @@ ur14141461461414:                       # @ur14141461461414
 	.type	sq14141461461414,@function
 sq14141461461414:                       # @sq14141461461414
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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	$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.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
 	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.div_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
+	i32.const	$push38=, 14
+	i32.div_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
 	i32.const	$push37=, 14
-	i32.div_s	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.div_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push36=, 14
+	i32.add 	$push9=, $0, $pop36
+	i32.const	$push35=, 14
+	i32.add 	$push10=, $1, $pop35
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push34=, 14
+	i32.div_s	$push12=, $pop11, $pop34
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 12
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push33=, 12
+	i32.add 	$push15=, $1, $pop33
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push32=, 14
+	i32.div_s	$push17=, $pop16, $pop32
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 10
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push31=, 10
+	i32.add 	$push20=, $1, $pop31
+	i32.load16_s	$push21=, 0($pop20)
+	i32.const	$push22=, 6
+	i32.div_s	$push23=, $pop21, $pop22
+	i32.store16	0($pop19), $pop23
+	i32.const	$push30=, 6
+	i32.add 	$push24=, $0, $pop30
+	i32.const	$push29=, 6
+	i32.add 	$push25=, $1, $pop29
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push28=, 6
+	i32.div_s	$push27=, $pop26, $pop28
+	i32.store16	0($pop24), $pop27
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end18:
@@ -1366,67 +1138,55 @@ sq14141461461414:                       # @sq14141461461414
 	.type	sr14141461461414,@function
 sr14141461461414:                       # @sr14141461461414
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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	$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.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
 	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.rem_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
+	i32.const	$push38=, 14
+	i32.rem_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
 	i32.const	$push37=, 14
-	i32.rem_s	$push36=, $pop35, $pop37
-	i32.store16	0($pop33), $pop36
+	i32.rem_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push36=, 14
+	i32.add 	$push9=, $0, $pop36
+	i32.const	$push35=, 14
+	i32.add 	$push10=, $1, $pop35
+	i32.load16_s	$push11=, 0($pop10)
+	i32.const	$push34=, 14
+	i32.rem_s	$push12=, $pop11, $pop34
+	i32.store16	0($pop9), $pop12
+	i32.const	$push13=, 12
+	i32.add 	$push14=, $0, $pop13
+	i32.const	$push33=, 12
+	i32.add 	$push15=, $1, $pop33
+	i32.load16_s	$push16=, 0($pop15)
+	i32.const	$push32=, 14
+	i32.rem_s	$push17=, $pop16, $pop32
+	i32.store16	0($pop14), $pop17
+	i32.const	$push18=, 10
+	i32.add 	$push19=, $0, $pop18
+	i32.const	$push31=, 10
+	i32.add 	$push20=, $1, $pop31
+	i32.load16_s	$push21=, 0($pop20)
+	i32.const	$push22=, 6
+	i32.rem_s	$push23=, $pop21, $pop22
+	i32.store16	0($pop19), $pop23
+	i32.const	$push30=, 6
+	i32.add 	$push24=, $0, $pop30
+	i32.const	$push29=, 6
+	i32.add 	$push25=, $1, $pop29
+	i32.load16_s	$push26=, 0($pop25)
+	i32.const	$push28=, 6
+	i32.rem_s	$push27=, $pop26, $pop28
+	i32.store16	0($pop24), $pop27
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end19:
@@ -1438,67 +1198,55 @@ sr14141461461414:                       # @sr14141461461414
 	.type	uq77777777,@function
 uq77777777:                             # @uq77777777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 7
+	i32.div_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
 	i32.const	$push38=, 7
-	i32.div_u	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.div_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
+	i32.const	$push37=, 7
+	i32.div_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push35=, 7
+	i32.div_u	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push33=, 7
+	i32.div_u	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push31=, 7
+	i32.div_u	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 7
+	i32.div_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end20:
@@ -1510,67 +1258,55 @@ uq77777777:                             # @uq77777777
 	.type	ur77777777,@function
 ur77777777:                             # @ur77777777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_u	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_u	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_u	$push3=, 4($1)
+	i32.const	$push39=, 7
+	i32.rem_u	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_u	$push5=, 2($1)
 	i32.const	$push38=, 7
-	i32.rem_u	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.rem_u	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_u	$push7=, 0($1)
+	i32.const	$push37=, 7
+	i32.rem_u	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_u	$push12=, 0($pop11)
+	i32.const	$push35=, 7
+	i32.rem_u	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_u	$push17=, 0($pop16)
+	i32.const	$push33=, 7
+	i32.rem_u	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_u	$push22=, 0($pop21)
+	i32.const	$push31=, 7
+	i32.rem_u	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_u	$push27=, 0($pop26)
+	i32.const	$push29=, 7
+	i32.rem_u	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end21:
@@ -1582,67 +1318,55 @@ ur77777777:                             # @ur77777777
 	.type	sq77777777,@function
 sq77777777:                             # @sq77777777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
+	i32.const	$push39=, 7
+	i32.div_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
 	i32.const	$push38=, 7
-	i32.div_s	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.div_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
+	i32.const	$push37=, 7
+	i32.div_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push35=, 7
+	i32.div_s	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push33=, 7
+	i32.div_s	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push31=, 7
+	i32.div_s	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 7
+	i32.div_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end22:
@@ -1654,67 +1378,55 @@ sq77777777:                             # @sq77777777
 	.type	sr77777777,@function
 sr77777777:                             # @sr77777777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load16_s	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load16_s	$push0=, 8($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.store16	8($0), $pop2
+	i32.load16_s	$push3=, 4($1)
+	i32.const	$push39=, 7
+	i32.rem_s	$push4=, $pop3, $pop39
+	i32.store16	4($0), $pop4
+	i32.load16_s	$push5=, 2($1)
 	i32.const	$push38=, 7
-	i32.rem_s	$push37=, $pop36, $pop38
-	i32.store16	0($pop34), $pop37
+	i32.rem_s	$push6=, $pop5, $pop38
+	i32.store16	2($0), $pop6
+	i32.load16_s	$push7=, 0($1)
+	i32.const	$push37=, 7
+	i32.rem_s	$push8=, $pop7, $pop37
+	i32.store16	0($0), $pop8
+	i32.const	$push9=, 14
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push36=, 14
+	i32.add 	$push11=, $1, $pop36
+	i32.load16_s	$push12=, 0($pop11)
+	i32.const	$push35=, 7
+	i32.rem_s	$push13=, $pop12, $pop35
+	i32.store16	0($pop10), $pop13
+	i32.const	$push14=, 12
+	i32.add 	$push15=, $0, $pop14
+	i32.const	$push34=, 12
+	i32.add 	$push16=, $1, $pop34
+	i32.load16_s	$push17=, 0($pop16)
+	i32.const	$push33=, 7
+	i32.rem_s	$push18=, $pop17, $pop33
+	i32.store16	0($pop15), $pop18
+	i32.const	$push19=, 10
+	i32.add 	$push20=, $0, $pop19
+	i32.const	$push32=, 10
+	i32.add 	$push21=, $1, $pop32
+	i32.load16_s	$push22=, 0($pop21)
+	i32.const	$push31=, 7
+	i32.rem_s	$push23=, $pop22, $pop31
+	i32.store16	0($pop20), $pop23
+	i32.const	$push24=, 6
+	i32.add 	$push25=, $0, $pop24
+	i32.const	$push30=, 6
+	i32.add 	$push26=, $1, $pop30
+	i32.load16_s	$push27=, 0($pop26)
+	i32.const	$push29=, 7
+	i32.rem_s	$push28=, $pop27, $pop29
+	i32.store16	0($pop25), $pop28
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end23:
@@ -1726,2659 +1438,2628 @@ sr77777777:                             # @sr77777777
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push1071=, 0
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
 	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.sub 	$7=, $pop1068, $pop1070
+	i32.const	$push1071=, 0
+	i32.store	__stack_pointer($pop1071), $7
 	i32.const	$0=, 0
 .LBB24_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
+	i32.const	$push1197=, 4
+	i32.shl 	$2=, $0, $pop1197
+	i32.const	$push1196=, u
+	i32.add 	$1=, $2, $pop1196
 	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.add 	$push1076=, $7, $pop1075
+	call    	uq44444444@FUNCTION, $pop1076, $1
+	i32.load16_u	$push0=, 16($7)
 	i32.load16_u	$push2=, 0($1)
-	i32.const	$push1197=, 2
-	i32.shr_u	$push380=, $pop2, $pop1197
+	i32.const	$push1195=, 2
+	i32.shr_u	$push380=, $pop2, $pop1195
 	i32.ne  	$push381=, $pop0, $pop380
 	br_if   	1, $pop381      # 1: down to label0
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push1=, 22($10)
-	i32.const	$push1207=, 65535
-	i32.and 	$push383=, $pop1, $pop1207
-	i32.const	$push1206=, u+6
-	i32.add 	$push382=, $2, $pop1206
+	i32.load16_u	$push1=, 22($7)
+	i32.const	$push1201=, 65535
+	i32.and 	$push383=, $pop1, $pop1201
+	i32.const	$push1200=, u+6
+	i32.add 	$push382=, $2, $pop1200
 	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.const	$push1199=, 65532
+	i32.and 	$push384=, $pop3, $pop1199
+	i32.const	$push1198=, 2
+	i32.shr_u	$push385=, $pop384, $pop1198
 	i32.ne  	$push386=, $pop383, $pop385
 	br_if   	1, $pop386      # 1: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1077=, 16
-	i32.add 	$push1078=, $10, $pop1077
+	i32.add 	$push1078=, $7, $pop1077
 	copy_local	$2=, $pop1078
 	#APP
 	#NO_APP
-	i32.load16_u	$push5=, 20($10)
-	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.load16_u	$push5=, 20($7)
+	i32.load16_u	$push7=, 4($1)
+	i32.const	$push1202=, 2
+	i32.shr_u	$push387=, $pop7, $pop1202
 	i32.ne  	$push388=, $pop5, $pop387
 	br_if   	1, $pop388      # 1: down to label0
-# BB#4:                                 # %lor.lhs.false21
+# %bb.4:                                # %lor.lhs.false21
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push4=, 18($10)
-	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.load16_u	$push4=, 18($7)
+	i32.const	$push1205=, 65535
+	i32.and 	$push389=, $pop4, $pop1205
+	i32.load16_u	$push6=, 2($1)
+	i32.const	$push1204=, 65532
+	i32.and 	$push390=, $pop6, $pop1204
+	i32.const	$push1203=, 2
+	i32.shr_u	$push391=, $pop390, $pop1203
 	i32.ne  	$push392=, $pop389, $pop391
 	br_if   	1, $pop392      # 1: down to label0
-# BB#5:                                 # %if.end31
+# %bb.5:                                # %if.end31
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1079=, 16
-	i32.add 	$push1080=, $10, $pop1079
-	copy_local	$4=, $pop1080
+	i32.add 	$push1080=, $7, $pop1079
+	copy_local	$2=, $pop1080
 	#APP
 	#NO_APP
-	i32.load16_u	$push8=, 24($10)
-	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.load16_u	$push8=, 24($7)
+	i32.load16_u	$push10=, 8($1)
+	i32.const	$push1206=, 2
+	i32.shr_u	$push393=, $pop10, $pop1206
 	i32.ne  	$push394=, $pop8, $pop393
 	br_if   	1, $pop394      # 1: down to label0
-# BB#6:                                 # %lor.lhs.false40
+# %bb.6:                                # %lor.lhs.false40
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push9=, 30($10)
-	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.const	$push1210=, 14
+	i32.add 	$2=, $1, $pop1210
+	i32.load16_u	$push9=, 30($7)
+	i32.const	$push1209=, 65535
+	i32.and 	$push395=, $pop9, $pop1209
+	i32.load16_u	$push11=, 0($2)
+	i32.const	$push1208=, 65532
+	i32.and 	$push396=, $pop11, $pop1208
+	i32.const	$push1207=, 2
+	i32.shr_u	$push397=, $pop396, $pop1207
 	i32.ne  	$push398=, $pop395, $pop397
 	br_if   	1, $pop398      # 1: down to label0
-# BB#7:                                 # %if.end50
+# %bb.7:                                # %if.end50
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1081=, 16
-	i32.add 	$push1082=, $10, $pop1081
-	copy_local	$6=, $pop1082
+	i32.add 	$push1082=, $7, $pop1081
+	copy_local	$3=, $pop1082
 	#APP
 	#NO_APP
-	i32.load16_u	$push13=, 28($10)
-	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.const	$push1212=, 12
+	i32.add 	$3=, $1, $pop1212
+	i32.load16_u	$push13=, 28($7)
+	i32.load16_u	$push15=, 0($3)
+	i32.const	$push1211=, 2
+	i32.shr_u	$push399=, $pop15, $pop1211
 	i32.ne  	$push400=, $pop13, $pop399
 	br_if   	1, $pop400      # 1: down to label0
-# BB#8:                                 # %lor.lhs.false59
+# %bb.8:                                # %lor.lhs.false59
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push12=, 26($10)
-	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.const	$push1216=, 10
+	i32.add 	$4=, $1, $pop1216
+	i32.load16_u	$push12=, 26($7)
+	i32.const	$push1215=, 65535
+	i32.and 	$push401=, $pop12, $pop1215
+	i32.load16_u	$push14=, 0($4)
+	i32.const	$push1214=, 65532
+	i32.and 	$push402=, $pop14, $pop1214
+	i32.const	$push1213=, 2
+	i32.shr_u	$push403=, $pop402, $pop1213
 	i32.ne  	$push404=, $pop401, $pop403
 	br_if   	1, $pop404      # 1: down to label0
-# BB#9:                                 # %if.end69
+# %bb.9:                                # %if.end69
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1083=, 16
-	i32.add 	$push1084=, $10, $pop1083
-	copy_local	$8=, $pop1084
+	i32.add 	$push1084=, $7, $pop1083
+	copy_local	$5=, $pop1084
 	#APP
 	#NO_APP
 	i32.const	$push1085=, 16
-	i32.add 	$push1086=, $10, $pop1085
+	i32.add 	$push1086=, $7, $pop1085
 	call    	ur44444444@FUNCTION, $pop1086, $1
-	i32.load16_u	$push16=, 16($10)
+	i32.load16_u	$push16=, 16($7)
 	i32.load16_u	$push18=, 0($1)
-	i32.const	$push1238=, 3
-	i32.and 	$push405=, $pop18, $pop1238
+	i32.const	$push1217=, 3
+	i32.and 	$push405=, $pop18, $pop1217
 	i32.ne  	$push406=, $pop16, $pop405
 	br_if   	1, $pop406      # 1: down to label0
-# BB#10:                                # %lor.lhs.false78
+# %bb.10:                               # %lor.lhs.false78
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push17=, 22($10)
-	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.const	$push1220=, 6
+	i32.add 	$5=, $1, $pop1220
+	i32.load16_u	$push17=, 22($7)
+	i32.const	$push1219=, 65535
+	i32.and 	$push408=, $pop17, $pop1219
+	i32.load16_u	$push19=, 0($5)
+	i32.const	$push1218=, 3
+	i32.and 	$push407=, $pop19, $pop1218
 	i32.ne  	$push409=, $pop408, $pop407
 	br_if   	1, $pop409      # 1: down to label0
-# BB#11:                                # %if.end88
+# %bb.11:                               # %if.end88
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1087=, 16
-	i32.add 	$push1088=, $10, $pop1087
-	copy_local	$9=, $pop1088
+	i32.add 	$push1088=, $7, $pop1087
+	copy_local	$6=, $pop1088
 	#APP
 	#NO_APP
-	i32.load16_u	$push21=, 20($10)
-	i32.load16_u	$push23=, 0($2)
-	i32.const	$push1244=, 3
-	i32.and 	$push410=, $pop23, $pop1244
+	i32.load16_u	$push21=, 20($7)
+	i32.load16_u	$push23=, 4($1)
+	i32.const	$push1221=, 3
+	i32.and 	$push410=, $pop23, $pop1221
 	i32.ne  	$push411=, $pop21, $pop410
 	br_if   	1, $pop411      # 1: down to label0
-# BB#12:                                # %lor.lhs.false97
+# %bb.12:                               # %lor.lhs.false97
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push20=, 18($10)
-	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.load16_u	$push20=, 18($7)
+	i32.const	$push1223=, 65535
+	i32.and 	$push413=, $pop20, $pop1223
+	i32.load16_u	$push22=, 2($1)
+	i32.const	$push1222=, 3
+	i32.and 	$push412=, $pop22, $pop1222
 	i32.ne  	$push414=, $pop413, $pop412
 	br_if   	1, $pop414      # 1: down to label0
-# BB#13:                                # %if.end107
+# %bb.13:                               # %if.end107
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1089=, 16
-	i32.add 	$push1090=, $10, $pop1089
-	copy_local	$9=, $pop1090
+	i32.add 	$push1090=, $7, $pop1089
+	copy_local	$6=, $pop1090
 	#APP
 	#NO_APP
-	i32.load16_u	$push24=, 24($10)
-	i32.load16_u	$push26=, 0($4)
-	i32.const	$push1247=, 3
-	i32.and 	$push415=, $pop26, $pop1247
+	i32.load16_u	$push24=, 24($7)
+	i32.load16_u	$push26=, 8($1)
+	i32.const	$push1224=, 3
+	i32.and 	$push415=, $pop26, $pop1224
 	i32.ne  	$push416=, $pop24, $pop415
 	br_if   	1, $pop416      # 1: down to label0
-# BB#14:                                # %lor.lhs.false116
+# %bb.14:                               # %lor.lhs.false116
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push25=, 30($10)
-	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.load16_u	$push25=, 30($7)
+	i32.const	$push1226=, 65535
+	i32.and 	$push418=, $pop25, $pop1226
+	i32.load16_u	$push27=, 0($2)
+	i32.const	$push1225=, 3
+	i32.and 	$push417=, $pop27, $pop1225
 	i32.ne  	$push419=, $pop418, $pop417
 	br_if   	1, $pop419      # 1: down to label0
-# BB#15:                                # %if.end126
+# %bb.15:                               # %if.end126
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1091=, 16
-	i32.add 	$push1092=, $10, $pop1091
-	copy_local	$9=, $pop1092
+	i32.add 	$push1092=, $7, $pop1091
+	copy_local	$6=, $pop1092
 	#APP
 	#NO_APP
-	i32.load16_u	$push29=, 28($10)
-	i32.load16_u	$push31=, 0($6)
-	i32.const	$push1250=, 3
-	i32.and 	$push420=, $pop31, $pop1250
+	i32.load16_u	$push29=, 28($7)
+	i32.load16_u	$push31=, 0($3)
+	i32.const	$push1227=, 3
+	i32.and 	$push420=, $pop31, $pop1227
 	i32.ne  	$push421=, $pop29, $pop420
 	br_if   	1, $pop421      # 1: down to label0
-# BB#16:                                # %lor.lhs.false135
+# %bb.16:                               # %lor.lhs.false135
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push28=, 26($10)
-	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.load16_u	$push28=, 26($7)
+	i32.const	$push1229=, 65535
+	i32.and 	$push423=, $pop28, $pop1229
+	i32.load16_u	$push30=, 0($4)
+	i32.const	$push1228=, 3
+	i32.and 	$push422=, $pop30, $pop1228
 	i32.ne  	$push424=, $pop423, $pop422
 	br_if   	1, $pop424      # 1: down to label0
-# BB#17:                                # %if.end145
+# %bb.17:                               # %if.end145
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1093=, 16
-	i32.add 	$push1094=, $10, $pop1093
-	copy_local	$9=, $pop1094
+	i32.add 	$push1094=, $7, $pop1093
+	copy_local	$6=, $pop1094
 	#APP
 	#NO_APP
 	i32.const	$push1095=, 16
-	i32.add 	$push1096=, $10, $pop1095
+	i32.add 	$push1096=, $7, $pop1095
 	call    	uq1428166432128@FUNCTION, $pop1096, $1
-	i32.load16_u	$push32=, 16($10)
+	i32.load16_u	$push32=, 16($7)
 	i32.load16_u	$push34=, 0($1)
 	i32.ne  	$push425=, $pop32, $pop34
 	br_if   	1, $pop425      # 1: down to label0
-# BB#18:                                # %lor.lhs.false155
+# %bb.18:                               # %lor.lhs.false155
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push33=, 22($10)
-	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.load16_u	$push33=, 22($7)
+	i32.const	$push1232=, 65535
+	i32.and 	$push426=, $pop33, $pop1232
+	i32.load16_u	$push35=, 0($5)
+	i32.const	$push1231=, 65528
+	i32.and 	$push427=, $pop35, $pop1231
+	i32.const	$push1230=, 3
+	i32.shr_u	$push428=, $pop427, $pop1230
 	i32.ne  	$push429=, $pop426, $pop428
 	br_if   	1, $pop429      # 1: down to label0
-# BB#19:                                # %if.end165
+# %bb.19:                               # %if.end165
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1097=, 16
-	i32.add 	$push1098=, $10, $pop1097
-	copy_local	$9=, $pop1098
+	i32.add 	$push1098=, $7, $pop1097
+	copy_local	$6=, $pop1098
 	#APP
 	#NO_APP
-	i32.load16_u	$push37=, 20($10)
-	i32.load16_u	$push39=, 0($2)
-	i32.const	$push1256=, 1
-	i32.shr_u	$push430=, $pop39, $pop1256
+	i32.load16_u	$push37=, 20($7)
+	i32.load16_u	$push39=, 4($1)
+	i32.const	$push1233=, 1
+	i32.shr_u	$push430=, $pop39, $pop1233
 	i32.ne  	$push431=, $pop37, $pop430
 	br_if   	1, $pop431      # 1: down to label0
-# BB#20:                                # %lor.lhs.false174
+# %bb.20:                               # %lor.lhs.false174
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push36=, 18($10)
-	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.load16_u	$push36=, 18($7)
+	i32.const	$push1236=, 65535
+	i32.and 	$push432=, $pop36, $pop1236
+	i32.load16_u	$push38=, 2($1)
+	i32.const	$push1235=, 65532
+	i32.and 	$push433=, $pop38, $pop1235
+	i32.const	$push1234=, 2
+	i32.shr_u	$push434=, $pop433, $pop1234
 	i32.ne  	$push435=, $pop432, $pop434
 	br_if   	1, $pop435      # 1: down to label0
-# BB#21:                                # %if.end184
+# %bb.21:                               # %if.end184
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1099=, 16
-	i32.add 	$push1100=, $10, $pop1099
-	copy_local	$9=, $pop1100
+	i32.add 	$push1100=, $7, $pop1099
+	copy_local	$6=, $pop1100
 	#APP
 	#NO_APP
-	i32.load16_u	$push40=, 24($10)
-	i32.load16_u	$push42=, 0($4)
-	i32.const	$push1260=, 4
-	i32.shr_u	$push436=, $pop42, $pop1260
+	i32.load16_u	$push40=, 24($7)
+	i32.load16_u	$push42=, 8($1)
+	i32.const	$push1237=, 4
+	i32.shr_u	$push436=, $pop42, $pop1237
 	i32.ne  	$push437=, $pop40, $pop436
 	br_if   	1, $pop437      # 1: down to label0
-# BB#22:                                # %lor.lhs.false193
+# %bb.22:                               # %lor.lhs.false193
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push41=, 30($10)
-	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.load16_u	$push41=, 30($7)
+	i32.const	$push1240=, 65535
+	i32.and 	$push438=, $pop41, $pop1240
+	i32.load16_u	$push43=, 0($2)
+	i32.const	$push1239=, 65408
+	i32.and 	$push439=, $pop43, $pop1239
+	i32.const	$push1238=, 7
+	i32.shr_u	$push440=, $pop439, $pop1238
 	i32.ne  	$push441=, $pop438, $pop440
 	br_if   	1, $pop441      # 1: down to label0
-# BB#23:                                # %if.end203
+# %bb.23:                               # %if.end203
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1101=, 16
-	i32.add 	$push1102=, $10, $pop1101
-	copy_local	$9=, $pop1102
+	i32.add 	$push1102=, $7, $pop1101
+	copy_local	$6=, $pop1102
 	#APP
 	#NO_APP
-	i32.load16_u	$push45=, 28($10)
-	i32.load16_u	$push47=, 0($6)
-	i32.const	$push1264=, 5
-	i32.shr_u	$push442=, $pop47, $pop1264
+	i32.load16_u	$push45=, 28($7)
+	i32.load16_u	$push47=, 0($3)
+	i32.const	$push1241=, 5
+	i32.shr_u	$push442=, $pop47, $pop1241
 	i32.ne  	$push443=, $pop45, $pop442
 	br_if   	1, $pop443      # 1: down to label0
-# BB#24:                                # %lor.lhs.false212
+# %bb.24:                               # %lor.lhs.false212
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push44=, 26($10)
-	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.load16_u	$push44=, 26($7)
+	i32.const	$push1244=, 65535
+	i32.and 	$push444=, $pop44, $pop1244
+	i32.load16_u	$push46=, 0($4)
+	i32.const	$push1243=, 65472
+	i32.and 	$push445=, $pop46, $pop1243
+	i32.const	$push1242=, 6
+	i32.shr_u	$push446=, $pop445, $pop1242
 	i32.ne  	$push447=, $pop444, $pop446
 	br_if   	1, $pop447      # 1: down to label0
-# BB#25:                                # %if.end222
+# %bb.25:                               # %if.end222
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1103=, 16
-	i32.add 	$push1104=, $10, $pop1103
-	copy_local	$9=, $pop1104
+	i32.add 	$push1104=, $7, $pop1103
+	copy_local	$6=, $pop1104
 	#APP
 	#NO_APP
 	i32.const	$push1105=, 16
-	i32.add 	$push1106=, $10, $pop1105
+	i32.add 	$push1106=, $7, $pop1105
 	call    	ur1428166432128@FUNCTION, $pop1106, $1
-	i32.load16_u	$push48=, 16($10)
+	i32.load16_u	$push48=, 16($7)
 	br_if   	1, $pop48       # 1: down to label0
-# BB#26:                                # %lor.lhs.false232
+# %bb.26:                               # %lor.lhs.false232
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push49=, 22($10)
-	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.load16_u	$push49=, 22($7)
+	i32.const	$push1246=, 65535
+	i32.and 	$push450=, $pop49, $pop1246
+	i32.load16_u	$push448=, 0($5)
+	i32.const	$push1245=, 7
+	i32.and 	$push449=, $pop448, $pop1245
 	i32.ne  	$push451=, $pop450, $pop449
 	br_if   	1, $pop451      # 1: down to label0
-# BB#27:                                # %if.end242
+# %bb.27:                               # %if.end242
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1107=, 16
-	i32.add 	$push1108=, $10, $pop1107
-	copy_local	$9=, $pop1108
+	i32.add 	$push1108=, $7, $pop1107
+	copy_local	$6=, $pop1108
 	#APP
 	#NO_APP
-	i32.load16_u	$push51=, 20($10)
-	i32.load16_u	$push53=, 0($2)
-	i32.const	$push1270=, 1
-	i32.and 	$push452=, $pop53, $pop1270
+	i32.load16_u	$push51=, 20($7)
+	i32.load16_u	$push53=, 4($1)
+	i32.const	$push1247=, 1
+	i32.and 	$push452=, $pop53, $pop1247
 	i32.ne  	$push453=, $pop51, $pop452
 	br_if   	1, $pop453      # 1: down to label0
-# BB#28:                                # %lor.lhs.false251
+# %bb.28:                               # %lor.lhs.false251
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push50=, 18($10)
-	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.load16_u	$push50=, 18($7)
+	i32.const	$push1249=, 65535
+	i32.and 	$push455=, $pop50, $pop1249
+	i32.load16_u	$push52=, 2($1)
+	i32.const	$push1248=, 3
+	i32.and 	$push454=, $pop52, $pop1248
 	i32.ne  	$push456=, $pop455, $pop454
 	br_if   	1, $pop456      # 1: down to label0
-# BB#29:                                # %if.end261
+# %bb.29:                               # %if.end261
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1109=, 16
-	i32.add 	$push1110=, $10, $pop1109
-	copy_local	$9=, $pop1110
+	i32.add 	$push1110=, $7, $pop1109
+	copy_local	$6=, $pop1110
 	#APP
 	#NO_APP
-	i32.load16_u	$push54=, 24($10)
-	i32.load16_u	$push56=, 0($4)
-	i32.const	$push1273=, 15
-	i32.and 	$push457=, $pop56, $pop1273
+	i32.load16_u	$push54=, 24($7)
+	i32.load16_u	$push56=, 8($1)
+	i32.const	$push1250=, 15
+	i32.and 	$push457=, $pop56, $pop1250
 	i32.ne  	$push458=, $pop54, $pop457
 	br_if   	1, $pop458      # 1: down to label0
-# BB#30:                                # %lor.lhs.false270
+# %bb.30:                               # %lor.lhs.false270
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push55=, 30($10)
-	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.load16_u	$push55=, 30($7)
+	i32.const	$push1252=, 65535
+	i32.and 	$push460=, $pop55, $pop1252
+	i32.load16_u	$push57=, 0($2)
+	i32.const	$push1251=, 127
+	i32.and 	$push459=, $pop57, $pop1251
 	i32.ne  	$push461=, $pop460, $pop459
 	br_if   	1, $pop461      # 1: down to label0
-# BB#31:                                # %if.end280
+# %bb.31:                               # %if.end280
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1111=, 16
-	i32.add 	$push1112=, $10, $pop1111
-	copy_local	$9=, $pop1112
+	i32.add 	$push1112=, $7, $pop1111
+	copy_local	$6=, $pop1112
 	#APP
 	#NO_APP
-	i32.load16_u	$push59=, 28($10)
-	i32.load16_u	$push61=, 0($6)
-	i32.const	$push1276=, 31
-	i32.and 	$push462=, $pop61, $pop1276
+	i32.load16_u	$push59=, 28($7)
+	i32.load16_u	$push61=, 0($3)
+	i32.const	$push1253=, 31
+	i32.and 	$push462=, $pop61, $pop1253
 	i32.ne  	$push463=, $pop59, $pop462
 	br_if   	1, $pop463      # 1: down to label0
-# BB#32:                                # %lor.lhs.false289
+# %bb.32:                               # %lor.lhs.false289
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push58=, 26($10)
-	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.load16_u	$push58=, 26($7)
+	i32.const	$push1255=, 65535
+	i32.and 	$push465=, $pop58, $pop1255
+	i32.load16_u	$push60=, 0($4)
+	i32.const	$push1254=, 63
+	i32.and 	$push464=, $pop60, $pop1254
 	i32.ne  	$push466=, $pop465, $pop464
 	br_if   	1, $pop466      # 1: down to label0
-# BB#33:                                # %if.end299
+# %bb.33:                               # %if.end299
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1113=, 16
-	i32.add 	$push1114=, $10, $pop1113
-	copy_local	$9=, $pop1114
+	i32.add 	$push1114=, $7, $pop1113
+	copy_local	$6=, $pop1114
 	#APP
 	#NO_APP
 	i32.const	$push1115=, 16
-	i32.add 	$push1116=, $10, $pop1115
+	i32.add 	$push1116=, $7, $pop1115
 	call    	uq33333333@FUNCTION, $pop1116, $1
-	i32.load16_u	$push62=, 16($10)
+	i32.load16_u	$push62=, 16($7)
 	i32.load16_u	$push64=, 0($1)
-	i32.const	$push1279=, 3
-	i32.div_u	$push467=, $pop64, $pop1279
+	i32.const	$push1256=, 3
+	i32.div_u	$push467=, $pop64, $pop1256
 	i32.ne  	$push468=, $pop62, $pop467
 	br_if   	1, $pop468      # 1: down to label0
-# BB#34:                                # %lor.lhs.false309
+# %bb.34:                               # %lor.lhs.false309
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push63=, 22($10)
-	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.load16_u	$push63=, 22($7)
+	i32.const	$push1259=, 65535
+	i32.and 	$push469=, $pop63, $pop1259
+	i32.load16_u	$push65=, 0($5)
+	i32.const	$push1258=, 65535
+	i32.and 	$push470=, $pop65, $pop1258
+	i32.const	$push1257=, 3
+	i32.div_u	$push471=, $pop470, $pop1257
 	i32.ne  	$push472=, $pop469, $pop471
 	br_if   	1, $pop472      # 1: down to label0
-# BB#35:                                # %if.end319
+# %bb.35:                               # %if.end319
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1117=, 16
-	i32.add 	$push1118=, $10, $pop1117
-	copy_local	$9=, $pop1118
+	i32.add 	$push1118=, $7, $pop1117
+	copy_local	$6=, $pop1118
 	#APP
 	#NO_APP
-	i32.load16_u	$push67=, 20($10)
-	i32.load16_u	$push69=, 0($2)
-	i32.const	$push1283=, 3
-	i32.div_u	$push473=, $pop69, $pop1283
+	i32.load16_u	$push67=, 20($7)
+	i32.load16_u	$push69=, 4($1)
+	i32.const	$push1260=, 3
+	i32.div_u	$push473=, $pop69, $pop1260
 	i32.ne  	$push474=, $pop67, $pop473
 	br_if   	1, $pop474      # 1: down to label0
-# BB#36:                                # %lor.lhs.false328
+# %bb.36:                               # %lor.lhs.false328
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push66=, 18($10)
-	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.load16_u	$push66=, 18($7)
+	i32.const	$push1263=, 65535
+	i32.and 	$push475=, $pop66, $pop1263
+	i32.load16_u	$push68=, 2($1)
+	i32.const	$push1262=, 65535
+	i32.and 	$push476=, $pop68, $pop1262
+	i32.const	$push1261=, 3
+	i32.div_u	$push477=, $pop476, $pop1261
 	i32.ne  	$push478=, $pop475, $pop477
 	br_if   	1, $pop478      # 1: down to label0
-# BB#37:                                # %if.end338
+# %bb.37:                               # %if.end338
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1119=, 16
-	i32.add 	$push1120=, $10, $pop1119
-	copy_local	$9=, $pop1120
+	i32.add 	$push1120=, $7, $pop1119
+	copy_local	$6=, $pop1120
 	#APP
 	#NO_APP
-	i32.load16_u	$push70=, 24($10)
-	i32.load16_u	$push72=, 0($4)
-	i32.const	$push1287=, 3
-	i32.div_u	$push479=, $pop72, $pop1287
+	i32.load16_u	$push70=, 24($7)
+	i32.load16_u	$push72=, 8($1)
+	i32.const	$push1264=, 3
+	i32.div_u	$push479=, $pop72, $pop1264
 	i32.ne  	$push480=, $pop70, $pop479
 	br_if   	1, $pop480      # 1: down to label0
-# BB#38:                                # %lor.lhs.false347
+# %bb.38:                               # %lor.lhs.false347
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push71=, 30($10)
-	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.load16_u	$push71=, 30($7)
+	i32.const	$push1267=, 65535
+	i32.and 	$push481=, $pop71, $pop1267
+	i32.load16_u	$push73=, 0($2)
+	i32.const	$push1266=, 65535
+	i32.and 	$push482=, $pop73, $pop1266
+	i32.const	$push1265=, 3
+	i32.div_u	$push483=, $pop482, $pop1265
 	i32.ne  	$push484=, $pop481, $pop483
 	br_if   	1, $pop484      # 1: down to label0
-# BB#39:                                # %if.end357
+# %bb.39:                               # %if.end357
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1121=, 16
-	i32.add 	$push1122=, $10, $pop1121
-	copy_local	$9=, $pop1122
+	i32.add 	$push1122=, $7, $pop1121
+	copy_local	$6=, $pop1122
 	#APP
 	#NO_APP
-	i32.load16_u	$push75=, 28($10)
-	i32.load16_u	$push77=, 0($6)
-	i32.const	$push1291=, 3
-	i32.div_u	$push485=, $pop77, $pop1291
+	i32.load16_u	$push75=, 28($7)
+	i32.load16_u	$push77=, 0($3)
+	i32.const	$push1268=, 3
+	i32.div_u	$push485=, $pop77, $pop1268
 	i32.ne  	$push486=, $pop75, $pop485
 	br_if   	1, $pop486      # 1: down to label0
-# BB#40:                                # %lor.lhs.false366
+# %bb.40:                               # %lor.lhs.false366
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push74=, 26($10)
-	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.load16_u	$push74=, 26($7)
+	i32.const	$push1271=, 65535
+	i32.and 	$push487=, $pop74, $pop1271
+	i32.load16_u	$push76=, 0($4)
+	i32.const	$push1270=, 65535
+	i32.and 	$push488=, $pop76, $pop1270
+	i32.const	$push1269=, 3
+	i32.div_u	$push489=, $pop488, $pop1269
 	i32.ne  	$push490=, $pop487, $pop489
 	br_if   	1, $pop490      # 1: down to label0
-# BB#41:                                # %if.end376
+# %bb.41:                               # %if.end376
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1123=, 16
-	i32.add 	$push1124=, $10, $pop1123
-	copy_local	$9=, $pop1124
+	i32.add 	$push1124=, $7, $pop1123
+	copy_local	$6=, $pop1124
 	#APP
 	#NO_APP
 	i32.const	$push1125=, 16
-	i32.add 	$push1126=, $10, $pop1125
+	i32.add 	$push1126=, $7, $pop1125
 	call    	ur33333333@FUNCTION, $pop1126, $1
-	i32.load16_u	$push78=, 16($10)
+	i32.load16_u	$push78=, 16($7)
 	i32.load16_u	$push80=, 0($1)
-	i32.const	$push1295=, 3
-	i32.rem_u	$push491=, $pop80, $pop1295
+	i32.const	$push1272=, 3
+	i32.rem_u	$push491=, $pop80, $pop1272
 	i32.ne  	$push492=, $pop78, $pop491
 	br_if   	1, $pop492      # 1: down to label0
-# BB#42:                                # %lor.lhs.false386
+# %bb.42:                               # %lor.lhs.false386
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push79=, 22($10)
-	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.load16_u	$push79=, 22($7)
+	i32.const	$push1275=, 65535
+	i32.and 	$push493=, $pop79, $pop1275
+	i32.load16_u	$push81=, 0($5)
+	i32.const	$push1274=, 65535
+	i32.and 	$push494=, $pop81, $pop1274
+	i32.const	$push1273=, 3
+	i32.rem_u	$push495=, $pop494, $pop1273
 	i32.ne  	$push496=, $pop493, $pop495
 	br_if   	1, $pop496      # 1: down to label0
-# BB#43:                                # %if.end396
+# %bb.43:                               # %if.end396
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1127=, 16
-	i32.add 	$push1128=, $10, $pop1127
-	copy_local	$9=, $pop1128
+	i32.add 	$push1128=, $7, $pop1127
+	copy_local	$6=, $pop1128
 	#APP
 	#NO_APP
-	i32.load16_u	$push83=, 20($10)
-	i32.load16_u	$push85=, 0($2)
-	i32.const	$push1299=, 3
-	i32.rem_u	$push497=, $pop85, $pop1299
+	i32.load16_u	$push83=, 20($7)
+	i32.load16_u	$push85=, 4($1)
+	i32.const	$push1276=, 3
+	i32.rem_u	$push497=, $pop85, $pop1276
 	i32.ne  	$push498=, $pop83, $pop497
 	br_if   	1, $pop498      # 1: down to label0
-# BB#44:                                # %lor.lhs.false405
+# %bb.44:                               # %lor.lhs.false405
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push82=, 18($10)
-	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.load16_u	$push82=, 18($7)
+	i32.const	$push1279=, 65535
+	i32.and 	$push499=, $pop82, $pop1279
+	i32.load16_u	$push84=, 2($1)
+	i32.const	$push1278=, 65535
+	i32.and 	$push500=, $pop84, $pop1278
+	i32.const	$push1277=, 3
+	i32.rem_u	$push501=, $pop500, $pop1277
 	i32.ne  	$push502=, $pop499, $pop501
 	br_if   	1, $pop502      # 1: down to label0
-# BB#45:                                # %if.end415
+# %bb.45:                               # %if.end415
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1129=, 16
-	i32.add 	$push1130=, $10, $pop1129
-	copy_local	$9=, $pop1130
+	i32.add 	$push1130=, $7, $pop1129
+	copy_local	$6=, $pop1130
 	#APP
 	#NO_APP
-	i32.load16_u	$push86=, 24($10)
-	i32.load16_u	$push88=, 0($4)
-	i32.const	$push1303=, 3
-	i32.rem_u	$push503=, $pop88, $pop1303
+	i32.load16_u	$push86=, 24($7)
+	i32.load16_u	$push88=, 8($1)
+	i32.const	$push1280=, 3
+	i32.rem_u	$push503=, $pop88, $pop1280
 	i32.ne  	$push504=, $pop86, $pop503
 	br_if   	1, $pop504      # 1: down to label0
-# BB#46:                                # %lor.lhs.false424
+# %bb.46:                               # %lor.lhs.false424
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push87=, 30($10)
-	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.load16_u	$push87=, 30($7)
+	i32.const	$push1283=, 65535
+	i32.and 	$push505=, $pop87, $pop1283
+	i32.load16_u	$push89=, 0($2)
+	i32.const	$push1282=, 65535
+	i32.and 	$push506=, $pop89, $pop1282
+	i32.const	$push1281=, 3
+	i32.rem_u	$push507=, $pop506, $pop1281
 	i32.ne  	$push508=, $pop505, $pop507
 	br_if   	1, $pop508      # 1: down to label0
-# BB#47:                                # %if.end434
+# %bb.47:                               # %if.end434
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1131=, 16
-	i32.add 	$push1132=, $10, $pop1131
-	copy_local	$9=, $pop1132
+	i32.add 	$push1132=, $7, $pop1131
+	copy_local	$6=, $pop1132
 	#APP
 	#NO_APP
-	i32.load16_u	$push91=, 28($10)
-	i32.load16_u	$push93=, 0($6)
-	i32.const	$push1307=, 3
-	i32.rem_u	$push509=, $pop93, $pop1307
+	i32.load16_u	$push91=, 28($7)
+	i32.load16_u	$push93=, 0($3)
+	i32.const	$push1284=, 3
+	i32.rem_u	$push509=, $pop93, $pop1284
 	i32.ne  	$push510=, $pop91, $pop509
 	br_if   	1, $pop510      # 1: down to label0
-# BB#48:                                # %lor.lhs.false443
+# %bb.48:                               # %lor.lhs.false443
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push90=, 26($10)
-	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.load16_u	$push90=, 26($7)
+	i32.const	$push1287=, 65535
+	i32.and 	$push511=, $pop90, $pop1287
+	i32.load16_u	$push92=, 0($4)
+	i32.const	$push1286=, 65535
+	i32.and 	$push512=, $pop92, $pop1286
+	i32.const	$push1285=, 3
+	i32.rem_u	$push513=, $pop512, $pop1285
 	i32.ne  	$push514=, $pop511, $pop513
 	br_if   	1, $pop514      # 1: down to label0
-# BB#49:                                # %if.end453
+# %bb.49:                               # %if.end453
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1133=, 16
-	i32.add 	$push1134=, $10, $pop1133
-	copy_local	$9=, $pop1134
+	i32.add 	$push1134=, $7, $pop1133
+	copy_local	$6=, $pop1134
 	#APP
 	#NO_APP
 	i32.const	$push1135=, 16
-	i32.add 	$push1136=, $10, $pop1135
+	i32.add 	$push1136=, $7, $pop1135
 	call    	uq65656565@FUNCTION, $pop1136, $1
-	i32.load16_u	$push94=, 16($10)
+	i32.load16_u	$push94=, 16($7)
 	i32.load16_u	$push96=, 0($1)
-	i32.const	$push1311=, 6
-	i32.div_u	$push515=, $pop96, $pop1311
+	i32.const	$push1288=, 6
+	i32.div_u	$push515=, $pop96, $pop1288
 	i32.ne  	$push516=, $pop94, $pop515
 	br_if   	1, $pop516      # 1: down to label0
-# BB#50:                                # %lor.lhs.false463
+# %bb.50:                               # %lor.lhs.false463
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push95=, 22($10)
-	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.load16_u	$push95=, 22($7)
+	i32.const	$push1291=, 65535
+	i32.and 	$push517=, $pop95, $pop1291
+	i32.load16_u	$push97=, 0($5)
+	i32.const	$push1290=, 65535
+	i32.and 	$push518=, $pop97, $pop1290
+	i32.const	$push1289=, 5
+	i32.div_u	$push519=, $pop518, $pop1289
 	i32.ne  	$push520=, $pop517, $pop519
 	br_if   	1, $pop520      # 1: down to label0
-# BB#51:                                # %if.end473
+# %bb.51:                               # %if.end473
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1137=, 16
-	i32.add 	$push1138=, $10, $pop1137
-	copy_local	$9=, $pop1138
+	i32.add 	$push1138=, $7, $pop1137
+	copy_local	$6=, $pop1138
 	#APP
 	#NO_APP
-	i32.load16_u	$push99=, 20($10)
-	i32.load16_u	$push101=, 0($2)
-	i32.const	$push1315=, 6
-	i32.div_u	$push521=, $pop101, $pop1315
+	i32.load16_u	$push99=, 20($7)
+	i32.load16_u	$push101=, 4($1)
+	i32.const	$push1292=, 6
+	i32.div_u	$push521=, $pop101, $pop1292
 	i32.ne  	$push522=, $pop99, $pop521
 	br_if   	1, $pop522      # 1: down to label0
-# BB#52:                                # %lor.lhs.false482
+# %bb.52:                               # %lor.lhs.false482
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push98=, 18($10)
-	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.load16_u	$push98=, 18($7)
+	i32.const	$push1295=, 65535
+	i32.and 	$push523=, $pop98, $pop1295
+	i32.load16_u	$push100=, 2($1)
+	i32.const	$push1294=, 65535
+	i32.and 	$push524=, $pop100, $pop1294
+	i32.const	$push1293=, 5
+	i32.div_u	$push525=, $pop524, $pop1293
 	i32.ne  	$push526=, $pop523, $pop525
 	br_if   	1, $pop526      # 1: down to label0
-# BB#53:                                # %if.end492
+# %bb.53:                               # %if.end492
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1139=, 16
-	i32.add 	$push1140=, $10, $pop1139
-	copy_local	$9=, $pop1140
+	i32.add 	$push1140=, $7, $pop1139
+	copy_local	$6=, $pop1140
 	#APP
 	#NO_APP
-	i32.load16_u	$push102=, 24($10)
-	i32.load16_u	$push104=, 0($4)
-	i32.const	$push1319=, 6
-	i32.div_u	$push527=, $pop104, $pop1319
+	i32.load16_u	$push102=, 24($7)
+	i32.load16_u	$push104=, 8($1)
+	i32.const	$push1296=, 6
+	i32.div_u	$push527=, $pop104, $pop1296
 	i32.ne  	$push528=, $pop102, $pop527
 	br_if   	1, $pop528      # 1: down to label0
-# BB#54:                                # %lor.lhs.false501
+# %bb.54:                               # %lor.lhs.false501
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push103=, 30($10)
-	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.load16_u	$push103=, 30($7)
+	i32.const	$push1299=, 65535
+	i32.and 	$push529=, $pop103, $pop1299
+	i32.load16_u	$push105=, 0($2)
+	i32.const	$push1298=, 65535
+	i32.and 	$push530=, $pop105, $pop1298
+	i32.const	$push1297=, 5
+	i32.div_u	$push531=, $pop530, $pop1297
 	i32.ne  	$push532=, $pop529, $pop531
 	br_if   	1, $pop532      # 1: down to label0
-# BB#55:                                # %if.end511
+# %bb.55:                               # %if.end511
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1141=, 16
-	i32.add 	$push1142=, $10, $pop1141
-	copy_local	$9=, $pop1142
+	i32.add 	$push1142=, $7, $pop1141
+	copy_local	$6=, $pop1142
 	#APP
 	#NO_APP
-	i32.load16_u	$push107=, 28($10)
-	i32.load16_u	$push109=, 0($6)
-	i32.const	$push1323=, 6
-	i32.div_u	$push533=, $pop109, $pop1323
+	i32.load16_u	$push107=, 28($7)
+	i32.load16_u	$push109=, 0($3)
+	i32.const	$push1300=, 6
+	i32.div_u	$push533=, $pop109, $pop1300
 	i32.ne  	$push534=, $pop107, $pop533
 	br_if   	1, $pop534      # 1: down to label0
-# BB#56:                                # %lor.lhs.false520
+# %bb.56:                               # %lor.lhs.false520
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push106=, 26($10)
-	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.load16_u	$push106=, 26($7)
+	i32.const	$push1303=, 65535
+	i32.and 	$push535=, $pop106, $pop1303
+	i32.load16_u	$push108=, 0($4)
+	i32.const	$push1302=, 65535
+	i32.and 	$push536=, $pop108, $pop1302
+	i32.const	$push1301=, 5
+	i32.div_u	$push537=, $pop536, $pop1301
 	i32.ne  	$push538=, $pop535, $pop537
 	br_if   	1, $pop538      # 1: down to label0
-# BB#57:                                # %if.end530
+# %bb.57:                               # %if.end530
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1143=, 16
-	i32.add 	$push1144=, $10, $pop1143
-	copy_local	$9=, $pop1144
+	i32.add 	$push1144=, $7, $pop1143
+	copy_local	$6=, $pop1144
 	#APP
 	#NO_APP
 	i32.const	$push1145=, 16
-	i32.add 	$push1146=, $10, $pop1145
+	i32.add 	$push1146=, $7, $pop1145
 	call    	ur65656565@FUNCTION, $pop1146, $1
-	i32.load16_u	$push110=, 16($10)
+	i32.load16_u	$push110=, 16($7)
 	i32.load16_u	$push112=, 0($1)
-	i32.const	$push1327=, 6
-	i32.rem_u	$push539=, $pop112, $pop1327
+	i32.const	$push1304=, 6
+	i32.rem_u	$push539=, $pop112, $pop1304
 	i32.ne  	$push540=, $pop110, $pop539
 	br_if   	1, $pop540      # 1: down to label0
-# BB#58:                                # %lor.lhs.false540
+# %bb.58:                               # %lor.lhs.false540
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push111=, 22($10)
-	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.load16_u	$push111=, 22($7)
+	i32.const	$push1307=, 65535
+	i32.and 	$push541=, $pop111, $pop1307
+	i32.load16_u	$push113=, 0($5)
+	i32.const	$push1306=, 65535
+	i32.and 	$push542=, $pop113, $pop1306
+	i32.const	$push1305=, 5
+	i32.rem_u	$push543=, $pop542, $pop1305
 	i32.ne  	$push544=, $pop541, $pop543
 	br_if   	1, $pop544      # 1: down to label0
-# BB#59:                                # %if.end550
+# %bb.59:                               # %if.end550
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1147=, 16
-	i32.add 	$push1148=, $10, $pop1147
-	copy_local	$9=, $pop1148
+	i32.add 	$push1148=, $7, $pop1147
+	copy_local	$6=, $pop1148
 	#APP
 	#NO_APP
-	i32.load16_u	$push115=, 20($10)
-	i32.load16_u	$push117=, 0($2)
-	i32.const	$push1331=, 6
-	i32.rem_u	$push545=, $pop117, $pop1331
+	i32.load16_u	$push115=, 20($7)
+	i32.load16_u	$push117=, 4($1)
+	i32.const	$push1308=, 6
+	i32.rem_u	$push545=, $pop117, $pop1308
 	i32.ne  	$push546=, $pop115, $pop545
 	br_if   	1, $pop546      # 1: down to label0
-# BB#60:                                # %lor.lhs.false559
+# %bb.60:                               # %lor.lhs.false559
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push114=, 18($10)
-	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.load16_u	$push114=, 18($7)
+	i32.const	$push1311=, 65535
+	i32.and 	$push547=, $pop114, $pop1311
+	i32.load16_u	$push116=, 2($1)
+	i32.const	$push1310=, 65535
+	i32.and 	$push548=, $pop116, $pop1310
+	i32.const	$push1309=, 5
+	i32.rem_u	$push549=, $pop548, $pop1309
 	i32.ne  	$push550=, $pop547, $pop549
 	br_if   	1, $pop550      # 1: down to label0
-# BB#61:                                # %if.end569
+# %bb.61:                               # %if.end569
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1149=, 16
-	i32.add 	$push1150=, $10, $pop1149
-	copy_local	$9=, $pop1150
+	i32.add 	$push1150=, $7, $pop1149
+	copy_local	$6=, $pop1150
 	#APP
 	#NO_APP
-	i32.load16_u	$push118=, 24($10)
-	i32.load16_u	$push120=, 0($4)
-	i32.const	$push1335=, 6
-	i32.rem_u	$push551=, $pop120, $pop1335
+	i32.load16_u	$push118=, 24($7)
+	i32.load16_u	$push120=, 8($1)
+	i32.const	$push1312=, 6
+	i32.rem_u	$push551=, $pop120, $pop1312
 	i32.ne  	$push552=, $pop118, $pop551
 	br_if   	1, $pop552      # 1: down to label0
-# BB#62:                                # %lor.lhs.false578
+# %bb.62:                               # %lor.lhs.false578
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push119=, 30($10)
-	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.load16_u	$push119=, 30($7)
+	i32.const	$push1315=, 65535
+	i32.and 	$push553=, $pop119, $pop1315
+	i32.load16_u	$push121=, 0($2)
+	i32.const	$push1314=, 65535
+	i32.and 	$push554=, $pop121, $pop1314
+	i32.const	$push1313=, 5
+	i32.rem_u	$push555=, $pop554, $pop1313
 	i32.ne  	$push556=, $pop553, $pop555
 	br_if   	1, $pop556      # 1: down to label0
-# BB#63:                                # %if.end588
+# %bb.63:                               # %if.end588
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1151=, 16
-	i32.add 	$push1152=, $10, $pop1151
-	copy_local	$9=, $pop1152
+	i32.add 	$push1152=, $7, $pop1151
+	copy_local	$6=, $pop1152
 	#APP
 	#NO_APP
-	i32.load16_u	$push123=, 28($10)
-	i32.load16_u	$push125=, 0($6)
-	i32.const	$push1339=, 6
-	i32.rem_u	$push557=, $pop125, $pop1339
+	i32.load16_u	$push123=, 28($7)
+	i32.load16_u	$push125=, 0($3)
+	i32.const	$push1316=, 6
+	i32.rem_u	$push557=, $pop125, $pop1316
 	i32.ne  	$push558=, $pop123, $pop557
 	br_if   	1, $pop558      # 1: down to label0
-# BB#64:                                # %lor.lhs.false597
+# %bb.64:                               # %lor.lhs.false597
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push122=, 26($10)
-	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.load16_u	$push122=, 26($7)
+	i32.const	$push1319=, 65535
+	i32.and 	$push559=, $pop122, $pop1319
+	i32.load16_u	$push124=, 0($4)
+	i32.const	$push1318=, 65535
+	i32.and 	$push560=, $pop124, $pop1318
+	i32.const	$push1317=, 5
+	i32.rem_u	$push561=, $pop560, $pop1317
 	i32.ne  	$push562=, $pop559, $pop561
 	br_if   	1, $pop562      # 1: down to label0
-# BB#65:                                # %if.end607
+# %bb.65:                               # %if.end607
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1153=, 16
-	i32.add 	$push1154=, $10, $pop1153
-	copy_local	$9=, $pop1154
+	i32.add 	$push1154=, $7, $pop1153
+	copy_local	$6=, $pop1154
 	#APP
 	#NO_APP
 	i32.const	$push1155=, 16
-	i32.add 	$push1156=, $10, $pop1155
+	i32.add 	$push1156=, $7, $pop1155
 	call    	uq14141461461414@FUNCTION, $pop1156, $1
-	i32.load16_u	$push126=, 16($10)
+	i32.load16_u	$push126=, 16($7)
 	i32.load16_u	$push128=, 0($1)
-	i32.const	$push1343=, 14
-	i32.div_u	$push563=, $pop128, $pop1343
+	i32.const	$push1320=, 14
+	i32.div_u	$push563=, $pop128, $pop1320
 	i32.ne  	$push564=, $pop126, $pop563
 	br_if   	1, $pop564      # 1: down to label0
-# BB#66:                                # %lor.lhs.false617
+# %bb.66:                               # %lor.lhs.false617
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push127=, 22($10)
-	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.load16_u	$push127=, 22($7)
+	i32.const	$push1323=, 65535
+	i32.and 	$push565=, $pop127, $pop1323
+	i32.load16_u	$push129=, 0($5)
+	i32.const	$push1322=, 65535
+	i32.and 	$push566=, $pop129, $pop1322
+	i32.const	$push1321=, 6
+	i32.div_u	$push567=, $pop566, $pop1321
 	i32.ne  	$push568=, $pop565, $pop567
 	br_if   	1, $pop568      # 1: down to label0
-# BB#67:                                # %if.end627
+# %bb.67:                               # %if.end627
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1157=, 16
-	i32.add 	$push1158=, $10, $pop1157
-	copy_local	$9=, $pop1158
+	i32.add 	$push1158=, $7, $pop1157
+	copy_local	$6=, $pop1158
 	#APP
 	#NO_APP
-	i32.load16_u	$push131=, 20($10)
-	i32.load16_u	$push133=, 0($2)
-	i32.const	$push1347=, 14
-	i32.div_u	$push569=, $pop133, $pop1347
+	i32.load16_u	$push131=, 20($7)
+	i32.load16_u	$push133=, 4($1)
+	i32.const	$push1324=, 14
+	i32.div_u	$push569=, $pop133, $pop1324
 	i32.ne  	$push570=, $pop131, $pop569
 	br_if   	1, $pop570      # 1: down to label0
-# BB#68:                                # %lor.lhs.false636
+# %bb.68:                               # %lor.lhs.false636
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push130=, 18($10)
-	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.load16_u	$push130=, 18($7)
+	i32.const	$push1327=, 65535
+	i32.and 	$push571=, $pop130, $pop1327
+	i32.load16_u	$push132=, 2($1)
+	i32.const	$push1326=, 65535
+	i32.and 	$push572=, $pop132, $pop1326
+	i32.const	$push1325=, 14
+	i32.div_u	$push573=, $pop572, $pop1325
 	i32.ne  	$push574=, $pop571, $pop573
 	br_if   	1, $pop574      # 1: down to label0
-# BB#69:                                # %if.end646
+# %bb.69:                               # %if.end646
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1159=, 16
-	i32.add 	$push1160=, $10, $pop1159
-	copy_local	$9=, $pop1160
+	i32.add 	$push1160=, $7, $pop1159
+	copy_local	$6=, $pop1160
 	#APP
 	#NO_APP
-	i32.load16_u	$push134=, 24($10)
-	i32.load16_u	$push136=, 0($4)
-	i32.const	$push1351=, 14
-	i32.div_u	$push575=, $pop136, $pop1351
+	i32.load16_u	$push134=, 24($7)
+	i32.load16_u	$push136=, 8($1)
+	i32.const	$push1328=, 14
+	i32.div_u	$push575=, $pop136, $pop1328
 	i32.ne  	$push576=, $pop134, $pop575
 	br_if   	1, $pop576      # 1: down to label0
-# BB#70:                                # %lor.lhs.false655
+# %bb.70:                               # %lor.lhs.false655
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push135=, 30($10)
-	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.load16_u	$push135=, 30($7)
+	i32.const	$push1331=, 65535
+	i32.and 	$push577=, $pop135, $pop1331
+	i32.load16_u	$push137=, 0($2)
+	i32.const	$push1330=, 65535
+	i32.and 	$push578=, $pop137, $pop1330
+	i32.const	$push1329=, 14
+	i32.div_u	$push579=, $pop578, $pop1329
 	i32.ne  	$push580=, $pop577, $pop579
 	br_if   	1, $pop580      # 1: down to label0
-# BB#71:                                # %if.end665
+# %bb.71:                               # %if.end665
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1161=, 16
-	i32.add 	$push1162=, $10, $pop1161
-	copy_local	$9=, $pop1162
+	i32.add 	$push1162=, $7, $pop1161
+	copy_local	$6=, $pop1162
 	#APP
 	#NO_APP
-	i32.load16_u	$push139=, 28($10)
-	i32.load16_u	$push141=, 0($6)
-	i32.const	$push1355=, 14
-	i32.div_u	$push581=, $pop141, $pop1355
+	i32.load16_u	$push139=, 28($7)
+	i32.load16_u	$push141=, 0($3)
+	i32.const	$push1332=, 14
+	i32.div_u	$push581=, $pop141, $pop1332
 	i32.ne  	$push582=, $pop139, $pop581
 	br_if   	1, $pop582      # 1: down to label0
-# BB#72:                                # %lor.lhs.false674
+# %bb.72:                               # %lor.lhs.false674
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push138=, 26($10)
-	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.load16_u	$push138=, 26($7)
+	i32.const	$push1335=, 65535
+	i32.and 	$push583=, $pop138, $pop1335
+	i32.load16_u	$push140=, 0($4)
+	i32.const	$push1334=, 65535
+	i32.and 	$push584=, $pop140, $pop1334
+	i32.const	$push1333=, 6
+	i32.div_u	$push585=, $pop584, $pop1333
 	i32.ne  	$push586=, $pop583, $pop585
 	br_if   	1, $pop586      # 1: down to label0
-# BB#73:                                # %if.end684
+# %bb.73:                               # %if.end684
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1163=, 16
-	i32.add 	$push1164=, $10, $pop1163
-	copy_local	$9=, $pop1164
+	i32.add 	$push1164=, $7, $pop1163
+	copy_local	$6=, $pop1164
 	#APP
 	#NO_APP
 	i32.const	$push1165=, 16
-	i32.add 	$push1166=, $10, $pop1165
+	i32.add 	$push1166=, $7, $pop1165
 	call    	ur14141461461414@FUNCTION, $pop1166, $1
-	i32.load16_u	$push142=, 16($10)
+	i32.load16_u	$push142=, 16($7)
 	i32.load16_u	$push144=, 0($1)
-	i32.const	$push1359=, 14
-	i32.rem_u	$push587=, $pop144, $pop1359
+	i32.const	$push1336=, 14
+	i32.rem_u	$push587=, $pop144, $pop1336
 	i32.ne  	$push588=, $pop142, $pop587
 	br_if   	1, $pop588      # 1: down to label0
-# BB#74:                                # %lor.lhs.false694
+# %bb.74:                               # %lor.lhs.false694
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push143=, 22($10)
-	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.load16_u	$push143=, 22($7)
+	i32.const	$push1339=, 65535
+	i32.and 	$push589=, $pop143, $pop1339
+	i32.load16_u	$push145=, 0($5)
+	i32.const	$push1338=, 65535
+	i32.and 	$push590=, $pop145, $pop1338
+	i32.const	$push1337=, 6
+	i32.rem_u	$push591=, $pop590, $pop1337
 	i32.ne  	$push592=, $pop589, $pop591
 	br_if   	1, $pop592      # 1: down to label0
-# BB#75:                                # %if.end704
+# %bb.75:                               # %if.end704
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1167=, 16
-	i32.add 	$push1168=, $10, $pop1167
-	copy_local	$9=, $pop1168
+	i32.add 	$push1168=, $7, $pop1167
+	copy_local	$6=, $pop1168
 	#APP
 	#NO_APP
-	i32.load16_u	$push147=, 20($10)
-	i32.load16_u	$push149=, 0($2)
-	i32.const	$push1363=, 14
-	i32.rem_u	$push593=, $pop149, $pop1363
+	i32.load16_u	$push147=, 20($7)
+	i32.load16_u	$push149=, 4($1)
+	i32.const	$push1340=, 14
+	i32.rem_u	$push593=, $pop149, $pop1340
 	i32.ne  	$push594=, $pop147, $pop593
 	br_if   	1, $pop594      # 1: down to label0
-# BB#76:                                # %lor.lhs.false713
+# %bb.76:                               # %lor.lhs.false713
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push146=, 18($10)
-	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.load16_u	$push146=, 18($7)
+	i32.const	$push1343=, 65535
+	i32.and 	$push595=, $pop146, $pop1343
+	i32.load16_u	$push148=, 2($1)
+	i32.const	$push1342=, 65535
+	i32.and 	$push596=, $pop148, $pop1342
+	i32.const	$push1341=, 14
+	i32.rem_u	$push597=, $pop596, $pop1341
 	i32.ne  	$push598=, $pop595, $pop597
 	br_if   	1, $pop598      # 1: down to label0
-# BB#77:                                # %if.end723
+# %bb.77:                               # %if.end723
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1169=, 16
-	i32.add 	$push1170=, $10, $pop1169
-	copy_local	$9=, $pop1170
+	i32.add 	$push1170=, $7, $pop1169
+	copy_local	$6=, $pop1170
 	#APP
 	#NO_APP
-	i32.load16_u	$push150=, 24($10)
-	i32.load16_u	$push152=, 0($4)
-	i32.const	$push1367=, 14
-	i32.rem_u	$push599=, $pop152, $pop1367
+	i32.load16_u	$push150=, 24($7)
+	i32.load16_u	$push152=, 8($1)
+	i32.const	$push1344=, 14
+	i32.rem_u	$push599=, $pop152, $pop1344
 	i32.ne  	$push600=, $pop150, $pop599
 	br_if   	1, $pop600      # 1: down to label0
-# BB#78:                                # %lor.lhs.false732
+# %bb.78:                               # %lor.lhs.false732
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push151=, 30($10)
-	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.load16_u	$push151=, 30($7)
+	i32.const	$push1347=, 65535
+	i32.and 	$push601=, $pop151, $pop1347
+	i32.load16_u	$push153=, 0($2)
+	i32.const	$push1346=, 65535
+	i32.and 	$push602=, $pop153, $pop1346
+	i32.const	$push1345=, 14
+	i32.rem_u	$push603=, $pop602, $pop1345
 	i32.ne  	$push604=, $pop601, $pop603
 	br_if   	1, $pop604      # 1: down to label0
-# BB#79:                                # %if.end742
+# %bb.79:                               # %if.end742
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1171=, 16
-	i32.add 	$push1172=, $10, $pop1171
-	copy_local	$9=, $pop1172
+	i32.add 	$push1172=, $7, $pop1171
+	copy_local	$6=, $pop1172
 	#APP
 	#NO_APP
-	i32.load16_u	$push155=, 28($10)
-	i32.load16_u	$push157=, 0($6)
-	i32.const	$push1371=, 14
-	i32.rem_u	$push605=, $pop157, $pop1371
+	i32.load16_u	$push155=, 28($7)
+	i32.load16_u	$push157=, 0($3)
+	i32.const	$push1348=, 14
+	i32.rem_u	$push605=, $pop157, $pop1348
 	i32.ne  	$push606=, $pop155, $pop605
 	br_if   	1, $pop606      # 1: down to label0
-# BB#80:                                # %lor.lhs.false751
+# %bb.80:                               # %lor.lhs.false751
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push154=, 26($10)
-	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.load16_u	$push154=, 26($7)
+	i32.const	$push1351=, 65535
+	i32.and 	$push607=, $pop154, $pop1351
+	i32.load16_u	$push156=, 0($4)
+	i32.const	$push1350=, 65535
+	i32.and 	$push608=, $pop156, $pop1350
+	i32.const	$push1349=, 6
+	i32.rem_u	$push609=, $pop608, $pop1349
 	i32.ne  	$push610=, $pop607, $pop609
 	br_if   	1, $pop610      # 1: down to label0
-# BB#81:                                # %if.end761
+# %bb.81:                               # %if.end761
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1173=, 16
-	i32.add 	$push1174=, $10, $pop1173
-	copy_local	$9=, $pop1174
+	i32.add 	$push1174=, $7, $pop1173
+	copy_local	$6=, $pop1174
 	#APP
 	#NO_APP
 	i32.const	$push1175=, 16
-	i32.add 	$push1176=, $10, $pop1175
+	i32.add 	$push1176=, $7, $pop1175
 	call    	uq77777777@FUNCTION, $pop1176, $1
-	i32.load16_u	$push158=, 16($10)
+	i32.load16_u	$push158=, 16($7)
 	i32.load16_u	$push160=, 0($1)
-	i32.const	$push1375=, 7
-	i32.div_u	$push611=, $pop160, $pop1375
+	i32.const	$push1352=, 7
+	i32.div_u	$push611=, $pop160, $pop1352
 	i32.ne  	$push612=, $pop158, $pop611
 	br_if   	1, $pop612      # 1: down to label0
-# BB#82:                                # %lor.lhs.false771
+# %bb.82:                               # %lor.lhs.false771
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push159=, 22($10)
-	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.load16_u	$push159=, 22($7)
+	i32.const	$push1355=, 65535
+	i32.and 	$push613=, $pop159, $pop1355
+	i32.load16_u	$push161=, 0($5)
+	i32.const	$push1354=, 65535
+	i32.and 	$push614=, $pop161, $pop1354
+	i32.const	$push1353=, 7
+	i32.div_u	$push615=, $pop614, $pop1353
 	i32.ne  	$push616=, $pop613, $pop615
 	br_if   	1, $pop616      # 1: down to label0
-# BB#83:                                # %if.end781
+# %bb.83:                               # %if.end781
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1177=, 16
-	i32.add 	$push1178=, $10, $pop1177
-	copy_local	$9=, $pop1178
+	i32.add 	$push1178=, $7, $pop1177
+	copy_local	$6=, $pop1178
 	#APP
 	#NO_APP
-	i32.load16_u	$push163=, 20($10)
-	i32.load16_u	$push165=, 0($2)
-	i32.const	$push1379=, 7
-	i32.div_u	$push617=, $pop165, $pop1379
+	i32.load16_u	$push163=, 20($7)
+	i32.load16_u	$push165=, 4($1)
+	i32.const	$push1356=, 7
+	i32.div_u	$push617=, $pop165, $pop1356
 	i32.ne  	$push618=, $pop163, $pop617
 	br_if   	1, $pop618      # 1: down to label0
-# BB#84:                                # %lor.lhs.false790
+# %bb.84:                               # %lor.lhs.false790
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push162=, 18($10)
-	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.load16_u	$push162=, 18($7)
+	i32.const	$push1359=, 65535
+	i32.and 	$push619=, $pop162, $pop1359
+	i32.load16_u	$push164=, 2($1)
+	i32.const	$push1358=, 65535
+	i32.and 	$push620=, $pop164, $pop1358
+	i32.const	$push1357=, 7
+	i32.div_u	$push621=, $pop620, $pop1357
 	i32.ne  	$push622=, $pop619, $pop621
 	br_if   	1, $pop622      # 1: down to label0
-# BB#85:                                # %if.end800
+# %bb.85:                               # %if.end800
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1179=, 16
-	i32.add 	$push1180=, $10, $pop1179
-	copy_local	$9=, $pop1180
+	i32.add 	$push1180=, $7, $pop1179
+	copy_local	$6=, $pop1180
 	#APP
 	#NO_APP
-	i32.load16_u	$push166=, 24($10)
-	i32.load16_u	$push168=, 0($4)
-	i32.const	$push1383=, 7
-	i32.div_u	$push623=, $pop168, $pop1383
+	i32.load16_u	$push166=, 24($7)
+	i32.load16_u	$push168=, 8($1)
+	i32.const	$push1360=, 7
+	i32.div_u	$push623=, $pop168, $pop1360
 	i32.ne  	$push624=, $pop166, $pop623
 	br_if   	1, $pop624      # 1: down to label0
-# BB#86:                                # %lor.lhs.false809
+# %bb.86:                               # %lor.lhs.false809
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push167=, 30($10)
-	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.load16_u	$push167=, 30($7)
+	i32.const	$push1363=, 65535
+	i32.and 	$push625=, $pop167, $pop1363
+	i32.load16_u	$push169=, 0($2)
+	i32.const	$push1362=, 65535
+	i32.and 	$push626=, $pop169, $pop1362
+	i32.const	$push1361=, 7
+	i32.div_u	$push627=, $pop626, $pop1361
 	i32.ne  	$push628=, $pop625, $pop627
 	br_if   	1, $pop628      # 1: down to label0
-# BB#87:                                # %if.end819
+# %bb.87:                               # %if.end819
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1181=, 16
-	i32.add 	$push1182=, $10, $pop1181
-	copy_local	$9=, $pop1182
+	i32.add 	$push1182=, $7, $pop1181
+	copy_local	$6=, $pop1182
 	#APP
 	#NO_APP
-	i32.load16_u	$push171=, 28($10)
-	i32.load16_u	$push173=, 0($6)
-	i32.const	$push1387=, 7
-	i32.div_u	$push629=, $pop173, $pop1387
+	i32.load16_u	$push171=, 28($7)
+	i32.load16_u	$push173=, 0($3)
+	i32.const	$push1364=, 7
+	i32.div_u	$push629=, $pop173, $pop1364
 	i32.ne  	$push630=, $pop171, $pop629
 	br_if   	1, $pop630      # 1: down to label0
-# BB#88:                                # %lor.lhs.false828
+# %bb.88:                               # %lor.lhs.false828
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push170=, 26($10)
-	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.load16_u	$push170=, 26($7)
+	i32.const	$push1367=, 65535
+	i32.and 	$push631=, $pop170, $pop1367
+	i32.load16_u	$push172=, 0($4)
+	i32.const	$push1366=, 65535
+	i32.and 	$push632=, $pop172, $pop1366
+	i32.const	$push1365=, 7
+	i32.div_u	$push633=, $pop632, $pop1365
 	i32.ne  	$push634=, $pop631, $pop633
 	br_if   	1, $pop634      # 1: down to label0
-# BB#89:                                # %if.end838
+# %bb.89:                               # %if.end838
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1183=, 16
-	i32.add 	$push1184=, $10, $pop1183
-	copy_local	$9=, $pop1184
+	i32.add 	$push1184=, $7, $pop1183
+	copy_local	$6=, $pop1184
 	#APP
 	#NO_APP
 	i32.const	$push1185=, 16
-	i32.add 	$push1186=, $10, $pop1185
+	i32.add 	$push1186=, $7, $pop1185
 	call    	ur77777777@FUNCTION, $pop1186, $1
-	i32.load16_u	$push174=, 16($10)
+	i32.load16_u	$push174=, 16($7)
 	i32.load16_u	$push176=, 0($1)
-	i32.const	$push1391=, 7
-	i32.rem_u	$push635=, $pop176, $pop1391
+	i32.const	$push1368=, 7
+	i32.rem_u	$push635=, $pop176, $pop1368
 	i32.ne  	$push636=, $pop174, $pop635
 	br_if   	1, $pop636      # 1: down to label0
-# BB#90:                                # %lor.lhs.false848
+# %bb.90:                               # %lor.lhs.false848
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push175=, 22($10)
-	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.load16_u	$push175=, 22($7)
+	i32.const	$push1371=, 65535
+	i32.and 	$push637=, $pop175, $pop1371
+	i32.load16_u	$push177=, 0($5)
+	i32.const	$push1370=, 65535
+	i32.and 	$push638=, $pop177, $pop1370
+	i32.const	$push1369=, 7
+	i32.rem_u	$push639=, $pop638, $pop1369
 	i32.ne  	$push640=, $pop637, $pop639
 	br_if   	1, $pop640      # 1: down to label0
-# BB#91:                                # %if.end858
+# %bb.91:                               # %if.end858
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1187=, 16
-	i32.add 	$push1188=, $10, $pop1187
-	copy_local	$1=, $pop1188
+	i32.add 	$push1188=, $7, $pop1187
+	copy_local	$5=, $pop1188
 	#APP
 	#NO_APP
-	i32.load16_u	$push179=, 20($10)
-	i32.load16_u	$push181=, 0($2)
-	i32.const	$push1395=, 7
-	i32.rem_u	$push641=, $pop181, $pop1395
+	i32.load16_u	$push179=, 20($7)
+	i32.load16_u	$push181=, 4($1)
+	i32.const	$push1372=, 7
+	i32.rem_u	$push641=, $pop181, $pop1372
 	i32.ne  	$push642=, $pop179, $pop641
 	br_if   	1, $pop642      # 1: down to label0
-# BB#92:                                # %lor.lhs.false867
+# %bb.92:                               # %lor.lhs.false867
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push178=, 18($10)
-	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.load16_u	$push178=, 18($7)
+	i32.const	$push1375=, 65535
+	i32.and 	$push643=, $pop178, $pop1375
+	i32.load16_u	$push180=, 2($1)
+	i32.const	$push1374=, 65535
+	i32.and 	$push644=, $pop180, $pop1374
+	i32.const	$push1373=, 7
+	i32.rem_u	$push645=, $pop644, $pop1373
 	i32.ne  	$push646=, $pop643, $pop645
 	br_if   	1, $pop646      # 1: down to label0
-# BB#93:                                # %if.end877
+# %bb.93:                               # %if.end877
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1189=, 16
-	i32.add 	$push1190=, $10, $pop1189
-	copy_local	$1=, $pop1190
+	i32.add 	$push1190=, $7, $pop1189
+	copy_local	$5=, $pop1190
 	#APP
 	#NO_APP
-	i32.load16_u	$push182=, 24($10)
-	i32.load16_u	$push184=, 0($4)
-	i32.const	$push1399=, 7
-	i32.rem_u	$push647=, $pop184, $pop1399
+	i32.load16_u	$push182=, 24($7)
+	i32.load16_u	$push184=, 8($1)
+	i32.const	$push1376=, 7
+	i32.rem_u	$push647=, $pop184, $pop1376
 	i32.ne  	$push648=, $pop182, $pop647
 	br_if   	1, $pop648      # 1: down to label0
-# BB#94:                                # %lor.lhs.false886
+# %bb.94:                               # %lor.lhs.false886
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push183=, 30($10)
-	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.load16_u	$push183=, 30($7)
+	i32.const	$push1379=, 65535
+	i32.and 	$push649=, $pop183, $pop1379
+	i32.load16_u	$push185=, 0($2)
+	i32.const	$push1378=, 65535
+	i32.and 	$push650=, $pop185, $pop1378
+	i32.const	$push1377=, 7
+	i32.rem_u	$push651=, $pop650, $pop1377
 	i32.ne  	$push652=, $pop649, $pop651
 	br_if   	1, $pop652      # 1: down to label0
-# BB#95:                                # %if.end896
+# %bb.95:                               # %if.end896
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1191=, 16
-	i32.add 	$push1192=, $10, $pop1191
+	i32.add 	$push1192=, $7, $pop1191
 	copy_local	$1=, $pop1192
 	#APP
 	#NO_APP
-	i32.load16_u	$push187=, 28($10)
-	i32.load16_u	$push189=, 0($6)
-	i32.const	$push1403=, 7
-	i32.rem_u	$push653=, $pop189, $pop1403
+	i32.load16_u	$push187=, 28($7)
+	i32.load16_u	$push189=, 0($3)
+	i32.const	$push1380=, 7
+	i32.rem_u	$push653=, $pop189, $pop1380
 	i32.ne  	$push654=, $pop187, $pop653
 	br_if   	1, $pop654      # 1: down to label0
-# BB#96:                                # %lor.lhs.false905
+# %bb.96:                               # %lor.lhs.false905
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load16_u	$push186=, 26($10)
-	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.load16_u	$push186=, 26($7)
+	i32.const	$push1383=, 65535
+	i32.and 	$push655=, $pop186, $pop1383
+	i32.load16_u	$push188=, 0($4)
+	i32.const	$push1382=, 65535
+	i32.and 	$push656=, $pop188, $pop1382
+	i32.const	$push1381=, 7
+	i32.rem_u	$push657=, $pop656, $pop1381
 	i32.ne  	$push658=, $pop655, $pop657
 	br_if   	1, $pop658      # 1: down to label0
-# BB#97:                                # %if.end915
+# %bb.97:                               # %if.end915
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push1193=, 16
-	i32.add 	$push1194=, $10, $pop1193
+	i32.add 	$push1194=, $7, $pop1193
 	copy_local	$1=, $pop1194
 	#APP
 	#NO_APP
 	i32.const	$push659=, 1
 	i32.add 	$1=, $0, $pop659
 	i32.const	$0=, 1
-	i32.const	$push1407=, 2
-	i32.lt_u	$push660=, $1, $pop1407
+	i32.const	$push1384=, 2
+	i32.lt_u	$push660=, $1, $pop1384
 	br_if   	0, $pop660      # 0: up to label1
-# BB#98:                                # %for.body919.preheader
+# %bb.98:                               # %for.body919.preheader
 	end_loop
 	i32.const	$0=, 0
 .LBB24_99:                              # %for.body919
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	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.const	$push1388=, 4
+	i32.shl 	$2=, $0, $pop1388
+	i32.const	$push1387=, s
+	i32.add 	$1=, $2, $pop1387
+	call    	sq44444444@FUNCTION, $7, $1
+	i32.load16_u	$push190=, 0($7)
 	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.const	$push1386=, 4
+	i32.div_s	$push661=, $pop192, $pop1386
+	i32.const	$push1385=, 65535
+	i32.and 	$push662=, $pop661, $pop1385
 	i32.ne  	$push663=, $pop190, $pop662
 	br_if   	1, $pop663      # 1: down to label0
-# BB#100:                               # %lor.lhs.false929
+# %bb.100:                              # %lor.lhs.false929
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push191=, 6($10)
-	i32.const	$push1421=, 65535
-	i32.and 	$push665=, $pop191, $pop1421
-	i32.const	$push1420=, s+6
-	i32.add 	$push664=, $2, $pop1420
+	i32.load16_u	$push191=, 6($7)
+	i32.const	$push1394=, 65535
+	i32.and 	$push665=, $pop191, $pop1394
+	i32.const	$push1393=, s+6
+	i32.add 	$push664=, $2, $pop1393
 	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.const	$push1392=, 16
+	i32.shl 	$push666=, $pop193, $pop1392
+	i32.const	$push1391=, 16
+	i32.shr_s	$push667=, $pop666, $pop1391
+	i32.const	$push1390=, 4
+	i32.div_s	$push668=, $pop667, $pop1390
+	i32.const	$push1389=, 65535
+	i32.and 	$push669=, $pop668, $pop1389
 	i32.ne  	$push670=, $pop665, $pop669
 	br_if   	1, $pop670      # 1: down to label0
-# BB#101:                               # %if.end939
+# %bb.101:                              # %if.end939
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$2=, $10
+	copy_local	$2=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push195=, 4($10)
-	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.load16_u	$push195=, 4($7)
+	i32.load16_s	$push197=, 4($1)
+	i32.const	$push1396=, 4
+	i32.div_s	$push671=, $pop197, $pop1396
+	i32.const	$push1395=, 65535
+	i32.and 	$push672=, $pop671, $pop1395
 	i32.ne  	$push673=, $pop195, $pop672
 	br_if   	1, $pop673      # 1: down to label0
-# BB#102:                               # %lor.lhs.false948
+# %bb.102:                              # %lor.lhs.false948
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push194=, 2($10)
-	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.load16_u	$push194=, 2($7)
+	i32.const	$push1401=, 65535
+	i32.and 	$push674=, $pop194, $pop1401
+	i32.load16_u	$push196=, 2($1)
+	i32.const	$push1400=, 16
+	i32.shl 	$push675=, $pop196, $pop1400
+	i32.const	$push1399=, 16
+	i32.shr_s	$push676=, $pop675, $pop1399
+	i32.const	$push1398=, 4
+	i32.div_s	$push677=, $pop676, $pop1398
+	i32.const	$push1397=, 65535
+	i32.and 	$push678=, $pop677, $pop1397
 	i32.ne  	$push679=, $pop674, $pop678
 	br_if   	1, $pop679      # 1: down to label0
-# BB#103:                               # %if.end958
+# %bb.103:                              # %if.end958
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$4=, $10
+	copy_local	$2=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push198=, 8($10)
-	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.load16_u	$push198=, 8($7)
+	i32.load16_s	$push200=, 8($1)
+	i32.const	$push1403=, 4
+	i32.div_s	$push680=, $pop200, $pop1403
+	i32.const	$push1402=, 65535
+	i32.and 	$push681=, $pop680, $pop1402
 	i32.ne  	$push682=, $pop198, $pop681
 	br_if   	1, $pop682      # 1: down to label0
-# BB#104:                               # %lor.lhs.false967
+# %bb.104:                              # %lor.lhs.false967
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push199=, 14($10)
-	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.const	$push1409=, 14
+	i32.add 	$2=, $1, $pop1409
+	i32.load16_u	$push199=, 14($7)
+	i32.const	$push1408=, 65535
+	i32.and 	$push683=, $pop199, $pop1408
+	i32.load16_u	$push201=, 0($2)
+	i32.const	$push1407=, 16
+	i32.shl 	$push684=, $pop201, $pop1407
+	i32.const	$push1406=, 16
+	i32.shr_s	$push685=, $pop684, $pop1406
+	i32.const	$push1405=, 4
+	i32.div_s	$push686=, $pop685, $pop1405
+	i32.const	$push1404=, 65535
+	i32.and 	$push687=, $pop686, $pop1404
 	i32.ne  	$push688=, $pop683, $pop687
 	br_if   	1, $pop688      # 1: down to label0
-# BB#105:                               # %if.end977
+# %bb.105:                              # %if.end977
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$6=, $10
+	copy_local	$3=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push203=, 12($10)
-	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.const	$push1412=, 12
+	i32.add 	$3=, $1, $pop1412
+	i32.load16_u	$push203=, 12($7)
+	i32.load16_s	$push205=, 0($3)
+	i32.const	$push1411=, 4
+	i32.div_s	$push689=, $pop205, $pop1411
+	i32.const	$push1410=, 65535
+	i32.and 	$push690=, $pop689, $pop1410
 	i32.ne  	$push691=, $pop203, $pop690
 	br_if   	1, $pop691      # 1: down to label0
-# BB#106:                               # %lor.lhs.false986
+# %bb.106:                              # %lor.lhs.false986
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push202=, 10($10)
-	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.const	$push1418=, 10
+	i32.add 	$4=, $1, $pop1418
+	i32.load16_u	$push202=, 10($7)
+	i32.const	$push1417=, 65535
+	i32.and 	$push692=, $pop202, $pop1417
+	i32.load16_u	$push204=, 0($4)
+	i32.const	$push1416=, 16
+	i32.shl 	$push693=, $pop204, $pop1416
+	i32.const	$push1415=, 16
+	i32.shr_s	$push694=, $pop693, $pop1415
+	i32.const	$push1414=, 4
+	i32.div_s	$push695=, $pop694, $pop1414
+	i32.const	$push1413=, 65535
+	i32.and 	$push696=, $pop695, $pop1413
 	i32.ne  	$push697=, $pop692, $pop696
 	br_if   	1, $pop697      # 1: down to label0
-# BB#107:                               # %if.end996
+# %bb.107:                              # %if.end996
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$8=, $10
+	copy_local	$5=, $7
 	#APP
 	#NO_APP
-	call    	sr44444444@FUNCTION, $10, $1
+	call    	sr44444444@FUNCTION, $7, $1
 	i32.load16_s	$push208=, 0($1)
-	i32.const	$push1461=, 4
-	i32.rem_s	$push698=, $pop208, $pop1461
-	i32.load16_s	$push206=, 0($10)
+	i32.const	$push1419=, 4
+	i32.rem_s	$push698=, $pop208, $pop1419
+	i32.load16_s	$push206=, 0($7)
 	i32.ne  	$push699=, $pop698, $pop206
 	br_if   	1, $pop699      # 1: down to label0
-# BB#108:                               # %lor.lhs.false1006
+# %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	$push1463=, 16
-	i32.shl 	$push700=, $pop207, $pop1463
-	i32.const	$push1462=, 16
-	i32.shr_s	$push701=, $pop700, $pop1462
+	i32.const	$push1425=, 6
+	i32.add 	$5=, $1, $pop1425
+	i32.load16_u	$push209=, 0($5)
+	i32.const	$push1424=, 16
+	i32.shl 	$push702=, $pop209, $pop1424
+	i32.const	$push1423=, 16
+	i32.shr_s	$push703=, $pop702, $pop1423
+	i32.const	$push1422=, 4
+	i32.rem_s	$push704=, $pop703, $pop1422
+	i32.load16_u	$push207=, 6($7)
+	i32.const	$push1421=, 16
+	i32.shl 	$push700=, $pop207, $pop1421
+	i32.const	$push1420=, 16
+	i32.shr_s	$push701=, $pop700, $pop1420
 	i32.ne  	$push705=, $pop704, $pop701
 	br_if   	1, $pop705      # 1: down to label0
-# BB#109:                               # %if.end1016
+# %bb.109:                              # %if.end1016
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 4($1)
+	i32.const	$push1426=, 4
+	i32.rem_s	$push706=, $pop213, $pop1426
+	i32.load16_s	$push211=, 4($7)
 	i32.ne  	$push707=, $pop706, $pop211
 	br_if   	1, $pop707      # 1: down to label0
-# BB#110:                               # %lor.lhs.false1025
+# %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	$push1472=, 16
-	i32.shl 	$push708=, $pop210, $pop1472
-	i32.const	$push1471=, 16
-	i32.shr_s	$push709=, $pop708, $pop1471
+	i32.load16_u	$push212=, 2($1)
+	i32.const	$push1431=, 16
+	i32.shl 	$push710=, $pop212, $pop1431
+	i32.const	$push1430=, 16
+	i32.shr_s	$push711=, $pop710, $pop1430
+	i32.const	$push1429=, 4
+	i32.rem_s	$push712=, $pop711, $pop1429
+	i32.load16_u	$push210=, 2($7)
+	i32.const	$push1428=, 16
+	i32.shl 	$push708=, $pop210, $pop1428
+	i32.const	$push1427=, 16
+	i32.shr_s	$push709=, $pop708, $pop1427
 	i32.ne  	$push713=, $pop712, $pop709
 	br_if   	1, $pop713      # 1: down to label0
-# BB#111:                               # %if.end1035
+# %bb.111:                              # %if.end1035
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 8($1)
+	i32.const	$push1432=, 4
+	i32.rem_s	$push714=, $pop216, $pop1432
+	i32.load16_s	$push214=, 8($7)
 	i32.ne  	$push715=, $pop714, $pop214
 	br_if   	1, $pop715      # 1: down to label0
-# BB#112:                               # %lor.lhs.false1044
+# %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	$push1478=, 16
-	i32.shl 	$push716=, $pop215, $pop1478
-	i32.const	$push1477=, 16
-	i32.shr_s	$push717=, $pop716, $pop1477
+	i32.load16_u	$push217=, 0($2)
+	i32.const	$push1437=, 16
+	i32.shl 	$push718=, $pop217, $pop1437
+	i32.const	$push1436=, 16
+	i32.shr_s	$push719=, $pop718, $pop1436
+	i32.const	$push1435=, 4
+	i32.rem_s	$push720=, $pop719, $pop1435
+	i32.load16_u	$push215=, 14($7)
+	i32.const	$push1434=, 16
+	i32.shl 	$push716=, $pop215, $pop1434
+	i32.const	$push1433=, 16
+	i32.shr_s	$push717=, $pop716, $pop1433
 	i32.ne  	$push721=, $pop720, $pop717
 	br_if   	1, $pop721      # 1: down to label0
-# BB#113:                               # %if.end1054
+# %bb.113:                              # %if.end1054
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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($3)
+	i32.const	$push1438=, 4
+	i32.rem_s	$push722=, $pop221, $pop1438
+	i32.load16_s	$push219=, 12($7)
 	i32.ne  	$push723=, $pop722, $pop219
 	br_if   	1, $pop723      # 1: down to label0
-# BB#114:                               # %lor.lhs.false1063
+# %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	$push1484=, 16
-	i32.shl 	$push724=, $pop218, $pop1484
-	i32.const	$push1483=, 16
-	i32.shr_s	$push725=, $pop724, $pop1483
+	i32.load16_u	$push220=, 0($4)
+	i32.const	$push1443=, 16
+	i32.shl 	$push726=, $pop220, $pop1443
+	i32.const	$push1442=, 16
+	i32.shr_s	$push727=, $pop726, $pop1442
+	i32.const	$push1441=, 4
+	i32.rem_s	$push728=, $pop727, $pop1441
+	i32.load16_u	$push218=, 10($7)
+	i32.const	$push1440=, 16
+	i32.shl 	$push724=, $pop218, $pop1440
+	i32.const	$push1439=, 16
+	i32.shr_s	$push725=, $pop724, $pop1439
 	i32.ne  	$push729=, $pop728, $pop725
 	br_if   	1, $pop729      # 1: down to label0
-# BB#115:                               # %if.end1073
+# %bb.115:                              # %if.end1073
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sq1428166432128@FUNCTION, $10, $1
-	i32.load16_u	$push222=, 0($10)
+	call    	sq1428166432128@FUNCTION, $7, $1
+	i32.load16_u	$push222=, 0($7)
 	i32.load16_u	$push224=, 0($1)
 	i32.ne  	$push730=, $pop222, $pop224
 	br_if   	1, $pop730      # 1: down to label0
-# BB#116:                               # %lor.lhs.false1083
+# %bb.116:                              # %lor.lhs.false1083
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push223=, 6($10)
-	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.load16_u	$push223=, 6($7)
+	i32.const	$push1448=, 65535
+	i32.and 	$push731=, $pop223, $pop1448
+	i32.load16_u	$push225=, 0($5)
+	i32.const	$push1447=, 16
+	i32.shl 	$push732=, $pop225, $pop1447
+	i32.const	$push1446=, 16
+	i32.shr_s	$push733=, $pop732, $pop1446
+	i32.const	$push1445=, 8
+	i32.div_s	$push734=, $pop733, $pop1445
+	i32.const	$push1444=, 65535
+	i32.and 	$push735=, $pop734, $pop1444
 	i32.ne  	$push736=, $pop731, $pop735
 	br_if   	1, $pop736      # 1: down to label0
-# BB#117:                               # %if.end1093
+# %bb.117:                              # %if.end1093
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push227=, 4($10)
-	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.load16_u	$push227=, 4($7)
+	i32.load16_s	$push229=, 4($1)
+	i32.const	$push1450=, 2
+	i32.div_s	$push737=, $pop229, $pop1450
+	i32.const	$push1449=, 65535
+	i32.and 	$push738=, $pop737, $pop1449
 	i32.ne  	$push739=, $pop227, $pop738
 	br_if   	1, $pop739      # 1: down to label0
-# BB#118:                               # %lor.lhs.false1102
+# %bb.118:                              # %lor.lhs.false1102
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push226=, 2($10)
-	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.load16_u	$push226=, 2($7)
+	i32.const	$push1455=, 65535
+	i32.and 	$push740=, $pop226, $pop1455
+	i32.load16_u	$push228=, 2($1)
+	i32.const	$push1454=, 16
+	i32.shl 	$push741=, $pop228, $pop1454
+	i32.const	$push1453=, 16
+	i32.shr_s	$push742=, $pop741, $pop1453
+	i32.const	$push1452=, 4
+	i32.div_s	$push743=, $pop742, $pop1452
+	i32.const	$push1451=, 65535
+	i32.and 	$push744=, $pop743, $pop1451
 	i32.ne  	$push745=, $pop740, $pop744
 	br_if   	1, $pop745      # 1: down to label0
-# BB#119:                               # %if.end1112
+# %bb.119:                              # %if.end1112
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push230=, 8($10)
-	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.load16_u	$push230=, 8($7)
+	i32.load16_s	$push232=, 8($1)
+	i32.const	$push1457=, 16
+	i32.div_s	$push746=, $pop232, $pop1457
+	i32.const	$push1456=, 65535
+	i32.and 	$push747=, $pop746, $pop1456
 	i32.ne  	$push748=, $pop230, $pop747
 	br_if   	1, $pop748      # 1: down to label0
-# BB#120:                               # %lor.lhs.false1121
+# %bb.120:                              # %lor.lhs.false1121
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push231=, 14($10)
-	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.load16_u	$push231=, 14($7)
+	i32.const	$push1462=, 65535
+	i32.and 	$push749=, $pop231, $pop1462
+	i32.load16_u	$push233=, 0($2)
+	i32.const	$push1461=, 16
+	i32.shl 	$push750=, $pop233, $pop1461
+	i32.const	$push1460=, 16
+	i32.shr_s	$push751=, $pop750, $pop1460
+	i32.const	$push1459=, 128
+	i32.div_s	$push752=, $pop751, $pop1459
+	i32.const	$push1458=, 65535
+	i32.and 	$push753=, $pop752, $pop1458
 	i32.ne  	$push754=, $pop749, $pop753
 	br_if   	1, $pop754      # 1: down to label0
-# BB#121:                               # %if.end1131
+# %bb.121:                              # %if.end1131
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push235=, 12($10)
-	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.load16_u	$push235=, 12($7)
+	i32.load16_s	$push237=, 0($3)
+	i32.const	$push1464=, 32
+	i32.div_s	$push755=, $pop237, $pop1464
+	i32.const	$push1463=, 65535
+	i32.and 	$push756=, $pop755, $pop1463
 	i32.ne  	$push757=, $pop235, $pop756
 	br_if   	1, $pop757      # 1: down to label0
-# BB#122:                               # %lor.lhs.false1140
+# %bb.122:                              # %lor.lhs.false1140
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push234=, 10($10)
-	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.load16_u	$push234=, 10($7)
+	i32.const	$push1469=, 65535
+	i32.and 	$push758=, $pop234, $pop1469
+	i32.load16_u	$push236=, 0($4)
+	i32.const	$push1468=, 16
+	i32.shl 	$push759=, $pop236, $pop1468
+	i32.const	$push1467=, 16
+	i32.shr_s	$push760=, $pop759, $pop1467
+	i32.const	$push1466=, 64
+	i32.div_s	$push761=, $pop760, $pop1466
+	i32.const	$push1465=, 65535
+	i32.and 	$push762=, $pop761, $pop1465
 	i32.ne  	$push763=, $pop758, $pop762
 	br_if   	1, $pop763      # 1: down to label0
-# BB#123:                               # %if.end1150
+# %bb.123:                              # %if.end1150
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sr1428166432128@FUNCTION, $10, $1
-	i32.load16_u	$push238=, 0($10)
+	call    	sr1428166432128@FUNCTION, $7, $1
+	i32.load16_u	$push238=, 0($7)
 	br_if   	1, $pop238      # 1: down to label0
-# BB#124:                               # %lor.lhs.false1160
+# %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	$push1515=, 16
-	i32.shl 	$push766=, $pop239, $pop1515
-	i32.const	$push1514=, 16
-	i32.shr_s	$push767=, $pop766, $pop1514
+	i32.load16_s	$push764=, 0($5)
+	i32.const	$push1472=, 8
+	i32.rem_s	$push765=, $pop764, $pop1472
+	i32.load16_u	$push239=, 6($7)
+	i32.const	$push1471=, 16
+	i32.shl 	$push766=, $pop239, $pop1471
+	i32.const	$push1470=, 16
+	i32.shr_s	$push767=, $pop766, $pop1470
 	i32.ne  	$push768=, $pop765, $pop767
 	br_if   	1, $pop768      # 1: down to label0
-# BB#125:                               # %if.end1170
+# %bb.125:                              # %if.end1170
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 4($1)
+	i32.const	$push1473=, 2
+	i32.rem_s	$push769=, $pop243, $pop1473
+	i32.load16_s	$push241=, 4($7)
 	i32.ne  	$push770=, $pop769, $pop241
 	br_if   	1, $pop770      # 1: down to label0
-# BB#126:                               # %lor.lhs.false1179
+# %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	$push1519=, 16
-	i32.shl 	$push771=, $pop240, $pop1519
-	i32.const	$push1518=, 16
-	i32.shr_s	$push772=, $pop771, $pop1518
+	i32.load16_u	$push242=, 2($1)
+	i32.const	$push1478=, 16
+	i32.shl 	$push773=, $pop242, $pop1478
+	i32.const	$push1477=, 16
+	i32.shr_s	$push774=, $pop773, $pop1477
+	i32.const	$push1476=, 4
+	i32.rem_s	$push775=, $pop774, $pop1476
+	i32.load16_u	$push240=, 2($7)
+	i32.const	$push1475=, 16
+	i32.shl 	$push771=, $pop240, $pop1475
+	i32.const	$push1474=, 16
+	i32.shr_s	$push772=, $pop771, $pop1474
 	i32.ne  	$push776=, $pop775, $pop772
 	br_if   	1, $pop776      # 1: down to label0
-# BB#127:                               # %if.end1189
+# %bb.127:                              # %if.end1189
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 8($1)
+	i32.const	$push1479=, 16
+	i32.rem_s	$push777=, $pop246, $pop1479
+	i32.load16_s	$push244=, 8($7)
 	i32.ne  	$push778=, $pop777, $pop244
 	br_if   	1, $pop778      # 1: down to label0
-# BB#128:                               # %lor.lhs.false1198
+# %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	$push1525=, 16
-	i32.shl 	$push779=, $pop245, $pop1525
-	i32.const	$push1524=, 16
-	i32.shr_s	$push780=, $pop779, $pop1524
+	i32.load16_u	$push247=, 0($2)
+	i32.const	$push1484=, 16
+	i32.shl 	$push781=, $pop247, $pop1484
+	i32.const	$push1483=, 16
+	i32.shr_s	$push782=, $pop781, $pop1483
+	i32.const	$push1482=, 128
+	i32.rem_s	$push783=, $pop782, $pop1482
+	i32.load16_u	$push245=, 14($7)
+	i32.const	$push1481=, 16
+	i32.shl 	$push779=, $pop245, $pop1481
+	i32.const	$push1480=, 16
+	i32.shr_s	$push780=, $pop779, $pop1480
 	i32.ne  	$push784=, $pop783, $pop780
 	br_if   	1, $pop784      # 1: down to label0
-# BB#129:                               # %if.end1208
+# %bb.129:                              # %if.end1208
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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($3)
+	i32.const	$push1485=, 32
+	i32.rem_s	$push785=, $pop251, $pop1485
+	i32.load16_s	$push249=, 12($7)
 	i32.ne  	$push786=, $pop785, $pop249
 	br_if   	1, $pop786      # 1: down to label0
-# BB#130:                               # %lor.lhs.false1217
+# %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	$push1531=, 16
-	i32.shl 	$push787=, $pop248, $pop1531
-	i32.const	$push1530=, 16
-	i32.shr_s	$push788=, $pop787, $pop1530
+	i32.load16_u	$push250=, 0($4)
+	i32.const	$push1490=, 16
+	i32.shl 	$push789=, $pop250, $pop1490
+	i32.const	$push1489=, 16
+	i32.shr_s	$push790=, $pop789, $pop1489
+	i32.const	$push1488=, 64
+	i32.rem_s	$push791=, $pop790, $pop1488
+	i32.load16_u	$push248=, 10($7)
+	i32.const	$push1487=, 16
+	i32.shl 	$push787=, $pop248, $pop1487
+	i32.const	$push1486=, 16
+	i32.shr_s	$push788=, $pop787, $pop1486
 	i32.ne  	$push792=, $pop791, $pop788
 	br_if   	1, $pop792      # 1: down to label0
-# BB#131:                               # %if.end1227
+# %bb.131:                              # %if.end1227
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sq33333333@FUNCTION, $10, $1
-	i32.load16_u	$push252=, 0($10)
+	call    	sq33333333@FUNCTION, $7, $1
+	i32.load16_u	$push252=, 0($7)
 	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.const	$push1492=, 3
+	i32.div_s	$push793=, $pop254, $pop1492
+	i32.const	$push1491=, 65535
+	i32.and 	$push794=, $pop793, $pop1491
 	i32.ne  	$push795=, $pop252, $pop794
 	br_if   	1, $pop795      # 1: down to label0
-# BB#132:                               # %lor.lhs.false1237
+# %bb.132:                              # %lor.lhs.false1237
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push253=, 6($10)
-	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.load16_u	$push253=, 6($7)
+	i32.const	$push1497=, 65535
+	i32.and 	$push796=, $pop253, $pop1497
+	i32.load16_u	$push255=, 0($5)
+	i32.const	$push1496=, 16
+	i32.shl 	$push797=, $pop255, $pop1496
+	i32.const	$push1495=, 16
+	i32.shr_s	$push798=, $pop797, $pop1495
+	i32.const	$push1494=, 3
+	i32.div_s	$push799=, $pop798, $pop1494
+	i32.const	$push1493=, 65535
+	i32.and 	$push800=, $pop799, $pop1493
 	i32.ne  	$push801=, $pop796, $pop800
 	br_if   	1, $pop801      # 1: down to label0
-# BB#133:                               # %if.end1247
+# %bb.133:                              # %if.end1247
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push257=, 4($10)
-	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.load16_u	$push257=, 4($7)
+	i32.load16_s	$push259=, 4($1)
+	i32.const	$push1499=, 3
+	i32.div_s	$push802=, $pop259, $pop1499
+	i32.const	$push1498=, 65535
+	i32.and 	$push803=, $pop802, $pop1498
 	i32.ne  	$push804=, $pop257, $pop803
 	br_if   	1, $pop804      # 1: down to label0
-# BB#134:                               # %lor.lhs.false1256
+# %bb.134:                              # %lor.lhs.false1256
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push256=, 2($10)
-	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.load16_u	$push256=, 2($7)
+	i32.const	$push1504=, 65535
+	i32.and 	$push805=, $pop256, $pop1504
+	i32.load16_u	$push258=, 2($1)
+	i32.const	$push1503=, 16
+	i32.shl 	$push806=, $pop258, $pop1503
+	i32.const	$push1502=, 16
+	i32.shr_s	$push807=, $pop806, $pop1502
+	i32.const	$push1501=, 3
+	i32.div_s	$push808=, $pop807, $pop1501
+	i32.const	$push1500=, 65535
+	i32.and 	$push809=, $pop808, $pop1500
 	i32.ne  	$push810=, $pop805, $pop809
 	br_if   	1, $pop810      # 1: down to label0
-# BB#135:                               # %if.end1266
+# %bb.135:                              # %if.end1266
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push260=, 8($10)
-	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.load16_u	$push260=, 8($7)
+	i32.load16_s	$push262=, 8($1)
+	i32.const	$push1506=, 3
+	i32.div_s	$push811=, $pop262, $pop1506
+	i32.const	$push1505=, 65535
+	i32.and 	$push812=, $pop811, $pop1505
 	i32.ne  	$push813=, $pop260, $pop812
 	br_if   	1, $pop813      # 1: down to label0
-# BB#136:                               # %lor.lhs.false1275
+# %bb.136:                              # %lor.lhs.false1275
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push261=, 14($10)
-	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.load16_u	$push261=, 14($7)
+	i32.const	$push1511=, 65535
+	i32.and 	$push814=, $pop261, $pop1511
+	i32.load16_u	$push263=, 0($2)
+	i32.const	$push1510=, 16
+	i32.shl 	$push815=, $pop263, $pop1510
+	i32.const	$push1509=, 16
+	i32.shr_s	$push816=, $pop815, $pop1509
+	i32.const	$push1508=, 3
+	i32.div_s	$push817=, $pop816, $pop1508
+	i32.const	$push1507=, 65535
+	i32.and 	$push818=, $pop817, $pop1507
 	i32.ne  	$push819=, $pop814, $pop818
 	br_if   	1, $pop819      # 1: down to label0
-# BB#137:                               # %if.end1285
+# %bb.137:                              # %if.end1285
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push265=, 12($10)
-	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.load16_u	$push265=, 12($7)
+	i32.load16_s	$push267=, 0($3)
+	i32.const	$push1513=, 3
+	i32.div_s	$push820=, $pop267, $pop1513
+	i32.const	$push1512=, 65535
+	i32.and 	$push821=, $pop820, $pop1512
 	i32.ne  	$push822=, $pop265, $pop821
 	br_if   	1, $pop822      # 1: down to label0
-# BB#138:                               # %lor.lhs.false1294
+# %bb.138:                              # %lor.lhs.false1294
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push264=, 10($10)
-	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.load16_u	$push264=, 10($7)
+	i32.const	$push1518=, 65535
+	i32.and 	$push823=, $pop264, $pop1518
+	i32.load16_u	$push266=, 0($4)
+	i32.const	$push1517=, 16
+	i32.shl 	$push824=, $pop266, $pop1517
+	i32.const	$push1516=, 16
+	i32.shr_s	$push825=, $pop824, $pop1516
+	i32.const	$push1515=, 3
+	i32.div_s	$push826=, $pop825, $pop1515
+	i32.const	$push1514=, 65535
+	i32.and 	$push827=, $pop826, $pop1514
 	i32.ne  	$push828=, $pop823, $pop827
 	br_if   	1, $pop828      # 1: down to label0
-# BB#139:                               # %if.end1304
+# %bb.139:                              # %if.end1304
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sr33333333@FUNCTION, $10, $1
+	call    	sr33333333@FUNCTION, $7, $1
 	i32.load16_s	$push270=, 0($1)
-	i32.const	$push1563=, 3
-	i32.rem_s	$push829=, $pop270, $pop1563
-	i32.load16_s	$push268=, 0($10)
+	i32.const	$push1519=, 3
+	i32.rem_s	$push829=, $pop270, $pop1519
+	i32.load16_s	$push268=, 0($7)
 	i32.ne  	$push830=, $pop829, $pop268
 	br_if   	1, $pop830      # 1: down to label0
-# BB#140:                               # %lor.lhs.false1314
+# %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	$push1565=, 16
-	i32.shl 	$push831=, $pop269, $pop1565
-	i32.const	$push1564=, 16
-	i32.shr_s	$push832=, $pop831, $pop1564
+	i32.load16_u	$push271=, 0($5)
+	i32.const	$push1524=, 16
+	i32.shl 	$push833=, $pop271, $pop1524
+	i32.const	$push1523=, 16
+	i32.shr_s	$push834=, $pop833, $pop1523
+	i32.const	$push1522=, 3
+	i32.rem_s	$push835=, $pop834, $pop1522
+	i32.load16_u	$push269=, 6($7)
+	i32.const	$push1521=, 16
+	i32.shl 	$push831=, $pop269, $pop1521
+	i32.const	$push1520=, 16
+	i32.shr_s	$push832=, $pop831, $pop1520
 	i32.ne  	$push836=, $pop835, $pop832
 	br_if   	1, $pop836      # 1: down to label0
-# BB#141:                               # %if.end1324
+# %bb.141:                              # %if.end1324
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 4($1)
+	i32.const	$push1525=, 3
+	i32.rem_s	$push837=, $pop275, $pop1525
+	i32.load16_s	$push273=, 4($7)
 	i32.ne  	$push838=, $pop837, $pop273
 	br_if   	1, $pop838      # 1: down to label0
-# BB#142:                               # %lor.lhs.false1333
+# %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	$push1571=, 16
-	i32.shl 	$push839=, $pop272, $pop1571
-	i32.const	$push1570=, 16
-	i32.shr_s	$push840=, $pop839, $pop1570
+	i32.load16_u	$push274=, 2($1)
+	i32.const	$push1530=, 16
+	i32.shl 	$push841=, $pop274, $pop1530
+	i32.const	$push1529=, 16
+	i32.shr_s	$push842=, $pop841, $pop1529
+	i32.const	$push1528=, 3
+	i32.rem_s	$push843=, $pop842, $pop1528
+	i32.load16_u	$push272=, 2($7)
+	i32.const	$push1527=, 16
+	i32.shl 	$push839=, $pop272, $pop1527
+	i32.const	$push1526=, 16
+	i32.shr_s	$push840=, $pop839, $pop1526
 	i32.ne  	$push844=, $pop843, $pop840
 	br_if   	1, $pop844      # 1: down to label0
-# BB#143:                               # %if.end1343
+# %bb.143:                              # %if.end1343
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 8($1)
+	i32.const	$push1531=, 3
+	i32.rem_s	$push845=, $pop278, $pop1531
+	i32.load16_s	$push276=, 8($7)
 	i32.ne  	$push846=, $pop845, $pop276
 	br_if   	1, $pop846      # 1: down to label0
-# BB#144:                               # %lor.lhs.false1352
+# %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	$push1577=, 16
-	i32.shl 	$push847=, $pop277, $pop1577
-	i32.const	$push1576=, 16
-	i32.shr_s	$push848=, $pop847, $pop1576
+	i32.load16_u	$push279=, 0($2)
+	i32.const	$push1536=, 16
+	i32.shl 	$push849=, $pop279, $pop1536
+	i32.const	$push1535=, 16
+	i32.shr_s	$push850=, $pop849, $pop1535
+	i32.const	$push1534=, 3
+	i32.rem_s	$push851=, $pop850, $pop1534
+	i32.load16_u	$push277=, 14($7)
+	i32.const	$push1533=, 16
+	i32.shl 	$push847=, $pop277, $pop1533
+	i32.const	$push1532=, 16
+	i32.shr_s	$push848=, $pop847, $pop1532
 	i32.ne  	$push852=, $pop851, $pop848
 	br_if   	1, $pop852      # 1: down to label0
-# BB#145:                               # %if.end1362
+# %bb.145:                              # %if.end1362
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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($3)
+	i32.const	$push1537=, 3
+	i32.rem_s	$push853=, $pop283, $pop1537
+	i32.load16_s	$push281=, 12($7)
 	i32.ne  	$push854=, $pop853, $pop281
 	br_if   	1, $pop854      # 1: down to label0
-# BB#146:                               # %lor.lhs.false1371
+# %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	$push1583=, 16
-	i32.shl 	$push855=, $pop280, $pop1583
-	i32.const	$push1582=, 16
-	i32.shr_s	$push856=, $pop855, $pop1582
+	i32.load16_u	$push282=, 0($4)
+	i32.const	$push1542=, 16
+	i32.shl 	$push857=, $pop282, $pop1542
+	i32.const	$push1541=, 16
+	i32.shr_s	$push858=, $pop857, $pop1541
+	i32.const	$push1540=, 3
+	i32.rem_s	$push859=, $pop858, $pop1540
+	i32.load16_u	$push280=, 10($7)
+	i32.const	$push1539=, 16
+	i32.shl 	$push855=, $pop280, $pop1539
+	i32.const	$push1538=, 16
+	i32.shr_s	$push856=, $pop855, $pop1538
 	i32.ne  	$push860=, $pop859, $pop856
 	br_if   	1, $pop860      # 1: down to label0
-# BB#147:                               # %if.end1381
+# %bb.147:                              # %if.end1381
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sq65656565@FUNCTION, $10, $1
-	i32.load16_u	$push284=, 0($10)
+	call    	sq65656565@FUNCTION, $7, $1
+	i32.load16_u	$push284=, 0($7)
 	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.const	$push1544=, 6
+	i32.div_s	$push861=, $pop286, $pop1544
+	i32.const	$push1543=, 65535
+	i32.and 	$push862=, $pop861, $pop1543
 	i32.ne  	$push863=, $pop284, $pop862
 	br_if   	1, $pop863      # 1: down to label0
-# BB#148:                               # %lor.lhs.false1391
+# %bb.148:                              # %lor.lhs.false1391
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push285=, 6($10)
-	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.load16_u	$push285=, 6($7)
+	i32.const	$push1549=, 65535
+	i32.and 	$push864=, $pop285, $pop1549
+	i32.load16_u	$push287=, 0($5)
+	i32.const	$push1548=, 16
+	i32.shl 	$push865=, $pop287, $pop1548
+	i32.const	$push1547=, 16
+	i32.shr_s	$push866=, $pop865, $pop1547
+	i32.const	$push1546=, 5
+	i32.div_s	$push867=, $pop866, $pop1546
+	i32.const	$push1545=, 65535
+	i32.and 	$push868=, $pop867, $pop1545
 	i32.ne  	$push869=, $pop864, $pop868
 	br_if   	1, $pop869      # 1: down to label0
-# BB#149:                               # %if.end1401
+# %bb.149:                              # %if.end1401
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push289=, 4($10)
-	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.load16_u	$push289=, 4($7)
+	i32.load16_s	$push291=, 4($1)
+	i32.const	$push1551=, 6
+	i32.div_s	$push870=, $pop291, $pop1551
+	i32.const	$push1550=, 65535
+	i32.and 	$push871=, $pop870, $pop1550
 	i32.ne  	$push872=, $pop289, $pop871
 	br_if   	1, $pop872      # 1: down to label0
-# BB#150:                               # %lor.lhs.false1410
+# %bb.150:                              # %lor.lhs.false1410
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push288=, 2($10)
-	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.load16_u	$push288=, 2($7)
+	i32.const	$push1556=, 65535
+	i32.and 	$push873=, $pop288, $pop1556
+	i32.load16_u	$push290=, 2($1)
+	i32.const	$push1555=, 16
+	i32.shl 	$push874=, $pop290, $pop1555
+	i32.const	$push1554=, 16
+	i32.shr_s	$push875=, $pop874, $pop1554
+	i32.const	$push1553=, 5
+	i32.div_s	$push876=, $pop875, $pop1553
+	i32.const	$push1552=, 65535
+	i32.and 	$push877=, $pop876, $pop1552
 	i32.ne  	$push878=, $pop873, $pop877
 	br_if   	1, $pop878      # 1: down to label0
-# BB#151:                               # %if.end1420
+# %bb.151:                              # %if.end1420
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push292=, 8($10)
-	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.load16_u	$push292=, 8($7)
+	i32.load16_s	$push294=, 8($1)
+	i32.const	$push1558=, 6
+	i32.div_s	$push879=, $pop294, $pop1558
+	i32.const	$push1557=, 65535
+	i32.and 	$push880=, $pop879, $pop1557
 	i32.ne  	$push881=, $pop292, $pop880
 	br_if   	1, $pop881      # 1: down to label0
-# BB#152:                               # %lor.lhs.false1429
+# %bb.152:                              # %lor.lhs.false1429
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push293=, 14($10)
-	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.load16_u	$push293=, 14($7)
+	i32.const	$push1563=, 65535
+	i32.and 	$push882=, $pop293, $pop1563
+	i32.load16_u	$push295=, 0($2)
+	i32.const	$push1562=, 16
+	i32.shl 	$push883=, $pop295, $pop1562
+	i32.const	$push1561=, 16
+	i32.shr_s	$push884=, $pop883, $pop1561
+	i32.const	$push1560=, 5
+	i32.div_s	$push885=, $pop884, $pop1560
+	i32.const	$push1559=, 65535
+	i32.and 	$push886=, $pop885, $pop1559
 	i32.ne  	$push887=, $pop882, $pop886
 	br_if   	1, $pop887      # 1: down to label0
-# BB#153:                               # %if.end1439
+# %bb.153:                              # %if.end1439
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push297=, 12($10)
-	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.load16_u	$push297=, 12($7)
+	i32.load16_s	$push299=, 0($3)
+	i32.const	$push1565=, 6
+	i32.div_s	$push888=, $pop299, $pop1565
+	i32.const	$push1564=, 65535
+	i32.and 	$push889=, $pop888, $pop1564
 	i32.ne  	$push890=, $pop297, $pop889
 	br_if   	1, $pop890      # 1: down to label0
-# BB#154:                               # %lor.lhs.false1448
+# %bb.154:                              # %lor.lhs.false1448
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push296=, 10($10)
-	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.load16_u	$push296=, 10($7)
+	i32.const	$push1570=, 65535
+	i32.and 	$push891=, $pop296, $pop1570
+	i32.load16_u	$push298=, 0($4)
+	i32.const	$push1569=, 16
+	i32.shl 	$push892=, $pop298, $pop1569
+	i32.const	$push1568=, 16
+	i32.shr_s	$push893=, $pop892, $pop1568
+	i32.const	$push1567=, 5
+	i32.div_s	$push894=, $pop893, $pop1567
+	i32.const	$push1566=, 65535
+	i32.and 	$push895=, $pop894, $pop1566
 	i32.ne  	$push896=, $pop891, $pop895
 	br_if   	1, $pop896      # 1: down to label0
-# BB#155:                               # %if.end1458
+# %bb.155:                              # %if.end1458
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sr65656565@FUNCTION, $10, $1
+	call    	sr65656565@FUNCTION, $7, $1
 	i32.load16_s	$push302=, 0($1)
-	i32.const	$push1615=, 6
-	i32.rem_s	$push897=, $pop302, $pop1615
-	i32.load16_s	$push300=, 0($10)
+	i32.const	$push1571=, 6
+	i32.rem_s	$push897=, $pop302, $pop1571
+	i32.load16_s	$push300=, 0($7)
 	i32.ne  	$push898=, $pop897, $pop300
 	br_if   	1, $pop898      # 1: down to label0
-# BB#156:                               # %lor.lhs.false1468
+# %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	$push1617=, 16
-	i32.shl 	$push899=, $pop301, $pop1617
-	i32.const	$push1616=, 16
-	i32.shr_s	$push900=, $pop899, $pop1616
+	i32.load16_u	$push303=, 0($5)
+	i32.const	$push1576=, 16
+	i32.shl 	$push901=, $pop303, $pop1576
+	i32.const	$push1575=, 16
+	i32.shr_s	$push902=, $pop901, $pop1575
+	i32.const	$push1574=, 5
+	i32.rem_s	$push903=, $pop902, $pop1574
+	i32.load16_u	$push301=, 6($7)
+	i32.const	$push1573=, 16
+	i32.shl 	$push899=, $pop301, $pop1573
+	i32.const	$push1572=, 16
+	i32.shr_s	$push900=, $pop899, $pop1572
 	i32.ne  	$push904=, $pop903, $pop900
 	br_if   	1, $pop904      # 1: down to label0
-# BB#157:                               # %if.end1478
+# %bb.157:                              # %if.end1478
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 4($1)
+	i32.const	$push1577=, 6
+	i32.rem_s	$push905=, $pop307, $pop1577
+	i32.load16_s	$push305=, 4($7)
 	i32.ne  	$push906=, $pop905, $pop305
 	br_if   	1, $pop906      # 1: down to label0
-# BB#158:                               # %lor.lhs.false1487
+# %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	$push1623=, 16
-	i32.shl 	$push907=, $pop304, $pop1623
-	i32.const	$push1622=, 16
-	i32.shr_s	$push908=, $pop907, $pop1622
+	i32.load16_u	$push306=, 2($1)
+	i32.const	$push1582=, 16
+	i32.shl 	$push909=, $pop306, $pop1582
+	i32.const	$push1581=, 16
+	i32.shr_s	$push910=, $pop909, $pop1581
+	i32.const	$push1580=, 5
+	i32.rem_s	$push911=, $pop910, $pop1580
+	i32.load16_u	$push304=, 2($7)
+	i32.const	$push1579=, 16
+	i32.shl 	$push907=, $pop304, $pop1579
+	i32.const	$push1578=, 16
+	i32.shr_s	$push908=, $pop907, $pop1578
 	i32.ne  	$push912=, $pop911, $pop908
 	br_if   	1, $pop912      # 1: down to label0
-# BB#159:                               # %if.end1497
+# %bb.159:                              # %if.end1497
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 8($1)
+	i32.const	$push1583=, 6
+	i32.rem_s	$push913=, $pop310, $pop1583
+	i32.load16_s	$push308=, 8($7)
 	i32.ne  	$push914=, $pop913, $pop308
 	br_if   	1, $pop914      # 1: down to label0
-# BB#160:                               # %lor.lhs.false1506
+# %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	$push1629=, 16
-	i32.shl 	$push915=, $pop309, $pop1629
-	i32.const	$push1628=, 16
-	i32.shr_s	$push916=, $pop915, $pop1628
+	i32.load16_u	$push311=, 0($2)
+	i32.const	$push1588=, 16
+	i32.shl 	$push917=, $pop311, $pop1588
+	i32.const	$push1587=, 16
+	i32.shr_s	$push918=, $pop917, $pop1587
+	i32.const	$push1586=, 5
+	i32.rem_s	$push919=, $pop918, $pop1586
+	i32.load16_u	$push309=, 14($7)
+	i32.const	$push1585=, 16
+	i32.shl 	$push915=, $pop309, $pop1585
+	i32.const	$push1584=, 16
+	i32.shr_s	$push916=, $pop915, $pop1584
 	i32.ne  	$push920=, $pop919, $pop916
 	br_if   	1, $pop920      # 1: down to label0
-# BB#161:                               # %if.end1516
+# %bb.161:                              # %if.end1516
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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($3)
+	i32.const	$push1589=, 6
+	i32.rem_s	$push921=, $pop315, $pop1589
+	i32.load16_s	$push313=, 12($7)
 	i32.ne  	$push922=, $pop921, $pop313
 	br_if   	1, $pop922      # 1: down to label0
-# BB#162:                               # %lor.lhs.false1525
+# %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	$push1635=, 16
-	i32.shl 	$push923=, $pop312, $pop1635
-	i32.const	$push1634=, 16
-	i32.shr_s	$push924=, $pop923, $pop1634
+	i32.load16_u	$push314=, 0($4)
+	i32.const	$push1594=, 16
+	i32.shl 	$push925=, $pop314, $pop1594
+	i32.const	$push1593=, 16
+	i32.shr_s	$push926=, $pop925, $pop1593
+	i32.const	$push1592=, 5
+	i32.rem_s	$push927=, $pop926, $pop1592
+	i32.load16_u	$push312=, 10($7)
+	i32.const	$push1591=, 16
+	i32.shl 	$push923=, $pop312, $pop1591
+	i32.const	$push1590=, 16
+	i32.shr_s	$push924=, $pop923, $pop1590
 	i32.ne  	$push928=, $pop927, $pop924
 	br_if   	1, $pop928      # 1: down to label0
-# BB#163:                               # %if.end1535
+# %bb.163:                              # %if.end1535
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sq14141461461414@FUNCTION, $10, $1
-	i32.load16_u	$push316=, 0($10)
+	call    	sq14141461461414@FUNCTION, $7, $1
+	i32.load16_u	$push316=, 0($7)
 	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.const	$push1596=, 14
+	i32.div_s	$push929=, $pop318, $pop1596
+	i32.const	$push1595=, 65535
+	i32.and 	$push930=, $pop929, $pop1595
 	i32.ne  	$push931=, $pop316, $pop930
 	br_if   	1, $pop931      # 1: down to label0
-# BB#164:                               # %lor.lhs.false1545
+# %bb.164:                              # %lor.lhs.false1545
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push317=, 6($10)
-	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.load16_u	$push317=, 6($7)
+	i32.const	$push1601=, 65535
+	i32.and 	$push932=, $pop317, $pop1601
+	i32.load16_u	$push319=, 0($5)
+	i32.const	$push1600=, 16
+	i32.shl 	$push933=, $pop319, $pop1600
+	i32.const	$push1599=, 16
+	i32.shr_s	$push934=, $pop933, $pop1599
+	i32.const	$push1598=, 6
+	i32.div_s	$push935=, $pop934, $pop1598
+	i32.const	$push1597=, 65535
+	i32.and 	$push936=, $pop935, $pop1597
 	i32.ne  	$push937=, $pop932, $pop936
 	br_if   	1, $pop937      # 1: down to label0
-# BB#165:                               # %if.end1555
+# %bb.165:                              # %if.end1555
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push321=, 4($10)
-	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.load16_u	$push321=, 4($7)
+	i32.load16_s	$push323=, 4($1)
+	i32.const	$push1603=, 14
+	i32.div_s	$push938=, $pop323, $pop1603
+	i32.const	$push1602=, 65535
+	i32.and 	$push939=, $pop938, $pop1602
 	i32.ne  	$push940=, $pop321, $pop939
 	br_if   	1, $pop940      # 1: down to label0
-# BB#166:                               # %lor.lhs.false1564
+# %bb.166:                              # %lor.lhs.false1564
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push320=, 2($10)
-	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.load16_u	$push320=, 2($7)
+	i32.const	$push1608=, 65535
+	i32.and 	$push941=, $pop320, $pop1608
+	i32.load16_u	$push322=, 2($1)
+	i32.const	$push1607=, 16
+	i32.shl 	$push942=, $pop322, $pop1607
+	i32.const	$push1606=, 16
+	i32.shr_s	$push943=, $pop942, $pop1606
+	i32.const	$push1605=, 14
+	i32.div_s	$push944=, $pop943, $pop1605
+	i32.const	$push1604=, 65535
+	i32.and 	$push945=, $pop944, $pop1604
 	i32.ne  	$push946=, $pop941, $pop945
 	br_if   	1, $pop946      # 1: down to label0
-# BB#167:                               # %if.end1574
+# %bb.167:                              # %if.end1574
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push324=, 8($10)
-	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.load16_u	$push324=, 8($7)
+	i32.load16_s	$push326=, 8($1)
+	i32.const	$push1610=, 14
+	i32.div_s	$push947=, $pop326, $pop1610
+	i32.const	$push1609=, 65535
+	i32.and 	$push948=, $pop947, $pop1609
 	i32.ne  	$push949=, $pop324, $pop948
 	br_if   	1, $pop949      # 1: down to label0
-# BB#168:                               # %lor.lhs.false1583
+# %bb.168:                              # %lor.lhs.false1583
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push325=, 14($10)
-	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.load16_u	$push325=, 14($7)
+	i32.const	$push1615=, 65535
+	i32.and 	$push950=, $pop325, $pop1615
+	i32.load16_u	$push327=, 0($2)
+	i32.const	$push1614=, 16
+	i32.shl 	$push951=, $pop327, $pop1614
+	i32.const	$push1613=, 16
+	i32.shr_s	$push952=, $pop951, $pop1613
+	i32.const	$push1612=, 14
+	i32.div_s	$push953=, $pop952, $pop1612
+	i32.const	$push1611=, 65535
+	i32.and 	$push954=, $pop953, $pop1611
 	i32.ne  	$push955=, $pop950, $pop954
 	br_if   	1, $pop955      # 1: down to label0
-# BB#169:                               # %if.end1593
+# %bb.169:                              # %if.end1593
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push329=, 12($10)
-	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.load16_u	$push329=, 12($7)
+	i32.load16_s	$push331=, 0($3)
+	i32.const	$push1617=, 14
+	i32.div_s	$push956=, $pop331, $pop1617
+	i32.const	$push1616=, 65535
+	i32.and 	$push957=, $pop956, $pop1616
 	i32.ne  	$push958=, $pop329, $pop957
 	br_if   	1, $pop958      # 1: down to label0
-# BB#170:                               # %lor.lhs.false1602
+# %bb.170:                              # %lor.lhs.false1602
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push328=, 10($10)
-	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.load16_u	$push328=, 10($7)
+	i32.const	$push1622=, 65535
+	i32.and 	$push959=, $pop328, $pop1622
+	i32.load16_u	$push330=, 0($4)
+	i32.const	$push1621=, 16
+	i32.shl 	$push960=, $pop330, $pop1621
+	i32.const	$push1620=, 16
+	i32.shr_s	$push961=, $pop960, $pop1620
+	i32.const	$push1619=, 6
+	i32.div_s	$push962=, $pop961, $pop1619
+	i32.const	$push1618=, 65535
+	i32.and 	$push963=, $pop962, $pop1618
 	i32.ne  	$push964=, $pop959, $pop963
 	br_if   	1, $pop964      # 1: down to label0
-# BB#171:                               # %if.end1612
+# %bb.171:                              # %if.end1612
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sr14141461461414@FUNCTION, $10, $1
+	call    	sr14141461461414@FUNCTION, $7, $1
 	i32.load16_s	$push334=, 0($1)
-	i32.const	$push1667=, 14
-	i32.rem_s	$push965=, $pop334, $pop1667
-	i32.load16_s	$push332=, 0($10)
+	i32.const	$push1623=, 14
+	i32.rem_s	$push965=, $pop334, $pop1623
+	i32.load16_s	$push332=, 0($7)
 	i32.ne  	$push966=, $pop965, $pop332
 	br_if   	1, $pop966      # 1: down to label0
-# BB#172:                               # %lor.lhs.false1622
+# %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	$push1669=, 16
-	i32.shl 	$push967=, $pop333, $pop1669
-	i32.const	$push1668=, 16
-	i32.shr_s	$push968=, $pop967, $pop1668
+	i32.load16_u	$push335=, 0($5)
+	i32.const	$push1628=, 16
+	i32.shl 	$push969=, $pop335, $pop1628
+	i32.const	$push1627=, 16
+	i32.shr_s	$push970=, $pop969, $pop1627
+	i32.const	$push1626=, 6
+	i32.rem_s	$push971=, $pop970, $pop1626
+	i32.load16_u	$push333=, 6($7)
+	i32.const	$push1625=, 16
+	i32.shl 	$push967=, $pop333, $pop1625
+	i32.const	$push1624=, 16
+	i32.shr_s	$push968=, $pop967, $pop1624
 	i32.ne  	$push972=, $pop971, $pop968
 	br_if   	1, $pop972      # 1: down to label0
-# BB#173:                               # %if.end1632
+# %bb.173:                              # %if.end1632
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 4($1)
+	i32.const	$push1629=, 14
+	i32.rem_s	$push973=, $pop339, $pop1629
+	i32.load16_s	$push337=, 4($7)
 	i32.ne  	$push974=, $pop973, $pop337
 	br_if   	1, $pop974      # 1: down to label0
-# BB#174:                               # %lor.lhs.false1641
+# %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	$push1675=, 16
-	i32.shl 	$push975=, $pop336, $pop1675
-	i32.const	$push1674=, 16
-	i32.shr_s	$push976=, $pop975, $pop1674
+	i32.load16_u	$push338=, 2($1)
+	i32.const	$push1634=, 16
+	i32.shl 	$push977=, $pop338, $pop1634
+	i32.const	$push1633=, 16
+	i32.shr_s	$push978=, $pop977, $pop1633
+	i32.const	$push1632=, 14
+	i32.rem_s	$push979=, $pop978, $pop1632
+	i32.load16_u	$push336=, 2($7)
+	i32.const	$push1631=, 16
+	i32.shl 	$push975=, $pop336, $pop1631
+	i32.const	$push1630=, 16
+	i32.shr_s	$push976=, $pop975, $pop1630
 	i32.ne  	$push980=, $pop979, $pop976
 	br_if   	1, $pop980      # 1: down to label0
-# BB#175:                               # %if.end1651
+# %bb.175:                              # %if.end1651
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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=, 8($1)
+	i32.const	$push1635=, 14
+	i32.rem_s	$push981=, $pop342, $pop1635
+	i32.load16_s	$push340=, 8($7)
 	i32.ne  	$push982=, $pop981, $pop340
 	br_if   	1, $pop982      # 1: down to label0
-# BB#176:                               # %lor.lhs.false1660
+# %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	$push1681=, 16
-	i32.shl 	$push983=, $pop341, $pop1681
-	i32.const	$push1680=, 16
-	i32.shr_s	$push984=, $pop983, $pop1680
+	i32.load16_u	$push343=, 0($2)
+	i32.const	$push1640=, 16
+	i32.shl 	$push985=, $pop343, $pop1640
+	i32.const	$push1639=, 16
+	i32.shr_s	$push986=, $pop985, $pop1639
+	i32.const	$push1638=, 14
+	i32.rem_s	$push987=, $pop986, $pop1638
+	i32.load16_u	$push341=, 14($7)
+	i32.const	$push1637=, 16
+	i32.shl 	$push983=, $pop341, $pop1637
+	i32.const	$push1636=, 16
+	i32.shr_s	$push984=, $pop983, $pop1636
 	i32.ne  	$push988=, $pop987, $pop984
 	br_if   	1, $pop988      # 1: down to label0
-# BB#177:                               # %if.end1670
+# %bb.177:                              # %if.end1670
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#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($3)
+	i32.const	$push1641=, 14
+	i32.rem_s	$push989=, $pop347, $pop1641
+	i32.load16_s	$push345=, 12($7)
 	i32.ne  	$push990=, $pop989, $pop345
 	br_if   	1, $pop990      # 1: down to label0
-# BB#178:                               # %lor.lhs.false1679
+# %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	$push1687=, 16
-	i32.shl 	$push991=, $pop344, $pop1687
-	i32.const	$push1686=, 16
-	i32.shr_s	$push992=, $pop991, $pop1686
+	i32.load16_u	$push346=, 0($4)
+	i32.const	$push1646=, 16
+	i32.shl 	$push993=, $pop346, $pop1646
+	i32.const	$push1645=, 16
+	i32.shr_s	$push994=, $pop993, $pop1645
+	i32.const	$push1644=, 6
+	i32.rem_s	$push995=, $pop994, $pop1644
+	i32.load16_u	$push344=, 10($7)
+	i32.const	$push1643=, 16
+	i32.shl 	$push991=, $pop344, $pop1643
+	i32.const	$push1642=, 16
+	i32.shr_s	$push992=, $pop991, $pop1642
 	i32.ne  	$push996=, $pop995, $pop992
 	br_if   	1, $pop996      # 1: down to label0
-# BB#179:                               # %if.end1689
+# %bb.179:                              # %if.end1689
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sq77777777@FUNCTION, $10, $1
-	i32.load16_u	$push348=, 0($10)
+	call    	sq77777777@FUNCTION, $7, $1
+	i32.load16_u	$push348=, 0($7)
 	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.const	$push1648=, 7
+	i32.div_s	$push997=, $pop350, $pop1648
+	i32.const	$push1647=, 65535
+	i32.and 	$push998=, $pop997, $pop1647
 	i32.ne  	$push999=, $pop348, $pop998
 	br_if   	1, $pop999      # 1: down to label0
-# BB#180:                               # %lor.lhs.false1699
+# %bb.180:                              # %lor.lhs.false1699
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push349=, 6($10)
-	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.load16_u	$push349=, 6($7)
+	i32.const	$push1653=, 65535
+	i32.and 	$push1000=, $pop349, $pop1653
+	i32.load16_u	$push351=, 0($5)
+	i32.const	$push1652=, 16
+	i32.shl 	$push1001=, $pop351, $pop1652
+	i32.const	$push1651=, 16
+	i32.shr_s	$push1002=, $pop1001, $pop1651
+	i32.const	$push1650=, 7
+	i32.div_s	$push1003=, $pop1002, $pop1650
+	i32.const	$push1649=, 65535
+	i32.and 	$push1004=, $pop1003, $pop1649
 	i32.ne  	$push1005=, $pop1000, $pop1004
 	br_if   	1, $pop1005     # 1: down to label0
-# BB#181:                               # %if.end1709
+# %bb.181:                              # %if.end1709
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push353=, 4($10)
-	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.load16_u	$push353=, 4($7)
+	i32.load16_s	$push355=, 4($1)
+	i32.const	$push1655=, 7
+	i32.div_s	$push1006=, $pop355, $pop1655
+	i32.const	$push1654=, 65535
+	i32.and 	$push1007=, $pop1006, $pop1654
 	i32.ne  	$push1008=, $pop353, $pop1007
 	br_if   	1, $pop1008     # 1: down to label0
-# BB#182:                               # %lor.lhs.false1718
+# %bb.182:                              # %lor.lhs.false1718
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push352=, 2($10)
-	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.load16_u	$push352=, 2($7)
+	i32.const	$push1660=, 65535
+	i32.and 	$push1009=, $pop352, $pop1660
+	i32.load16_u	$push354=, 2($1)
+	i32.const	$push1659=, 16
+	i32.shl 	$push1010=, $pop354, $pop1659
+	i32.const	$push1658=, 16
+	i32.shr_s	$push1011=, $pop1010, $pop1658
+	i32.const	$push1657=, 7
+	i32.div_s	$push1012=, $pop1011, $pop1657
+	i32.const	$push1656=, 65535
+	i32.and 	$push1013=, $pop1012, $pop1656
 	i32.ne  	$push1014=, $pop1009, $pop1013
 	br_if   	1, $pop1014     # 1: down to label0
-# BB#183:                               # %if.end1728
+# %bb.183:                              # %if.end1728
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push356=, 8($10)
-	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.load16_u	$push356=, 8($7)
+	i32.load16_s	$push358=, 8($1)
+	i32.const	$push1662=, 7
+	i32.div_s	$push1015=, $pop358, $pop1662
+	i32.const	$push1661=, 65535
+	i32.and 	$push1016=, $pop1015, $pop1661
 	i32.ne  	$push1017=, $pop356, $pop1016
 	br_if   	1, $pop1017     # 1: down to label0
-# BB#184:                               # %lor.lhs.false1737
+# %bb.184:                              # %lor.lhs.false1737
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push357=, 14($10)
-	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.load16_u	$push357=, 14($7)
+	i32.const	$push1667=, 65535
+	i32.and 	$push1018=, $pop357, $pop1667
+	i32.load16_u	$push359=, 0($2)
+	i32.const	$push1666=, 16
+	i32.shl 	$push1019=, $pop359, $pop1666
+	i32.const	$push1665=, 16
+	i32.shr_s	$push1020=, $pop1019, $pop1665
+	i32.const	$push1664=, 7
+	i32.div_s	$push1021=, $pop1020, $pop1664
+	i32.const	$push1663=, 65535
+	i32.and 	$push1022=, $pop1021, $pop1663
 	i32.ne  	$push1023=, $pop1018, $pop1022
 	br_if   	1, $pop1023     # 1: down to label0
-# BB#185:                               # %if.end1747
+# %bb.185:                              # %if.end1747
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	i32.load16_u	$push361=, 12($10)
-	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.load16_u	$push361=, 12($7)
+	i32.load16_s	$push363=, 0($3)
+	i32.const	$push1669=, 7
+	i32.div_s	$push1024=, $pop363, $pop1669
+	i32.const	$push1668=, 65535
+	i32.and 	$push1025=, $pop1024, $pop1668
 	i32.ne  	$push1026=, $pop361, $pop1025
 	br_if   	1, $pop1026     # 1: down to label0
-# BB#186:                               # %lor.lhs.false1756
+# %bb.186:                              # %lor.lhs.false1756
                                         #   in Loop: Header=BB24_99 Depth=1
-	i32.load16_u	$push360=, 10($10)
-	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.load16_u	$push360=, 10($7)
+	i32.const	$push1674=, 65535
+	i32.and 	$push1027=, $pop360, $pop1674
+	i32.load16_u	$push362=, 0($4)
+	i32.const	$push1673=, 16
+	i32.shl 	$push1028=, $pop362, $pop1673
+	i32.const	$push1672=, 16
+	i32.shr_s	$push1029=, $pop1028, $pop1672
+	i32.const	$push1671=, 7
+	i32.div_s	$push1030=, $pop1029, $pop1671
+	i32.const	$push1670=, 65535
+	i32.and 	$push1031=, $pop1030, $pop1670
 	i32.ne  	$push1032=, $pop1027, $pop1031
 	br_if   	1, $pop1032     # 1: down to label0
-# BB#187:                               # %if.end1766
+# %bb.187:                              # %if.end1766
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$9=, $10
+	copy_local	$6=, $7
 	#APP
 	#NO_APP
-	call    	sr77777777@FUNCTION, $10, $1
+	call    	sr77777777@FUNCTION, $7, $1
 	i32.load16_s	$push366=, 0($1)
-	i32.const	$push1719=, 7
-	i32.rem_s	$push1033=, $pop366, $pop1719
-	i32.load16_s	$push364=, 0($10)
+	i32.const	$push1675=, 7
+	i32.rem_s	$push1033=, $pop366, $pop1675
+	i32.load16_s	$push364=, 0($7)
 	i32.ne  	$push1034=, $pop1033, $pop364
 	br_if   	1, $pop1034     # 1: down to label0
-# BB#188:                               # %lor.lhs.false1776
+# %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	$push1721=, 16
-	i32.shl 	$push1035=, $pop365, $pop1721
-	i32.const	$push1720=, 16
-	i32.shr_s	$push1036=, $pop1035, $pop1720
+	i32.load16_u	$push367=, 0($5)
+	i32.const	$push1680=, 16
+	i32.shl 	$push1037=, $pop367, $pop1680
+	i32.const	$push1679=, 16
+	i32.shr_s	$push1038=, $pop1037, $pop1679
+	i32.const	$push1678=, 7
+	i32.rem_s	$push1039=, $pop1038, $pop1678
+	i32.load16_u	$push365=, 6($7)
+	i32.const	$push1677=, 16
+	i32.shl 	$push1035=, $pop365, $pop1677
+	i32.const	$push1676=, 16
+	i32.shr_s	$push1036=, $pop1035, $pop1676
 	i32.ne  	$push1040=, $pop1039, $pop1036
 	br_if   	1, $pop1040     # 1: down to label0
-# BB#189:                               # %if.end1786
+# %bb.189:                              # %if.end1786
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$1=, $10
+	copy_local	$5=, $7
 	#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=, 4($1)
+	i32.const	$push1681=, 7
+	i32.rem_s	$push1041=, $pop371, $pop1681
+	i32.load16_s	$push369=, 4($7)
 	i32.ne  	$push1042=, $pop1041, $pop369
 	br_if   	1, $pop1042     # 1: down to label0
-# BB#190:                               # %lor.lhs.false1795
+# %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	$push1727=, 16
-	i32.shl 	$push1043=, $pop368, $pop1727
-	i32.const	$push1726=, 16
-	i32.shr_s	$push1044=, $pop1043, $pop1726
+	i32.load16_u	$push370=, 2($1)
+	i32.const	$push1686=, 16
+	i32.shl 	$push1045=, $pop370, $pop1686
+	i32.const	$push1685=, 16
+	i32.shr_s	$push1046=, $pop1045, $pop1685
+	i32.const	$push1684=, 7
+	i32.rem_s	$push1047=, $pop1046, $pop1684
+	i32.load16_u	$push368=, 2($7)
+	i32.const	$push1683=, 16
+	i32.shl 	$push1043=, $pop368, $pop1683
+	i32.const	$push1682=, 16
+	i32.shr_s	$push1044=, $pop1043, $pop1682
 	i32.ne  	$push1048=, $pop1047, $pop1044
 	br_if   	1, $pop1048     # 1: down to label0
-# BB#191:                               # %if.end1805
+# %bb.191:                              # %if.end1805
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$1=, $10
+	copy_local	$5=, $7
 	#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=, 8($1)
+	i32.const	$push1687=, 7
+	i32.rem_s	$push1049=, $pop374, $pop1687
+	i32.load16_s	$push372=, 8($7)
 	i32.ne  	$push1050=, $pop1049, $pop372
 	br_if   	1, $pop1050     # 1: down to label0
-# BB#192:                               # %lor.lhs.false1814
+# %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	$push1733=, 16
-	i32.shl 	$push1051=, $pop373, $pop1733
-	i32.const	$push1732=, 16
-	i32.shr_s	$push1052=, $pop1051, $pop1732
+	i32.load16_u	$push375=, 0($2)
+	i32.const	$push1692=, 16
+	i32.shl 	$push1053=, $pop375, $pop1692
+	i32.const	$push1691=, 16
+	i32.shr_s	$push1054=, $pop1053, $pop1691
+	i32.const	$push1690=, 7
+	i32.rem_s	$push1055=, $pop1054, $pop1690
+	i32.load16_u	$push373=, 14($7)
+	i32.const	$push1689=, 16
+	i32.shl 	$push1051=, $pop373, $pop1689
+	i32.const	$push1688=, 16
+	i32.shr_s	$push1052=, $pop1051, $pop1688
 	i32.ne  	$push1056=, $pop1055, $pop1052
 	br_if   	1, $pop1056     # 1: down to label0
-# BB#193:                               # %if.end1824
+# %bb.193:                              # %if.end1824
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$1=, $10
+	copy_local	$1=, $7
 	#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($3)
+	i32.const	$push1693=, 7
+	i32.rem_s	$push1057=, $pop379, $pop1693
+	i32.load16_s	$push377=, 12($7)
 	i32.ne  	$push1058=, $pop1057, $pop377
 	br_if   	1, $pop1058     # 1: down to label0
-# BB#194:                               # %lor.lhs.false1833
+# %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	$push1739=, 16
-	i32.shl 	$push1059=, $pop376, $pop1739
-	i32.const	$push1738=, 16
-	i32.shr_s	$push1060=, $pop1059, $pop1738
+	i32.load16_u	$push378=, 0($4)
+	i32.const	$push1698=, 16
+	i32.shl 	$push1061=, $pop378, $pop1698
+	i32.const	$push1697=, 16
+	i32.shr_s	$push1062=, $pop1061, $pop1697
+	i32.const	$push1696=, 7
+	i32.rem_s	$push1063=, $pop1062, $pop1696
+	i32.load16_u	$push376=, 10($7)
+	i32.const	$push1695=, 16
+	i32.shl 	$push1059=, $pop376, $pop1695
+	i32.const	$push1694=, 16
+	i32.shr_s	$push1060=, $pop1059, $pop1694
 	i32.ne  	$push1064=, $pop1063, $pop1060
 	br_if   	1, $pop1064     # 1: down to label0
-# BB#195:                               # %if.end1843
+# %bb.195:                              # %if.end1843
                                         #   in Loop: Header=BB24_99 Depth=1
-	copy_local	$1=, $10
+	copy_local	$1=, $7
 	#APP
 	#NO_APP
 	i32.const	$push1065=, 1
 	i32.add 	$1=, $0, $pop1065
 	i32.const	$0=, 1
-	i32.const	$push1743=, 2
-	i32.lt_u	$push1066=, $1, $pop1743
+	i32.const	$push1699=, 2
+	i32.lt_u	$push1066=, $1, $pop1699
 	br_if   	0, $pop1066     # 0: up to label2
-# BB#196:                               # %for.end1846
+# %bb.196:                              # %for.end1846
 	end_loop
 	i32.const	$push1074=, 0
 	i32.const	$push1072=, 32
-	i32.add 	$push1073=, $10, $pop1072
+	i32.add 	$push1073=, $7, $pop1072
 	i32.store	__stack_pointer($pop1074), $pop1073
 	i32.const	$push1067=, 0
 	return  	$pop1067
@@ -4439,5 +4120,5 @@ s:
 	.size	s, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53645.c.s b/test/torture-s/pr53645.c.s
index 88e89fa2b..354c686a3 100644
--- a/test/torture-s/pr53645.c.s
+++ b/test/torture-s/pr53645.c.s
@@ -6,35 +6,27 @@
 	.type	uq4444,@function
 uq4444:                                 # @uq4444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 2
 	i32.shr_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 2
-	i32.shr_u	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 2
-	i32.shr_u	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 2
-	i32.shr_u	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 2
+	i32.shr_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 2
+	i32.shr_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 2
+	i32.shr_u	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -46,35 +38,27 @@ uq4444:                                 # @uq4444
 	.type	ur4444,@function
 ur4444:                                 # @ur4444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 3
 	i32.and 	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 3
-	i32.and 	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 3
-	i32.and 	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 3
-	i32.and 	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 3
+	i32.and 	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 3
+	i32.and 	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 3
+	i32.and 	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -86,35 +70,27 @@ ur4444:                                 # @ur4444
 	.type	sq4444,@function
 sq4444:                                 # @sq4444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 4
 	i32.div_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 4
-	i32.div_s	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 4
-	i32.div_s	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push19=, 4
-	i32.add 	$push13=, $0, $pop19
-	i32.const	$push18=, 4
-	i32.add 	$push14=, $1, $pop18
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push17=, 4
-	i32.div_s	$push16=, $pop15, $pop17
-	i32.store	0($pop13), $pop16
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 4
+	i32.div_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 4
+	i32.div_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 4
+	i32.div_s	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -126,35 +102,27 @@ sq4444:                                 # @sq4444
 	.type	sr4444,@function
 sr4444:                                 # @sr4444
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 4
 	i32.rem_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 4
-	i32.rem_s	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 4
-	i32.rem_s	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push19=, 4
-	i32.add 	$push13=, $0, $pop19
-	i32.const	$push18=, 4
-	i32.add 	$push14=, $1, $pop18
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push17=, 4
-	i32.rem_s	$push16=, $pop15, $pop17
-	i32.store	0($pop13), $pop16
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 4
+	i32.rem_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 4
+	i32.rem_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 4
+	i32.rem_s	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -166,33 +134,25 @@ sr4444:                                 # @sr4444
 	.type	uq1428,@function
 uq1428:                                 # @uq1428
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push21=, 12
-	i32.add 	$push3=, $1, $pop21
-	i32.load	$push4=, 0($pop3)
-	i32.const	$push5=, 3
+	i32.load	$push1=, 8($1)
+	i32.const	$push2=, 1
+	i32.shr_u	$push3=, $pop1, $pop2
+	i32.store	8($0), $pop3
+	i32.load	$push4=, 4($1)
+	i32.const	$push5=, 2
 	i32.shr_u	$push6=, $pop4, $pop5
-	i32.store	0($pop2), $pop6
-	i32.const	$push7=, 8
+	i32.store	4($0), $pop6
+	i32.const	$push7=, 12
 	i32.add 	$push8=, $0, $pop7
-	i32.const	$push20=, 8
-	i32.add 	$push9=, $1, $pop20
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
 	i32.load	$push10=, 0($pop9)
-	i32.const	$push11=, 1
+	i32.const	$push11=, 3
 	i32.shr_u	$push12=, $pop10, $pop11
 	i32.store	0($pop8), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push17=, 2
-	i32.shr_u	$push18=, $pop16, $pop17
-	i32.store	0($pop14), $pop18
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
@@ -204,33 +164,25 @@ uq1428:                                 # @uq1428
 	.type	ur1428,@function
 ur1428:                                 # @ur1428
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push21=, 12
-	i32.add 	$push3=, $1, $pop21
-	i32.load	$push4=, 0($pop3)
-	i32.const	$push5=, 7
+	i32.load	$push1=, 8($1)
+	i32.const	$push2=, 1
+	i32.and 	$push3=, $pop1, $pop2
+	i32.store	8($0), $pop3
+	i32.load	$push4=, 4($1)
+	i32.const	$push5=, 3
 	i32.and 	$push6=, $pop4, $pop5
-	i32.store	0($pop2), $pop6
-	i32.const	$push7=, 8
+	i32.store	4($0), $pop6
+	i32.const	$push7=, 12
 	i32.add 	$push8=, $0, $pop7
-	i32.const	$push20=, 8
-	i32.add 	$push9=, $1, $pop20
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
 	i32.load	$push10=, 0($pop9)
-	i32.const	$push11=, 1
+	i32.const	$push11=, 7
 	i32.and 	$push12=, $pop10, $pop11
 	i32.store	0($pop8), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push17=, 3
-	i32.and 	$push18=, $pop16, $pop17
-	i32.store	0($pop14), $pop18
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -242,33 +194,25 @@ ur1428:                                 # @ur1428
 	.type	sq1428,@function
 sq1428:                                 # @sq1428
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 0($1)
 	i32.store	0($0), $pop0
-	i32.const	$push1=, 12
-	i32.add 	$push2=, $0, $pop1
-	i32.const	$push21=, 12
-	i32.add 	$push3=, $1, $pop21
-	i32.load	$push4=, 0($pop3)
-	i32.const	$push5=, 8
+	i32.load	$push1=, 8($1)
+	i32.const	$push2=, 2
+	i32.div_s	$push3=, $pop1, $pop2
+	i32.store	8($0), $pop3
+	i32.load	$push4=, 4($1)
+	i32.const	$push5=, 4
 	i32.div_s	$push6=, $pop4, $pop5
-	i32.store	0($pop2), $pop6
-	i32.const	$push20=, 8
-	i32.add 	$push7=, $0, $pop20
-	i32.const	$push19=, 8
-	i32.add 	$push8=, $1, $pop19
-	i32.load	$push9=, 0($pop8)
-	i32.const	$push10=, 2
-	i32.div_s	$push11=, $pop9, $pop10
-	i32.store	0($pop7), $pop11
-	i32.const	$push12=, 4
-	i32.add 	$push13=, $0, $pop12
-	i32.const	$push18=, 4
-	i32.add 	$push14=, $1, $pop18
-	i32.load	$push15=, 0($pop14)
-	i32.const	$push17=, 4
-	i32.div_s	$push16=, $pop15, $pop17
-	i32.store	0($pop13), $pop16
+	i32.store	4($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push11=, 8
+	i32.div_s	$push12=, $pop10, $pop11
+	i32.store	0($pop8), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -280,35 +224,27 @@ sq1428:                                 # @sq1428
 	.type	sr1428,@function
 sr1428:                                 # @sr1428
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
-	i32.const	$push1=, 1
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
+	i32.const	$push1=, 2
 	i32.rem_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 8
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push4=, 4
+	i32.rem_s	$push5=, $pop3, $pop4
+	i32.store	4($0), $pop5
+	i32.load	$push6=, 0($1)
+	i32.const	$push7=, 1
 	i32.rem_s	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push22=, 8
-	i32.add 	$push9=, $0, $pop22
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push12=, 2
-	i32.rem_s	$push13=, $pop11, $pop12
-	i32.store	0($pop9), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 4
-	i32.rem_s	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	0($0), $pop8
+	i32.const	$push9=, 12
+	i32.add 	$push10=, $0, $pop9
+	i32.const	$push15=, 12
+	i32.add 	$push11=, $1, $pop15
+	i32.load	$push12=, 0($pop11)
+	i32.const	$push13=, 8
+	i32.rem_s	$push14=, $pop12, $pop13
+	i32.store	0($pop10), $pop14
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end7:
@@ -320,35 +256,27 @@ sr1428:                                 # @sr1428
 	.type	uq3333,@function
 uq3333:                                 # @uq3333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 3
 	i32.div_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 3
-	i32.div_u	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 3
-	i32.div_u	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 3
-	i32.div_u	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 3
+	i32.div_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 3
+	i32.div_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 3
+	i32.div_u	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end8:
@@ -360,35 +288,27 @@ uq3333:                                 # @uq3333
 	.type	ur3333,@function
 ur3333:                                 # @ur3333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 3
 	i32.rem_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 3
-	i32.rem_u	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 3
-	i32.rem_u	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 3
-	i32.rem_u	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 3
+	i32.rem_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 3
+	i32.rem_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 3
+	i32.rem_u	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end9:
@@ -400,35 +320,27 @@ ur3333:                                 # @ur3333
 	.type	sq3333,@function
 sq3333:                                 # @sq3333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 3
 	i32.div_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 3
-	i32.div_s	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 3
-	i32.div_s	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 3
-	i32.div_s	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 3
+	i32.div_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 3
+	i32.div_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 3
+	i32.div_s	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end10:
@@ -440,35 +352,27 @@ sq3333:                                 # @sq3333
 	.type	sr3333,@function
 sr3333:                                 # @sr3333
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 3
 	i32.rem_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 3
-	i32.rem_s	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 3
-	i32.rem_s	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 3
-	i32.rem_s	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 3
+	i32.rem_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 3
+	i32.rem_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 3
+	i32.rem_s	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end11:
@@ -480,35 +384,27 @@ sr3333:                                 # @sr3333
 	.type	uq6565,@function
 uq6565:                                 # @uq6565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 6
 	i32.div_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 5
-	i32.div_u	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 6
-	i32.div_u	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 5
-	i32.div_u	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push4=, 5
+	i32.div_u	$push5=, $pop3, $pop4
+	i32.store	4($0), $pop5
+	i32.load	$push6=, 0($1)
+	i32.const	$push15=, 6
+	i32.div_u	$push7=, $pop6, $pop15
+	i32.store	0($0), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push14=, 12
+	i32.add 	$push10=, $1, $pop14
+	i32.load	$push11=, 0($pop10)
+	i32.const	$push13=, 5
+	i32.div_u	$push12=, $pop11, $pop13
+	i32.store	0($pop9), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end12:
@@ -520,35 +416,27 @@ uq6565:                                 # @uq6565
 	.type	ur6565,@function
 ur6565:                                 # @ur6565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 6
 	i32.rem_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 5
-	i32.rem_u	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 6
-	i32.rem_u	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 5
-	i32.rem_u	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push4=, 5
+	i32.rem_u	$push5=, $pop3, $pop4
+	i32.store	4($0), $pop5
+	i32.load	$push6=, 0($1)
+	i32.const	$push15=, 6
+	i32.rem_u	$push7=, $pop6, $pop15
+	i32.store	0($0), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push14=, 12
+	i32.add 	$push10=, $1, $pop14
+	i32.load	$push11=, 0($pop10)
+	i32.const	$push13=, 5
+	i32.rem_u	$push12=, $pop11, $pop13
+	i32.store	0($pop9), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end13:
@@ -560,35 +448,27 @@ ur6565:                                 # @ur6565
 	.type	sq6565,@function
 sq6565:                                 # @sq6565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 6
 	i32.div_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 5
-	i32.div_s	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 6
-	i32.div_s	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 5
-	i32.div_s	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push4=, 5
+	i32.div_s	$push5=, $pop3, $pop4
+	i32.store	4($0), $pop5
+	i32.load	$push6=, 0($1)
+	i32.const	$push15=, 6
+	i32.div_s	$push7=, $pop6, $pop15
+	i32.store	0($0), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push14=, 12
+	i32.add 	$push10=, $1, $pop14
+	i32.load	$push11=, 0($pop10)
+	i32.const	$push13=, 5
+	i32.div_s	$push12=, $pop11, $pop13
+	i32.store	0($pop9), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end14:
@@ -600,35 +480,27 @@ sq6565:                                 # @sq6565
 	.type	sr6565,@function
 sr6565:                                 # @sr6565
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 6
 	i32.rem_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 5
-	i32.rem_s	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 6
-	i32.rem_s	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 5
-	i32.rem_s	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push4=, 5
+	i32.rem_s	$push5=, $pop3, $pop4
+	i32.store	4($0), $pop5
+	i32.load	$push6=, 0($1)
+	i32.const	$push15=, 6
+	i32.rem_s	$push7=, $pop6, $pop15
+	i32.store	0($0), $pop7
+	i32.const	$push8=, 12
+	i32.add 	$push9=, $0, $pop8
+	i32.const	$push14=, 12
+	i32.add 	$push10=, $1, $pop14
+	i32.load	$push11=, 0($pop10)
+	i32.const	$push13=, 5
+	i32.rem_s	$push12=, $pop11, $pop13
+	i32.store	0($pop9), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end15:
@@ -640,35 +512,27 @@ sr6565:                                 # @sr6565
 	.type	uq1414146,@function
 uq1414146:                              # @uq1414146
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 14
 	i32.div_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 6
-	i32.div_u	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 14
-	i32.div_u	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 14
-	i32.div_u	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 14
+	i32.div_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 14
+	i32.div_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push11=, 6
+	i32.div_u	$push12=, $pop10, $pop11
+	i32.store	0($pop8), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end16:
@@ -680,35 +544,27 @@ uq1414146:                              # @uq1414146
 	.type	ur1414146,@function
 ur1414146:                              # @ur1414146
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 14
 	i32.rem_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 6
-	i32.rem_u	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 14
-	i32.rem_u	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 14
-	i32.rem_u	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 14
+	i32.rem_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 14
+	i32.rem_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push11=, 6
+	i32.rem_u	$push12=, $pop10, $pop11
+	i32.store	0($pop8), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end17:
@@ -720,35 +576,27 @@ ur1414146:                              # @ur1414146
 	.type	sq1414146,@function
 sq1414146:                              # @sq1414146
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 14
 	i32.div_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 6
-	i32.div_s	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 14
-	i32.div_s	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 14
-	i32.div_s	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 14
+	i32.div_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 14
+	i32.div_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push11=, 6
+	i32.div_s	$push12=, $pop10, $pop11
+	i32.store	0($pop8), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end18:
@@ -760,35 +608,27 @@ sq1414146:                              # @sq1414146
 	.type	sr1414146,@function
 sr1414146:                              # @sr1414146
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 14
 	i32.rem_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push7=, 6
-	i32.rem_s	$push8=, $pop6, $pop7
-	i32.store	0($pop4), $pop8
-	i32.const	$push9=, 8
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push22=, 8
-	i32.add 	$push11=, $1, $pop22
-	i32.load	$push12=, 0($pop11)
-	i32.const	$push21=, 14
-	i32.rem_s	$push13=, $pop12, $pop21
-	i32.store	0($pop10), $pop13
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push20=, 4
-	i32.add 	$push16=, $1, $pop20
-	i32.load	$push17=, 0($pop16)
-	i32.const	$push19=, 14
-	i32.rem_s	$push18=, $pop17, $pop19
-	i32.store	0($pop15), $pop18
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 14
+	i32.rem_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 14
+	i32.rem_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push11=, 6
+	i32.rem_s	$push12=, $pop10, $pop11
+	i32.store	0($pop8), $pop12
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end19:
@@ -800,35 +640,27 @@ sr1414146:                              # @sr1414146
 	.type	uq7777,@function
 uq7777:                                 # @uq7777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.div_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 7
-	i32.div_u	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 7
-	i32.div_u	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 7
-	i32.div_u	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 7
+	i32.div_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 7
+	i32.div_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 7
+	i32.div_u	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end20:
@@ -840,35 +672,27 @@ uq7777:                                 # @uq7777
 	.type	ur7777,@function
 ur7777:                                 # @ur7777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.rem_u	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 7
-	i32.rem_u	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 7
-	i32.rem_u	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 7
-	i32.rem_u	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 7
+	i32.rem_u	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 7
+	i32.rem_u	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 7
+	i32.rem_u	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end21:
@@ -880,35 +704,27 @@ ur7777:                                 # @ur7777
 	.type	sq7777,@function
 sq7777:                                 # @sq7777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.div_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 7
-	i32.div_s	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 7
-	i32.div_s	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 7
-	i32.div_s	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 7
+	i32.div_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 7
+	i32.div_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 7
+	i32.div_s	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end22:
@@ -920,35 +736,27 @@ sq7777:                                 # @sq7777
 	.type	sr7777,@function
 sr7777:                                 # @sr7777
 	.param  	i32, i32
-# BB#0:                                 # %entry
-	i32.load	$push0=, 0($1)
+# %bb.0:                                # %entry
+	i32.load	$push0=, 8($1)
 	i32.const	$push1=, 7
 	i32.rem_s	$push2=, $pop0, $pop1
-	i32.store	0($0), $pop2
-	i32.const	$push3=, 12
-	i32.add 	$push4=, $0, $pop3
-	i32.const	$push23=, 12
-	i32.add 	$push5=, $1, $pop23
-	i32.load	$push6=, 0($pop5)
-	i32.const	$push22=, 7
-	i32.rem_s	$push7=, $pop6, $pop22
-	i32.store	0($pop4), $pop7
-	i32.const	$push8=, 8
-	i32.add 	$push9=, $0, $pop8
-	i32.const	$push21=, 8
-	i32.add 	$push10=, $1, $pop21
-	i32.load	$push11=, 0($pop10)
-	i32.const	$push20=, 7
-	i32.rem_s	$push12=, $pop11, $pop20
-	i32.store	0($pop9), $pop12
-	i32.const	$push13=, 4
-	i32.add 	$push14=, $0, $pop13
-	i32.const	$push19=, 4
-	i32.add 	$push15=, $1, $pop19
-	i32.load	$push16=, 0($pop15)
-	i32.const	$push18=, 7
-	i32.rem_s	$push17=, $pop16, $pop18
-	i32.store	0($pop14), $pop17
+	i32.store	8($0), $pop2
+	i32.load	$push3=, 4($1)
+	i32.const	$push15=, 7
+	i32.rem_s	$push4=, $pop3, $pop15
+	i32.store	4($0), $pop4
+	i32.load	$push5=, 0($1)
+	i32.const	$push14=, 7
+	i32.rem_s	$push6=, $pop5, $pop14
+	i32.store	0($0), $pop6
+	i32.const	$push7=, 12
+	i32.add 	$push8=, $0, $pop7
+	i32.const	$push13=, 12
+	i32.add 	$push9=, $1, $pop13
+	i32.load	$push10=, 0($pop9)
+	i32.const	$push12=, 7
+	i32.rem_s	$push11=, $pop10, $pop12
+	i32.store	0($pop8), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end23:
@@ -960,1073 +768,1054 @@ sr7777:                                 # @sr7777
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push386=, 0
+	.local  	i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop383, $pop385
+	i32.const	$push386=, 0
+	i32.store	__stack_pointer($pop386), $4
 	i32.const	$0=, 0
 .LBB24_1:                               # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
+	i32.const	$push464=, 4
+	i32.shl 	$2=, $0, $pop464
+	i32.const	$push463=, u
+	i32.add 	$1=, $2, $pop463
 	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.add 	$push391=, $4, $pop390
+	call    	uq4444@FUNCTION, $pop391, $1
+	i32.load	$push0=, 16($4)
 	i32.load	$push2=, 0($1)
-	i32.const	$push464=, 2
-	i32.shr_u	$push188=, $pop2, $pop464
+	i32.const	$push462=, 2
+	i32.shr_u	$push188=, $pop2, $pop462
 	i32.ne  	$push189=, $pop0, $pop188
 	br_if   	1, $pop189      # 1: down to label0
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push1=, 28($6)
-	i32.const	$push472=, u+12
-	i32.add 	$push190=, $2, $pop472
+	i32.load	$push1=, 28($4)
+	i32.const	$push466=, u+12
+	i32.add 	$push190=, $2, $pop466
 	i32.load	$push3=, 0($pop190)
-	i32.const	$push471=, 2
-	i32.shr_u	$push191=, $pop3, $pop471
+	i32.const	$push465=, 2
+	i32.shr_u	$push191=, $pop3, $pop465
 	i32.ne  	$push192=, $pop1, $pop191
 	br_if   	1, $pop192      # 1: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push392=, 16
-	i32.add 	$push393=, $6, $pop392
+	i32.add 	$push393=, $4, $pop392
 	copy_local	$2=, $pop393
 	#APP
 	#NO_APP
-	i32.load	$push5=, 24($6)
-	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.load	$push5=, 24($4)
+	i32.load	$push7=, 8($1)
+	i32.const	$push467=, 2
+	i32.shr_u	$push193=, $pop7, $pop467
 	i32.ne  	$push194=, $pop5, $pop193
 	br_if   	1, $pop194      # 1: down to label0
-# BB#4:                                 # %lor.lhs.false13
+# %bb.4:                                # %lor.lhs.false13
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push4=, 20($6)
-	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.load	$push4=, 20($4)
+	i32.load	$push6=, 4($1)
+	i32.const	$push468=, 2
+	i32.shr_u	$push195=, $pop6, $pop468
 	i32.ne  	$push196=, $pop4, $pop195
 	br_if   	1, $pop196      # 1: down to label0
-# BB#5:                                 # %if.end20
+# %bb.5:                                # %if.end20
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push394=, 16
-	i32.add 	$push395=, $6, $pop394
-	copy_local	$4=, $pop395
+	i32.add 	$push395=, $4, $pop394
+	copy_local	$2=, $pop395
 	#APP
 	#NO_APP
 	i32.const	$push396=, 16
-	i32.add 	$push397=, $6, $pop396
+	i32.add 	$push397=, $4, $pop396
 	call    	ur4444@FUNCTION, $pop397, $1
-	i32.load	$push8=, 16($6)
+	i32.load	$push8=, 16($4)
 	i32.load	$push10=, 0($1)
-	i32.const	$push481=, 3
-	i32.and 	$push197=, $pop10, $pop481
+	i32.const	$push469=, 3
+	i32.and 	$push197=, $pop10, $pop469
 	i32.ne  	$push198=, $pop8, $pop197
 	br_if   	1, $pop198      # 1: down to label0
-# BB#6:                                 # %lor.lhs.false26
+# %bb.6:                                # %lor.lhs.false26
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push9=, 28($6)
-	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.const	$push471=, 12
+	i32.add 	$2=, $1, $pop471
+	i32.load	$push9=, 28($4)
+	i32.load	$push11=, 0($2)
+	i32.const	$push470=, 3
+	i32.and 	$push199=, $pop11, $pop470
 	i32.ne  	$push200=, $pop9, $pop199
 	br_if   	1, $pop200      # 1: down to label0
-# BB#7:                                 # %if.end33
+# %bb.7:                                # %if.end33
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push398=, 16
-	i32.add 	$push399=, $6, $pop398
-	copy_local	$5=, $pop399
+	i32.add 	$push399=, $4, $pop398
+	copy_local	$3=, $pop399
 	#APP
 	#NO_APP
-	i32.load	$push13=, 24($6)
-	i32.load	$push15=, 0($2)
-	i32.const	$push486=, 3
-	i32.and 	$push201=, $pop15, $pop486
+	i32.load	$push13=, 24($4)
+	i32.load	$push15=, 8($1)
+	i32.const	$push472=, 3
+	i32.and 	$push201=, $pop15, $pop472
 	i32.ne  	$push202=, $pop13, $pop201
 	br_if   	1, $pop202      # 1: down to label0
-# BB#8:                                 # %lor.lhs.false39
+# %bb.8:                                # %lor.lhs.false39
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push12=, 20($6)
-	i32.load	$push14=, 0($3)
-	i32.const	$push487=, 3
-	i32.and 	$push203=, $pop14, $pop487
+	i32.load	$push12=, 20($4)
+	i32.load	$push14=, 4($1)
+	i32.const	$push473=, 3
+	i32.and 	$push203=, $pop14, $pop473
 	i32.ne  	$push204=, $pop12, $pop203
 	br_if   	1, $pop204      # 1: down to label0
-# BB#9:                                 # %if.end46
+# %bb.9:                                # %if.end46
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push400=, 16
-	i32.add 	$push401=, $6, $pop400
-	copy_local	$5=, $pop401
+	i32.add 	$push401=, $4, $pop400
+	copy_local	$3=, $pop401
 	#APP
 	#NO_APP
 	i32.const	$push402=, 16
-	i32.add 	$push403=, $6, $pop402
+	i32.add 	$push403=, $4, $pop402
 	call    	uq1428@FUNCTION, $pop403, $1
-	i32.load	$push16=, 16($6)
+	i32.load	$push16=, 16($4)
 	i32.load	$push18=, 0($1)
 	i32.ne  	$push205=, $pop16, $pop18
 	br_if   	1, $pop205      # 1: down to label0
-# BB#10:                                # %lor.lhs.false53
+# %bb.10:                               # %lor.lhs.false53
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push17=, 28($6)
-	i32.load	$push19=, 0($4)
-	i32.const	$push488=, 3
-	i32.shr_u	$push206=, $pop19, $pop488
+	i32.load	$push17=, 28($4)
+	i32.load	$push19=, 0($2)
+	i32.const	$push474=, 3
+	i32.shr_u	$push206=, $pop19, $pop474
 	i32.ne  	$push207=, $pop17, $pop206
 	br_if   	1, $pop207      # 1: down to label0
-# BB#11:                                # %if.end60
+# %bb.11:                               # %if.end60
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push404=, 16
-	i32.add 	$push405=, $6, $pop404
-	copy_local	$5=, $pop405
+	i32.add 	$push405=, $4, $pop404
+	copy_local	$3=, $pop405
 	#APP
 	#NO_APP
-	i32.load	$push21=, 24($6)
-	i32.load	$push23=, 0($2)
-	i32.const	$push489=, 1
-	i32.shr_u	$push208=, $pop23, $pop489
+	i32.load	$push21=, 24($4)
+	i32.load	$push23=, 8($1)
+	i32.const	$push475=, 1
+	i32.shr_u	$push208=, $pop23, $pop475
 	i32.ne  	$push209=, $pop21, $pop208
 	br_if   	1, $pop209      # 1: down to label0
-# BB#12:                                # %lor.lhs.false66
+# %bb.12:                               # %lor.lhs.false66
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push20=, 20($6)
-	i32.load	$push22=, 0($3)
-	i32.const	$push490=, 2
-	i32.shr_u	$push210=, $pop22, $pop490
+	i32.load	$push20=, 20($4)
+	i32.load	$push22=, 4($1)
+	i32.const	$push476=, 2
+	i32.shr_u	$push210=, $pop22, $pop476
 	i32.ne  	$push211=, $pop20, $pop210
 	br_if   	1, $pop211      # 1: down to label0
-# BB#13:                                # %if.end73
+# %bb.13:                               # %if.end73
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push406=, 16
-	i32.add 	$push407=, $6, $pop406
-	copy_local	$5=, $pop407
+	i32.add 	$push407=, $4, $pop406
+	copy_local	$3=, $pop407
 	#APP
 	#NO_APP
 	i32.const	$push408=, 16
-	i32.add 	$push409=, $6, $pop408
+	i32.add 	$push409=, $4, $pop408
 	call    	ur1428@FUNCTION, $pop409, $1
-	i32.load	$push24=, 16($6)
+	i32.load	$push24=, 16($4)
 	br_if   	1, $pop24       # 1: down to label0
-# BB#14:                                # %lor.lhs.false80
+# %bb.14:                               # %lor.lhs.false80
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push25=, 28($6)
-	i32.load	$push212=, 0($4)
-	i32.const	$push491=, 7
-	i32.and 	$push213=, $pop212, $pop491
+	i32.load	$push25=, 28($4)
+	i32.load	$push212=, 0($2)
+	i32.const	$push477=, 7
+	i32.and 	$push213=, $pop212, $pop477
 	i32.ne  	$push214=, $pop25, $pop213
 	br_if   	1, $pop214      # 1: down to label0
-# BB#15:                                # %if.end87
+# %bb.15:                               # %if.end87
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push410=, 16
-	i32.add 	$push411=, $6, $pop410
-	copy_local	$5=, $pop411
+	i32.add 	$push411=, $4, $pop410
+	copy_local	$3=, $pop411
 	#APP
 	#NO_APP
-	i32.load	$push27=, 24($6)
-	i32.load	$push29=, 0($2)
-	i32.const	$push492=, 1
-	i32.and 	$push215=, $pop29, $pop492
+	i32.load	$push27=, 24($4)
+	i32.load	$push29=, 8($1)
+	i32.const	$push478=, 1
+	i32.and 	$push215=, $pop29, $pop478
 	i32.ne  	$push216=, $pop27, $pop215
 	br_if   	1, $pop216      # 1: down to label0
-# BB#16:                                # %lor.lhs.false93
+# %bb.16:                               # %lor.lhs.false93
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push26=, 20($6)
-	i32.load	$push28=, 0($3)
-	i32.const	$push493=, 3
-	i32.and 	$push217=, $pop28, $pop493
+	i32.load	$push26=, 20($4)
+	i32.load	$push28=, 4($1)
+	i32.const	$push479=, 3
+	i32.and 	$push217=, $pop28, $pop479
 	i32.ne  	$push218=, $pop26, $pop217
 	br_if   	1, $pop218      # 1: down to label0
-# BB#17:                                # %if.end100
+# %bb.17:                               # %if.end100
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push412=, 16
-	i32.add 	$push413=, $6, $pop412
-	copy_local	$5=, $pop413
+	i32.add 	$push413=, $4, $pop412
+	copy_local	$3=, $pop413
 	#APP
 	#NO_APP
 	i32.const	$push414=, 16
-	i32.add 	$push415=, $6, $pop414
+	i32.add 	$push415=, $4, $pop414
 	call    	uq3333@FUNCTION, $pop415, $1
-	i32.load	$push30=, 16($6)
+	i32.load	$push30=, 16($4)
 	i32.load	$push32=, 0($1)
-	i32.const	$push494=, 3
-	i32.div_u	$push219=, $pop32, $pop494
+	i32.const	$push480=, 3
+	i32.div_u	$push219=, $pop32, $pop480
 	i32.ne  	$push220=, $pop30, $pop219
 	br_if   	1, $pop220      # 1: down to label0
-# BB#18:                                # %lor.lhs.false107
+# %bb.18:                               # %lor.lhs.false107
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push31=, 28($6)
-	i32.load	$push33=, 0($4)
-	i32.const	$push495=, 3
-	i32.div_u	$push221=, $pop33, $pop495
+	i32.load	$push31=, 28($4)
+	i32.load	$push33=, 0($2)
+	i32.const	$push481=, 3
+	i32.div_u	$push221=, $pop33, $pop481
 	i32.ne  	$push222=, $pop31, $pop221
 	br_if   	1, $pop222      # 1: down to label0
-# BB#19:                                # %if.end114
+# %bb.19:                               # %if.end114
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push416=, 16
-	i32.add 	$push417=, $6, $pop416
-	copy_local	$5=, $pop417
+	i32.add 	$push417=, $4, $pop416
+	copy_local	$3=, $pop417
 	#APP
 	#NO_APP
-	i32.load	$push35=, 24($6)
-	i32.load	$push37=, 0($2)
-	i32.const	$push496=, 3
-	i32.div_u	$push223=, $pop37, $pop496
+	i32.load	$push35=, 24($4)
+	i32.load	$push37=, 8($1)
+	i32.const	$push482=, 3
+	i32.div_u	$push223=, $pop37, $pop482
 	i32.ne  	$push224=, $pop35, $pop223
 	br_if   	1, $pop224      # 1: down to label0
-# BB#20:                                # %lor.lhs.false120
+# %bb.20:                               # %lor.lhs.false120
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push34=, 20($6)
-	i32.load	$push36=, 0($3)
-	i32.const	$push497=, 3
-	i32.div_u	$push225=, $pop36, $pop497
+	i32.load	$push34=, 20($4)
+	i32.load	$push36=, 4($1)
+	i32.const	$push483=, 3
+	i32.div_u	$push225=, $pop36, $pop483
 	i32.ne  	$push226=, $pop34, $pop225
 	br_if   	1, $pop226      # 1: down to label0
-# BB#21:                                # %if.end127
+# %bb.21:                               # %if.end127
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push418=, 16
-	i32.add 	$push419=, $6, $pop418
-	copy_local	$5=, $pop419
+	i32.add 	$push419=, $4, $pop418
+	copy_local	$3=, $pop419
 	#APP
 	#NO_APP
 	i32.const	$push420=, 16
-	i32.add 	$push421=, $6, $pop420
+	i32.add 	$push421=, $4, $pop420
 	call    	ur3333@FUNCTION, $pop421, $1
-	i32.load	$push38=, 16($6)
+	i32.load	$push38=, 16($4)
 	i32.load	$push40=, 0($1)
-	i32.const	$push498=, 3
-	i32.rem_u	$push227=, $pop40, $pop498
+	i32.const	$push484=, 3
+	i32.rem_u	$push227=, $pop40, $pop484
 	i32.ne  	$push228=, $pop38, $pop227
 	br_if   	1, $pop228      # 1: down to label0
-# BB#22:                                # %lor.lhs.false134
+# %bb.22:                               # %lor.lhs.false134
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push39=, 28($6)
-	i32.load	$push41=, 0($4)
-	i32.const	$push499=, 3
-	i32.rem_u	$push229=, $pop41, $pop499
+	i32.load	$push39=, 28($4)
+	i32.load	$push41=, 0($2)
+	i32.const	$push485=, 3
+	i32.rem_u	$push229=, $pop41, $pop485
 	i32.ne  	$push230=, $pop39, $pop229
 	br_if   	1, $pop230      # 1: down to label0
-# BB#23:                                # %if.end141
+# %bb.23:                               # %if.end141
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push422=, 16
-	i32.add 	$push423=, $6, $pop422
-	copy_local	$5=, $pop423
+	i32.add 	$push423=, $4, $pop422
+	copy_local	$3=, $pop423
 	#APP
 	#NO_APP
-	i32.load	$push43=, 24($6)
-	i32.load	$push45=, 0($2)
-	i32.const	$push500=, 3
-	i32.rem_u	$push231=, $pop45, $pop500
+	i32.load	$push43=, 24($4)
+	i32.load	$push45=, 8($1)
+	i32.const	$push486=, 3
+	i32.rem_u	$push231=, $pop45, $pop486
 	i32.ne  	$push232=, $pop43, $pop231
 	br_if   	1, $pop232      # 1: down to label0
-# BB#24:                                # %lor.lhs.false147
+# %bb.24:                               # %lor.lhs.false147
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push42=, 20($6)
-	i32.load	$push44=, 0($3)
-	i32.const	$push501=, 3
-	i32.rem_u	$push233=, $pop44, $pop501
+	i32.load	$push42=, 20($4)
+	i32.load	$push44=, 4($1)
+	i32.const	$push487=, 3
+	i32.rem_u	$push233=, $pop44, $pop487
 	i32.ne  	$push234=, $pop42, $pop233
 	br_if   	1, $pop234      # 1: down to label0
-# BB#25:                                # %if.end154
+# %bb.25:                               # %if.end154
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push424=, 16
-	i32.add 	$push425=, $6, $pop424
-	copy_local	$5=, $pop425
+	i32.add 	$push425=, $4, $pop424
+	copy_local	$3=, $pop425
 	#APP
 	#NO_APP
 	i32.const	$push426=, 16
-	i32.add 	$push427=, $6, $pop426
+	i32.add 	$push427=, $4, $pop426
 	call    	uq6565@FUNCTION, $pop427, $1
-	i32.load	$push46=, 16($6)
+	i32.load	$push46=, 16($4)
 	i32.load	$push48=, 0($1)
-	i32.const	$push502=, 6
-	i32.div_u	$push235=, $pop48, $pop502
+	i32.const	$push488=, 6
+	i32.div_u	$push235=, $pop48, $pop488
 	i32.ne  	$push236=, $pop46, $pop235
 	br_if   	1, $pop236      # 1: down to label0
-# BB#26:                                # %lor.lhs.false161
+# %bb.26:                               # %lor.lhs.false161
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push47=, 28($6)
-	i32.load	$push49=, 0($4)
-	i32.const	$push503=, 5
-	i32.div_u	$push237=, $pop49, $pop503
+	i32.load	$push47=, 28($4)
+	i32.load	$push49=, 0($2)
+	i32.const	$push489=, 5
+	i32.div_u	$push237=, $pop49, $pop489
 	i32.ne  	$push238=, $pop47, $pop237
 	br_if   	1, $pop238      # 1: down to label0
-# BB#27:                                # %if.end168
+# %bb.27:                               # %if.end168
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push428=, 16
-	i32.add 	$push429=, $6, $pop428
-	copy_local	$5=, $pop429
+	i32.add 	$push429=, $4, $pop428
+	copy_local	$3=, $pop429
 	#APP
 	#NO_APP
-	i32.load	$push51=, 24($6)
-	i32.load	$push53=, 0($2)
-	i32.const	$push504=, 6
-	i32.div_u	$push239=, $pop53, $pop504
+	i32.load	$push51=, 24($4)
+	i32.load	$push53=, 8($1)
+	i32.const	$push490=, 6
+	i32.div_u	$push239=, $pop53, $pop490
 	i32.ne  	$push240=, $pop51, $pop239
 	br_if   	1, $pop240      # 1: down to label0
-# BB#28:                                # %lor.lhs.false174
+# %bb.28:                               # %lor.lhs.false174
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push50=, 20($6)
-	i32.load	$push52=, 0($3)
-	i32.const	$push505=, 5
-	i32.div_u	$push241=, $pop52, $pop505
+	i32.load	$push50=, 20($4)
+	i32.load	$push52=, 4($1)
+	i32.const	$push491=, 5
+	i32.div_u	$push241=, $pop52, $pop491
 	i32.ne  	$push242=, $pop50, $pop241
 	br_if   	1, $pop242      # 1: down to label0
-# BB#29:                                # %if.end181
+# %bb.29:                               # %if.end181
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push430=, 16
-	i32.add 	$push431=, $6, $pop430
-	copy_local	$5=, $pop431
+	i32.add 	$push431=, $4, $pop430
+	copy_local	$3=, $pop431
 	#APP
 	#NO_APP
 	i32.const	$push432=, 16
-	i32.add 	$push433=, $6, $pop432
+	i32.add 	$push433=, $4, $pop432
 	call    	ur6565@FUNCTION, $pop433, $1
-	i32.load	$push54=, 16($6)
+	i32.load	$push54=, 16($4)
 	i32.load	$push56=, 0($1)
-	i32.const	$push506=, 6
-	i32.rem_u	$push243=, $pop56, $pop506
+	i32.const	$push492=, 6
+	i32.rem_u	$push243=, $pop56, $pop492
 	i32.ne  	$push244=, $pop54, $pop243
 	br_if   	1, $pop244      # 1: down to label0
-# BB#30:                                # %lor.lhs.false188
+# %bb.30:                               # %lor.lhs.false188
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push55=, 28($6)
-	i32.load	$push57=, 0($4)
-	i32.const	$push507=, 5
-	i32.rem_u	$push245=, $pop57, $pop507
+	i32.load	$push55=, 28($4)
+	i32.load	$push57=, 0($2)
+	i32.const	$push493=, 5
+	i32.rem_u	$push245=, $pop57, $pop493
 	i32.ne  	$push246=, $pop55, $pop245
 	br_if   	1, $pop246      # 1: down to label0
-# BB#31:                                # %if.end195
+# %bb.31:                               # %if.end195
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push434=, 16
-	i32.add 	$push435=, $6, $pop434
-	copy_local	$5=, $pop435
+	i32.add 	$push435=, $4, $pop434
+	copy_local	$3=, $pop435
 	#APP
 	#NO_APP
-	i32.load	$push59=, 24($6)
-	i32.load	$push61=, 0($2)
-	i32.const	$push508=, 6
-	i32.rem_u	$push247=, $pop61, $pop508
+	i32.load	$push59=, 24($4)
+	i32.load	$push61=, 8($1)
+	i32.const	$push494=, 6
+	i32.rem_u	$push247=, $pop61, $pop494
 	i32.ne  	$push248=, $pop59, $pop247
 	br_if   	1, $pop248      # 1: down to label0
-# BB#32:                                # %lor.lhs.false201
+# %bb.32:                               # %lor.lhs.false201
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push58=, 20($6)
-	i32.load	$push60=, 0($3)
-	i32.const	$push509=, 5
-	i32.rem_u	$push249=, $pop60, $pop509
+	i32.load	$push58=, 20($4)
+	i32.load	$push60=, 4($1)
+	i32.const	$push495=, 5
+	i32.rem_u	$push249=, $pop60, $pop495
 	i32.ne  	$push250=, $pop58, $pop249
 	br_if   	1, $pop250      # 1: down to label0
-# BB#33:                                # %if.end208
+# %bb.33:                               # %if.end208
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push436=, 16
-	i32.add 	$push437=, $6, $pop436
-	copy_local	$5=, $pop437
+	i32.add 	$push437=, $4, $pop436
+	copy_local	$3=, $pop437
 	#APP
 	#NO_APP
 	i32.const	$push438=, 16
-	i32.add 	$push439=, $6, $pop438
+	i32.add 	$push439=, $4, $pop438
 	call    	uq1414146@FUNCTION, $pop439, $1
-	i32.load	$push62=, 16($6)
+	i32.load	$push62=, 16($4)
 	i32.load	$push64=, 0($1)
-	i32.const	$push510=, 14
-	i32.div_u	$push251=, $pop64, $pop510
+	i32.const	$push496=, 14
+	i32.div_u	$push251=, $pop64, $pop496
 	i32.ne  	$push252=, $pop62, $pop251
 	br_if   	1, $pop252      # 1: down to label0
-# BB#34:                                # %lor.lhs.false215
+# %bb.34:                               # %lor.lhs.false215
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push63=, 28($6)
-	i32.load	$push65=, 0($4)
-	i32.const	$push511=, 6
-	i32.div_u	$push253=, $pop65, $pop511
+	i32.load	$push63=, 28($4)
+	i32.load	$push65=, 0($2)
+	i32.const	$push497=, 6
+	i32.div_u	$push253=, $pop65, $pop497
 	i32.ne  	$push254=, $pop63, $pop253
 	br_if   	1, $pop254      # 1: down to label0
-# BB#35:                                # %if.end222
+# %bb.35:                               # %if.end222
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push440=, 16
-	i32.add 	$push441=, $6, $pop440
-	copy_local	$5=, $pop441
+	i32.add 	$push441=, $4, $pop440
+	copy_local	$3=, $pop441
 	#APP
 	#NO_APP
-	i32.load	$push67=, 24($6)
-	i32.load	$push69=, 0($2)
-	i32.const	$push512=, 14
-	i32.div_u	$push255=, $pop69, $pop512
+	i32.load	$push67=, 24($4)
+	i32.load	$push69=, 8($1)
+	i32.const	$push498=, 14
+	i32.div_u	$push255=, $pop69, $pop498
 	i32.ne  	$push256=, $pop67, $pop255
 	br_if   	1, $pop256      # 1: down to label0
-# BB#36:                                # %lor.lhs.false228
+# %bb.36:                               # %lor.lhs.false228
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push66=, 20($6)
-	i32.load	$push68=, 0($3)
-	i32.const	$push513=, 14
-	i32.div_u	$push257=, $pop68, $pop513
+	i32.load	$push66=, 20($4)
+	i32.load	$push68=, 4($1)
+	i32.const	$push499=, 14
+	i32.div_u	$push257=, $pop68, $pop499
 	i32.ne  	$push258=, $pop66, $pop257
 	br_if   	1, $pop258      # 1: down to label0
-# BB#37:                                # %if.end235
+# %bb.37:                               # %if.end235
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push442=, 16
-	i32.add 	$push443=, $6, $pop442
-	copy_local	$5=, $pop443
+	i32.add 	$push443=, $4, $pop442
+	copy_local	$3=, $pop443
 	#APP
 	#NO_APP
 	i32.const	$push444=, 16
-	i32.add 	$push445=, $6, $pop444
+	i32.add 	$push445=, $4, $pop444
 	call    	ur1414146@FUNCTION, $pop445, $1
-	i32.load	$push70=, 16($6)
+	i32.load	$push70=, 16($4)
 	i32.load	$push72=, 0($1)
-	i32.const	$push514=, 14
-	i32.rem_u	$push259=, $pop72, $pop514
+	i32.const	$push500=, 14
+	i32.rem_u	$push259=, $pop72, $pop500
 	i32.ne  	$push260=, $pop70, $pop259
 	br_if   	1, $pop260      # 1: down to label0
-# BB#38:                                # %lor.lhs.false242
+# %bb.38:                               # %lor.lhs.false242
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push71=, 28($6)
-	i32.load	$push73=, 0($4)
-	i32.const	$push515=, 6
-	i32.rem_u	$push261=, $pop73, $pop515
+	i32.load	$push71=, 28($4)
+	i32.load	$push73=, 0($2)
+	i32.const	$push501=, 6
+	i32.rem_u	$push261=, $pop73, $pop501
 	i32.ne  	$push262=, $pop71, $pop261
 	br_if   	1, $pop262      # 1: down to label0
-# BB#39:                                # %if.end249
+# %bb.39:                               # %if.end249
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push446=, 16
-	i32.add 	$push447=, $6, $pop446
-	copy_local	$5=, $pop447
+	i32.add 	$push447=, $4, $pop446
+	copy_local	$3=, $pop447
 	#APP
 	#NO_APP
-	i32.load	$push75=, 24($6)
-	i32.load	$push77=, 0($2)
-	i32.const	$push516=, 14
-	i32.rem_u	$push263=, $pop77, $pop516
+	i32.load	$push75=, 24($4)
+	i32.load	$push77=, 8($1)
+	i32.const	$push502=, 14
+	i32.rem_u	$push263=, $pop77, $pop502
 	i32.ne  	$push264=, $pop75, $pop263
 	br_if   	1, $pop264      # 1: down to label0
-# BB#40:                                # %lor.lhs.false255
+# %bb.40:                               # %lor.lhs.false255
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push74=, 20($6)
-	i32.load	$push76=, 0($3)
-	i32.const	$push517=, 14
-	i32.rem_u	$push265=, $pop76, $pop517
+	i32.load	$push74=, 20($4)
+	i32.load	$push76=, 4($1)
+	i32.const	$push503=, 14
+	i32.rem_u	$push265=, $pop76, $pop503
 	i32.ne  	$push266=, $pop74, $pop265
 	br_if   	1, $pop266      # 1: down to label0
-# BB#41:                                # %if.end262
+# %bb.41:                               # %if.end262
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push448=, 16
-	i32.add 	$push449=, $6, $pop448
-	copy_local	$5=, $pop449
+	i32.add 	$push449=, $4, $pop448
+	copy_local	$3=, $pop449
 	#APP
 	#NO_APP
 	i32.const	$push450=, 16
-	i32.add 	$push451=, $6, $pop450
+	i32.add 	$push451=, $4, $pop450
 	call    	uq7777@FUNCTION, $pop451, $1
-	i32.load	$push78=, 16($6)
+	i32.load	$push78=, 16($4)
 	i32.load	$push80=, 0($1)
-	i32.const	$push518=, 7
-	i32.div_u	$push267=, $pop80, $pop518
+	i32.const	$push504=, 7
+	i32.div_u	$push267=, $pop80, $pop504
 	i32.ne  	$push268=, $pop78, $pop267
 	br_if   	1, $pop268      # 1: down to label0
-# BB#42:                                # %lor.lhs.false269
+# %bb.42:                               # %lor.lhs.false269
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push79=, 28($6)
-	i32.load	$push81=, 0($4)
-	i32.const	$push519=, 7
-	i32.div_u	$push269=, $pop81, $pop519
+	i32.load	$push79=, 28($4)
+	i32.load	$push81=, 0($2)
+	i32.const	$push505=, 7
+	i32.div_u	$push269=, $pop81, $pop505
 	i32.ne  	$push270=, $pop79, $pop269
 	br_if   	1, $pop270      # 1: down to label0
-# BB#43:                                # %if.end276
+# %bb.43:                               # %if.end276
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push452=, 16
-	i32.add 	$push453=, $6, $pop452
-	copy_local	$5=, $pop453
+	i32.add 	$push453=, $4, $pop452
+	copy_local	$3=, $pop453
 	#APP
 	#NO_APP
-	i32.load	$push83=, 24($6)
-	i32.load	$push85=, 0($2)
-	i32.const	$push520=, 7
-	i32.div_u	$push271=, $pop85, $pop520
+	i32.load	$push83=, 24($4)
+	i32.load	$push85=, 8($1)
+	i32.const	$push506=, 7
+	i32.div_u	$push271=, $pop85, $pop506
 	i32.ne  	$push272=, $pop83, $pop271
 	br_if   	1, $pop272      # 1: down to label0
-# BB#44:                                # %lor.lhs.false282
+# %bb.44:                               # %lor.lhs.false282
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push82=, 20($6)
-	i32.load	$push84=, 0($3)
-	i32.const	$push521=, 7
-	i32.div_u	$push273=, $pop84, $pop521
+	i32.load	$push82=, 20($4)
+	i32.load	$push84=, 4($1)
+	i32.const	$push507=, 7
+	i32.div_u	$push273=, $pop84, $pop507
 	i32.ne  	$push274=, $pop82, $pop273
 	br_if   	1, $pop274      # 1: down to label0
-# BB#45:                                # %if.end289
+# %bb.45:                               # %if.end289
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push454=, 16
-	i32.add 	$push455=, $6, $pop454
-	copy_local	$5=, $pop455
+	i32.add 	$push455=, $4, $pop454
+	copy_local	$3=, $pop455
 	#APP
 	#NO_APP
 	i32.const	$push456=, 16
-	i32.add 	$push457=, $6, $pop456
+	i32.add 	$push457=, $4, $pop456
 	call    	ur7777@FUNCTION, $pop457, $1
-	i32.load	$push86=, 16($6)
+	i32.load	$push86=, 16($4)
 	i32.load	$push88=, 0($1)
-	i32.const	$push522=, 7
-	i32.rem_u	$push275=, $pop88, $pop522
+	i32.const	$push508=, 7
+	i32.rem_u	$push275=, $pop88, $pop508
 	i32.ne  	$push276=, $pop86, $pop275
 	br_if   	1, $pop276      # 1: down to label0
-# BB#46:                                # %lor.lhs.false296
+# %bb.46:                               # %lor.lhs.false296
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push87=, 28($6)
-	i32.load	$push89=, 0($4)
-	i32.const	$push523=, 7
-	i32.rem_u	$push277=, $pop89, $pop523
+	i32.load	$push87=, 28($4)
+	i32.load	$push89=, 0($2)
+	i32.const	$push509=, 7
+	i32.rem_u	$push277=, $pop89, $pop509
 	i32.ne  	$push278=, $pop87, $pop277
 	br_if   	1, $pop278      # 1: down to label0
-# BB#47:                                # %if.end303
+# %bb.47:                               # %if.end303
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push458=, 16
-	i32.add 	$push459=, $6, $pop458
-	copy_local	$1=, $pop459
+	i32.add 	$push459=, $4, $pop458
+	copy_local	$2=, $pop459
 	#APP
 	#NO_APP
-	i32.load	$push91=, 24($6)
-	i32.load	$push93=, 0($2)
-	i32.const	$push524=, 7
-	i32.rem_u	$push279=, $pop93, $pop524
+	i32.load	$push91=, 24($4)
+	i32.load	$push93=, 8($1)
+	i32.const	$push510=, 7
+	i32.rem_u	$push279=, $pop93, $pop510
 	i32.ne  	$push280=, $pop91, $pop279
 	br_if   	1, $pop280      # 1: down to label0
-# BB#48:                                # %lor.lhs.false309
+# %bb.48:                               # %lor.lhs.false309
                                         #   in Loop: Header=BB24_1 Depth=1
-	i32.load	$push90=, 20($6)
-	i32.load	$push92=, 0($3)
-	i32.const	$push525=, 7
-	i32.rem_u	$push281=, $pop92, $pop525
+	i32.load	$push90=, 20($4)
+	i32.load	$push92=, 4($1)
+	i32.const	$push511=, 7
+	i32.rem_u	$push281=, $pop92, $pop511
 	i32.ne  	$push282=, $pop90, $pop281
 	br_if   	1, $pop282      # 1: down to label0
-# BB#49:                                # %if.end316
+# %bb.49:                               # %if.end316
                                         #   in Loop: Header=BB24_1 Depth=1
 	i32.const	$push460=, 16
-	i32.add 	$push461=, $6, $pop460
+	i32.add 	$push461=, $4, $pop460
 	copy_local	$1=, $pop461
 	#APP
 	#NO_APP
 	i32.const	$push283=, 1
 	i32.add 	$1=, $0, $pop283
 	i32.const	$0=, 1
-	i32.const	$push526=, 2
-	i32.lt_u	$push284=, $1, $pop526
+	i32.const	$push512=, 2
+	i32.lt_u	$push284=, $1, $pop512
 	br_if   	0, $pop284      # 0: up to label1
-# BB#50:                                # %for.body319.preheader
+# %bb.50:                               # %for.body319.preheader
 	end_loop
 	i32.const	$0=, 0
 .LBB24_51:                              # %for.body319
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	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.const	$push515=, 4
+	i32.shl 	$2=, $0, $pop515
+	i32.const	$push514=, s
+	i32.add 	$1=, $2, $pop514
+	call    	sq4444@FUNCTION, $4, $1
+	i32.load	$push94=, 0($4)
 	i32.load	$push96=, 0($1)
-	i32.const	$push527=, 4
-	i32.div_s	$push285=, $pop96, $pop527
+	i32.const	$push513=, 4
+	i32.div_s	$push285=, $pop96, $pop513
 	i32.ne  	$push286=, $pop94, $pop285
 	br_if   	1, $pop286      # 1: down to label0
-# BB#52:                                # %lor.lhs.false326
+# %bb.52:                               # %lor.lhs.false326
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push95=, 12($6)
-	i32.const	$push535=, s+12
-	i32.add 	$push287=, $2, $pop535
+	i32.load	$push95=, 12($4)
+	i32.const	$push517=, s+12
+	i32.add 	$push287=, $2, $pop517
 	i32.load	$push97=, 0($pop287)
-	i32.const	$push534=, 4
-	i32.div_s	$push288=, $pop97, $pop534
+	i32.const	$push516=, 4
+	i32.div_s	$push288=, $pop97, $pop516
 	i32.ne  	$push289=, $pop95, $pop288
 	br_if   	1, $pop289      # 1: down to label0
-# BB#53:                                # %if.end333
+# %bb.53:                               # %if.end333
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$2=, $6
+	copy_local	$2=, $4
 	#APP
 	#NO_APP
-	i32.load	$push99=, 8($6)
-	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.load	$push99=, 8($4)
+	i32.load	$push101=, 8($1)
+	i32.const	$push518=, 4
+	i32.div_s	$push290=, $pop101, $pop518
 	i32.ne  	$push291=, $pop99, $pop290
 	br_if   	1, $pop291      # 1: down to label0
-# BB#54:                                # %lor.lhs.false339
+# %bb.54:                               # %lor.lhs.false339
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push98=, 4($6)
-	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.load	$push98=, 4($4)
+	i32.load	$push100=, 4($1)
+	i32.const	$push519=, 4
+	i32.div_s	$push292=, $pop100, $pop519
 	i32.ne  	$push293=, $pop98, $pop292
 	br_if   	1, $pop293      # 1: down to label0
-# BB#55:                                # %if.end346
+# %bb.55:                               # %if.end346
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$4=, $6
+	copy_local	$2=, $4
 	#APP
 	#NO_APP
-	call    	sr4444@FUNCTION, $6, $1
-	i32.load	$push102=, 0($6)
+	call    	sr4444@FUNCTION, $4, $1
+	i32.load	$push102=, 0($4)
 	i32.load	$push104=, 0($1)
-	i32.const	$push544=, 4
-	i32.rem_s	$push294=, $pop104, $pop544
+	i32.const	$push520=, 4
+	i32.rem_s	$push294=, $pop104, $pop520
 	i32.ne  	$push295=, $pop102, $pop294
 	br_if   	1, $pop295      # 1: down to label0
-# BB#56:                                # %lor.lhs.false353
+# %bb.56:                               # %lor.lhs.false353
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push103=, 12($6)
-	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.const	$push522=, 12
+	i32.add 	$2=, $1, $pop522
+	i32.load	$push103=, 12($4)
+	i32.load	$push105=, 0($2)
+	i32.const	$push521=, 4
+	i32.rem_s	$push296=, $pop105, $pop521
 	i32.ne  	$push297=, $pop103, $pop296
 	br_if   	1, $pop297      # 1: down to label0
-# BB#57:                                # %if.end360
+# %bb.57:                               # %if.end360
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push107=, 8($6)
-	i32.load	$push109=, 0($2)
-	i32.const	$push549=, 4
-	i32.rem_s	$push298=, $pop109, $pop549
+	i32.load	$push107=, 8($4)
+	i32.load	$push109=, 8($1)
+	i32.const	$push523=, 4
+	i32.rem_s	$push298=, $pop109, $pop523
 	i32.ne  	$push299=, $pop107, $pop298
 	br_if   	1, $pop299      # 1: down to label0
-# BB#58:                                # %lor.lhs.false366
+# %bb.58:                               # %lor.lhs.false366
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push106=, 4($6)
-	i32.load	$push108=, 0($3)
-	i32.const	$push550=, 4
-	i32.rem_s	$push300=, $pop108, $pop550
+	i32.load	$push106=, 4($4)
+	i32.load	$push108=, 4($1)
+	i32.const	$push524=, 4
+	i32.rem_s	$push300=, $pop108, $pop524
 	i32.ne  	$push301=, $pop106, $pop300
 	br_if   	1, $pop301      # 1: down to label0
-# BB#59:                                # %if.end373
+# %bb.59:                               # %if.end373
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sq1428@FUNCTION, $6, $1
-	i32.load	$push110=, 0($6)
+	call    	sq1428@FUNCTION, $4, $1
+	i32.load	$push110=, 0($4)
 	i32.load	$push112=, 0($1)
 	i32.ne  	$push302=, $pop110, $pop112
 	br_if   	1, $pop302      # 1: down to label0
-# BB#60:                                # %lor.lhs.false380
+# %bb.60:                               # %lor.lhs.false380
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push111=, 12($6)
-	i32.load	$push113=, 0($4)
-	i32.const	$push551=, 8
-	i32.div_s	$push303=, $pop113, $pop551
+	i32.load	$push111=, 12($4)
+	i32.load	$push113=, 0($2)
+	i32.const	$push525=, 8
+	i32.div_s	$push303=, $pop113, $pop525
 	i32.ne  	$push304=, $pop111, $pop303
 	br_if   	1, $pop304      # 1: down to label0
-# BB#61:                                # %if.end387
+# %bb.61:                               # %if.end387
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push115=, 8($6)
-	i32.load	$push117=, 0($2)
-	i32.const	$push552=, 2
-	i32.div_s	$push305=, $pop117, $pop552
+	i32.load	$push115=, 8($4)
+	i32.load	$push117=, 8($1)
+	i32.const	$push526=, 2
+	i32.div_s	$push305=, $pop117, $pop526
 	i32.ne  	$push306=, $pop115, $pop305
 	br_if   	1, $pop306      # 1: down to label0
-# BB#62:                                # %lor.lhs.false393
+# %bb.62:                               # %lor.lhs.false393
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push114=, 4($6)
-	i32.load	$push116=, 0($3)
-	i32.const	$push553=, 4
-	i32.div_s	$push307=, $pop116, $pop553
+	i32.load	$push114=, 4($4)
+	i32.load	$push116=, 4($1)
+	i32.const	$push527=, 4
+	i32.div_s	$push307=, $pop116, $pop527
 	i32.ne  	$push308=, $pop114, $pop307
 	br_if   	1, $pop308      # 1: down to label0
-# BB#63:                                # %if.end400
+# %bb.63:                               # %if.end400
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sr1428@FUNCTION, $6, $1
-	i32.load	$push118=, 0($6)
+	call    	sr1428@FUNCTION, $4, $1
+	i32.load	$push118=, 0($4)
 	br_if   	1, $pop118      # 1: down to label0
-# BB#64:                                # %lor.lhs.false407
+# %bb.64:                               # %lor.lhs.false407
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push119=, 12($6)
-	i32.load	$push309=, 0($4)
-	i32.const	$push554=, 8
-	i32.rem_s	$push310=, $pop309, $pop554
+	i32.load	$push119=, 12($4)
+	i32.load	$push309=, 0($2)
+	i32.const	$push528=, 8
+	i32.rem_s	$push310=, $pop309, $pop528
 	i32.ne  	$push311=, $pop119, $pop310
 	br_if   	1, $pop311      # 1: down to label0
-# BB#65:                                # %if.end414
+# %bb.65:                               # %if.end414
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push121=, 8($6)
-	i32.load	$push123=, 0($2)
-	i32.const	$push555=, 2
-	i32.rem_s	$push312=, $pop123, $pop555
+	i32.load	$push121=, 8($4)
+	i32.load	$push123=, 8($1)
+	i32.const	$push529=, 2
+	i32.rem_s	$push312=, $pop123, $pop529
 	i32.ne  	$push313=, $pop121, $pop312
 	br_if   	1, $pop313      # 1: down to label0
-# BB#66:                                # %lor.lhs.false420
+# %bb.66:                               # %lor.lhs.false420
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push120=, 4($6)
-	i32.load	$push122=, 0($3)
-	i32.const	$push556=, 4
-	i32.rem_s	$push314=, $pop122, $pop556
+	i32.load	$push120=, 4($4)
+	i32.load	$push122=, 4($1)
+	i32.const	$push530=, 4
+	i32.rem_s	$push314=, $pop122, $pop530
 	i32.ne  	$push315=, $pop120, $pop314
 	br_if   	1, $pop315      # 1: down to label0
-# BB#67:                                # %if.end427
+# %bb.67:                               # %if.end427
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sq3333@FUNCTION, $6, $1
-	i32.load	$push124=, 0($6)
+	call    	sq3333@FUNCTION, $4, $1
+	i32.load	$push124=, 0($4)
 	i32.load	$push126=, 0($1)
-	i32.const	$push557=, 3
-	i32.div_s	$push316=, $pop126, $pop557
+	i32.const	$push531=, 3
+	i32.div_s	$push316=, $pop126, $pop531
 	i32.ne  	$push317=, $pop124, $pop316
 	br_if   	1, $pop317      # 1: down to label0
-# BB#68:                                # %lor.lhs.false434
+# %bb.68:                               # %lor.lhs.false434
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push125=, 12($6)
-	i32.load	$push127=, 0($4)
-	i32.const	$push558=, 3
-	i32.div_s	$push318=, $pop127, $pop558
+	i32.load	$push125=, 12($4)
+	i32.load	$push127=, 0($2)
+	i32.const	$push532=, 3
+	i32.div_s	$push318=, $pop127, $pop532
 	i32.ne  	$push319=, $pop125, $pop318
 	br_if   	1, $pop319      # 1: down to label0
-# BB#69:                                # %if.end441
+# %bb.69:                               # %if.end441
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push129=, 8($6)
-	i32.load	$push131=, 0($2)
-	i32.const	$push559=, 3
-	i32.div_s	$push320=, $pop131, $pop559
+	i32.load	$push129=, 8($4)
+	i32.load	$push131=, 8($1)
+	i32.const	$push533=, 3
+	i32.div_s	$push320=, $pop131, $pop533
 	i32.ne  	$push321=, $pop129, $pop320
 	br_if   	1, $pop321      # 1: down to label0
-# BB#70:                                # %lor.lhs.false447
+# %bb.70:                               # %lor.lhs.false447
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push128=, 4($6)
-	i32.load	$push130=, 0($3)
-	i32.const	$push560=, 3
-	i32.div_s	$push322=, $pop130, $pop560
+	i32.load	$push128=, 4($4)
+	i32.load	$push130=, 4($1)
+	i32.const	$push534=, 3
+	i32.div_s	$push322=, $pop130, $pop534
 	i32.ne  	$push323=, $pop128, $pop322
 	br_if   	1, $pop323      # 1: down to label0
-# BB#71:                                # %if.end454
+# %bb.71:                               # %if.end454
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sr3333@FUNCTION, $6, $1
-	i32.load	$push132=, 0($6)
+	call    	sr3333@FUNCTION, $4, $1
+	i32.load	$push132=, 0($4)
 	i32.load	$push134=, 0($1)
-	i32.const	$push561=, 3
-	i32.rem_s	$push324=, $pop134, $pop561
+	i32.const	$push535=, 3
+	i32.rem_s	$push324=, $pop134, $pop535
 	i32.ne  	$push325=, $pop132, $pop324
 	br_if   	1, $pop325      # 1: down to label0
-# BB#72:                                # %lor.lhs.false461
+# %bb.72:                               # %lor.lhs.false461
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push133=, 12($6)
-	i32.load	$push135=, 0($4)
-	i32.const	$push562=, 3
-	i32.rem_s	$push326=, $pop135, $pop562
+	i32.load	$push133=, 12($4)
+	i32.load	$push135=, 0($2)
+	i32.const	$push536=, 3
+	i32.rem_s	$push326=, $pop135, $pop536
 	i32.ne  	$push327=, $pop133, $pop326
 	br_if   	1, $pop327      # 1: down to label0
-# BB#73:                                # %if.end468
+# %bb.73:                               # %if.end468
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push137=, 8($6)
-	i32.load	$push139=, 0($2)
-	i32.const	$push563=, 3
-	i32.rem_s	$push328=, $pop139, $pop563
+	i32.load	$push137=, 8($4)
+	i32.load	$push139=, 8($1)
+	i32.const	$push537=, 3
+	i32.rem_s	$push328=, $pop139, $pop537
 	i32.ne  	$push329=, $pop137, $pop328
 	br_if   	1, $pop329      # 1: down to label0
-# BB#74:                                # %lor.lhs.false474
+# %bb.74:                               # %lor.lhs.false474
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push136=, 4($6)
-	i32.load	$push138=, 0($3)
-	i32.const	$push564=, 3
-	i32.rem_s	$push330=, $pop138, $pop564
+	i32.load	$push136=, 4($4)
+	i32.load	$push138=, 4($1)
+	i32.const	$push538=, 3
+	i32.rem_s	$push330=, $pop138, $pop538
 	i32.ne  	$push331=, $pop136, $pop330
 	br_if   	1, $pop331      # 1: down to label0
-# BB#75:                                # %if.end481
+# %bb.75:                               # %if.end481
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sq6565@FUNCTION, $6, $1
-	i32.load	$push140=, 0($6)
+	call    	sq6565@FUNCTION, $4, $1
+	i32.load	$push140=, 0($4)
 	i32.load	$push142=, 0($1)
-	i32.const	$push565=, 6
-	i32.div_s	$push332=, $pop142, $pop565
+	i32.const	$push539=, 6
+	i32.div_s	$push332=, $pop142, $pop539
 	i32.ne  	$push333=, $pop140, $pop332
 	br_if   	1, $pop333      # 1: down to label0
-# BB#76:                                # %lor.lhs.false488
+# %bb.76:                               # %lor.lhs.false488
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push141=, 12($6)
-	i32.load	$push143=, 0($4)
-	i32.const	$push566=, 5
-	i32.div_s	$push334=, $pop143, $pop566
+	i32.load	$push141=, 12($4)
+	i32.load	$push143=, 0($2)
+	i32.const	$push540=, 5
+	i32.div_s	$push334=, $pop143, $pop540
 	i32.ne  	$push335=, $pop141, $pop334
 	br_if   	1, $pop335      # 1: down to label0
-# BB#77:                                # %if.end495
+# %bb.77:                               # %if.end495
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push145=, 8($6)
-	i32.load	$push147=, 0($2)
-	i32.const	$push567=, 6
-	i32.div_s	$push336=, $pop147, $pop567
+	i32.load	$push145=, 8($4)
+	i32.load	$push147=, 8($1)
+	i32.const	$push541=, 6
+	i32.div_s	$push336=, $pop147, $pop541
 	i32.ne  	$push337=, $pop145, $pop336
 	br_if   	1, $pop337      # 1: down to label0
-# BB#78:                                # %lor.lhs.false501
+# %bb.78:                               # %lor.lhs.false501
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push144=, 4($6)
-	i32.load	$push146=, 0($3)
-	i32.const	$push568=, 5
-	i32.div_s	$push338=, $pop146, $pop568
+	i32.load	$push144=, 4($4)
+	i32.load	$push146=, 4($1)
+	i32.const	$push542=, 5
+	i32.div_s	$push338=, $pop146, $pop542
 	i32.ne  	$push339=, $pop144, $pop338
 	br_if   	1, $pop339      # 1: down to label0
-# BB#79:                                # %if.end508
+# %bb.79:                               # %if.end508
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sr6565@FUNCTION, $6, $1
-	i32.load	$push148=, 0($6)
+	call    	sr6565@FUNCTION, $4, $1
+	i32.load	$push148=, 0($4)
 	i32.load	$push150=, 0($1)
-	i32.const	$push569=, 6
-	i32.rem_s	$push340=, $pop150, $pop569
+	i32.const	$push543=, 6
+	i32.rem_s	$push340=, $pop150, $pop543
 	i32.ne  	$push341=, $pop148, $pop340
 	br_if   	1, $pop341      # 1: down to label0
-# BB#80:                                # %lor.lhs.false515
+# %bb.80:                               # %lor.lhs.false515
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push149=, 12($6)
-	i32.load	$push151=, 0($4)
-	i32.const	$push570=, 5
-	i32.rem_s	$push342=, $pop151, $pop570
+	i32.load	$push149=, 12($4)
+	i32.load	$push151=, 0($2)
+	i32.const	$push544=, 5
+	i32.rem_s	$push342=, $pop151, $pop544
 	i32.ne  	$push343=, $pop149, $pop342
 	br_if   	1, $pop343      # 1: down to label0
-# BB#81:                                # %if.end522
+# %bb.81:                               # %if.end522
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push153=, 8($6)
-	i32.load	$push155=, 0($2)
-	i32.const	$push571=, 6
-	i32.rem_s	$push344=, $pop155, $pop571
+	i32.load	$push153=, 8($4)
+	i32.load	$push155=, 8($1)
+	i32.const	$push545=, 6
+	i32.rem_s	$push344=, $pop155, $pop545
 	i32.ne  	$push345=, $pop153, $pop344
 	br_if   	1, $pop345      # 1: down to label0
-# BB#82:                                # %lor.lhs.false528
+# %bb.82:                               # %lor.lhs.false528
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push152=, 4($6)
-	i32.load	$push154=, 0($3)
-	i32.const	$push572=, 5
-	i32.rem_s	$push346=, $pop154, $pop572
+	i32.load	$push152=, 4($4)
+	i32.load	$push154=, 4($1)
+	i32.const	$push546=, 5
+	i32.rem_s	$push346=, $pop154, $pop546
 	i32.ne  	$push347=, $pop152, $pop346
 	br_if   	1, $pop347      # 1: down to label0
-# BB#83:                                # %if.end535
+# %bb.83:                               # %if.end535
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sq1414146@FUNCTION, $6, $1
-	i32.load	$push156=, 0($6)
+	call    	sq1414146@FUNCTION, $4, $1
+	i32.load	$push156=, 0($4)
 	i32.load	$push158=, 0($1)
-	i32.const	$push573=, 14
-	i32.div_s	$push348=, $pop158, $pop573
+	i32.const	$push547=, 14
+	i32.div_s	$push348=, $pop158, $pop547
 	i32.ne  	$push349=, $pop156, $pop348
 	br_if   	1, $pop349      # 1: down to label0
-# BB#84:                                # %lor.lhs.false542
+# %bb.84:                               # %lor.lhs.false542
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push157=, 12($6)
-	i32.load	$push159=, 0($4)
-	i32.const	$push574=, 6
-	i32.div_s	$push350=, $pop159, $pop574
+	i32.load	$push157=, 12($4)
+	i32.load	$push159=, 0($2)
+	i32.const	$push548=, 6
+	i32.div_s	$push350=, $pop159, $pop548
 	i32.ne  	$push351=, $pop157, $pop350
 	br_if   	1, $pop351      # 1: down to label0
-# BB#85:                                # %if.end549
+# %bb.85:                               # %if.end549
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push161=, 8($6)
-	i32.load	$push163=, 0($2)
-	i32.const	$push575=, 14
-	i32.div_s	$push352=, $pop163, $pop575
+	i32.load	$push161=, 8($4)
+	i32.load	$push163=, 8($1)
+	i32.const	$push549=, 14
+	i32.div_s	$push352=, $pop163, $pop549
 	i32.ne  	$push353=, $pop161, $pop352
 	br_if   	1, $pop353      # 1: down to label0
-# BB#86:                                # %lor.lhs.false555
+# %bb.86:                               # %lor.lhs.false555
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push160=, 4($6)
-	i32.load	$push162=, 0($3)
-	i32.const	$push576=, 14
-	i32.div_s	$push354=, $pop162, $pop576
+	i32.load	$push160=, 4($4)
+	i32.load	$push162=, 4($1)
+	i32.const	$push550=, 14
+	i32.div_s	$push354=, $pop162, $pop550
 	i32.ne  	$push355=, $pop160, $pop354
 	br_if   	1, $pop355      # 1: down to label0
-# BB#87:                                # %if.end562
+# %bb.87:                               # %if.end562
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sr1414146@FUNCTION, $6, $1
-	i32.load	$push164=, 0($6)
+	call    	sr1414146@FUNCTION, $4, $1
+	i32.load	$push164=, 0($4)
 	i32.load	$push166=, 0($1)
-	i32.const	$push577=, 14
-	i32.rem_s	$push356=, $pop166, $pop577
+	i32.const	$push551=, 14
+	i32.rem_s	$push356=, $pop166, $pop551
 	i32.ne  	$push357=, $pop164, $pop356
 	br_if   	1, $pop357      # 1: down to label0
-# BB#88:                                # %lor.lhs.false569
+# %bb.88:                               # %lor.lhs.false569
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push165=, 12($6)
-	i32.load	$push167=, 0($4)
-	i32.const	$push578=, 6
-	i32.rem_s	$push358=, $pop167, $pop578
+	i32.load	$push165=, 12($4)
+	i32.load	$push167=, 0($2)
+	i32.const	$push552=, 6
+	i32.rem_s	$push358=, $pop167, $pop552
 	i32.ne  	$push359=, $pop165, $pop358
 	br_if   	1, $pop359      # 1: down to label0
-# BB#89:                                # %if.end576
+# %bb.89:                               # %if.end576
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push169=, 8($6)
-	i32.load	$push171=, 0($2)
-	i32.const	$push579=, 14
-	i32.rem_s	$push360=, $pop171, $pop579
+	i32.load	$push169=, 8($4)
+	i32.load	$push171=, 8($1)
+	i32.const	$push553=, 14
+	i32.rem_s	$push360=, $pop171, $pop553
 	i32.ne  	$push361=, $pop169, $pop360
 	br_if   	1, $pop361      # 1: down to label0
-# BB#90:                                # %lor.lhs.false582
+# %bb.90:                               # %lor.lhs.false582
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push168=, 4($6)
-	i32.load	$push170=, 0($3)
-	i32.const	$push580=, 14
-	i32.rem_s	$push362=, $pop170, $pop580
+	i32.load	$push168=, 4($4)
+	i32.load	$push170=, 4($1)
+	i32.const	$push554=, 14
+	i32.rem_s	$push362=, $pop170, $pop554
 	i32.ne  	$push363=, $pop168, $pop362
 	br_if   	1, $pop363      # 1: down to label0
-# BB#91:                                # %if.end589
+# %bb.91:                               # %if.end589
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sq7777@FUNCTION, $6, $1
-	i32.load	$push172=, 0($6)
+	call    	sq7777@FUNCTION, $4, $1
+	i32.load	$push172=, 0($4)
 	i32.load	$push174=, 0($1)
-	i32.const	$push581=, 7
-	i32.div_s	$push364=, $pop174, $pop581
+	i32.const	$push555=, 7
+	i32.div_s	$push364=, $pop174, $pop555
 	i32.ne  	$push365=, $pop172, $pop364
 	br_if   	1, $pop365      # 1: down to label0
-# BB#92:                                # %lor.lhs.false596
+# %bb.92:                               # %lor.lhs.false596
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push173=, 12($6)
-	i32.load	$push175=, 0($4)
-	i32.const	$push582=, 7
-	i32.div_s	$push366=, $pop175, $pop582
+	i32.load	$push173=, 12($4)
+	i32.load	$push175=, 0($2)
+	i32.const	$push556=, 7
+	i32.div_s	$push366=, $pop175, $pop556
 	i32.ne  	$push367=, $pop173, $pop366
 	br_if   	1, $pop367      # 1: down to label0
-# BB#93:                                # %if.end603
+# %bb.93:                               # %if.end603
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	i32.load	$push177=, 8($6)
-	i32.load	$push179=, 0($2)
-	i32.const	$push583=, 7
-	i32.div_s	$push368=, $pop179, $pop583
+	i32.load	$push177=, 8($4)
+	i32.load	$push179=, 8($1)
+	i32.const	$push557=, 7
+	i32.div_s	$push368=, $pop179, $pop557
 	i32.ne  	$push369=, $pop177, $pop368
 	br_if   	1, $pop369      # 1: down to label0
-# BB#94:                                # %lor.lhs.false609
+# %bb.94:                               # %lor.lhs.false609
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push176=, 4($6)
-	i32.load	$push178=, 0($3)
-	i32.const	$push584=, 7
-	i32.div_s	$push370=, $pop178, $pop584
+	i32.load	$push176=, 4($4)
+	i32.load	$push178=, 4($1)
+	i32.const	$push558=, 7
+	i32.div_s	$push370=, $pop178, $pop558
 	i32.ne  	$push371=, $pop176, $pop370
 	br_if   	1, $pop371      # 1: down to label0
-# BB#95:                                # %if.end616
+# %bb.95:                               # %if.end616
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$5=, $6
+	copy_local	$3=, $4
 	#APP
 	#NO_APP
-	call    	sr7777@FUNCTION, $6, $1
-	i32.load	$push180=, 0($6)
+	call    	sr7777@FUNCTION, $4, $1
+	i32.load	$push180=, 0($4)
 	i32.load	$push182=, 0($1)
-	i32.const	$push585=, 7
-	i32.rem_s	$push372=, $pop182, $pop585
+	i32.const	$push559=, 7
+	i32.rem_s	$push372=, $pop182, $pop559
 	i32.ne  	$push373=, $pop180, $pop372
 	br_if   	1, $pop373      # 1: down to label0
-# BB#96:                                # %lor.lhs.false623
+# %bb.96:                               # %lor.lhs.false623
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push181=, 12($6)
-	i32.load	$push183=, 0($4)
-	i32.const	$push586=, 7
-	i32.rem_s	$push374=, $pop183, $pop586
+	i32.load	$push181=, 12($4)
+	i32.load	$push183=, 0($2)
+	i32.const	$push560=, 7
+	i32.rem_s	$push374=, $pop183, $pop560
 	i32.ne  	$push375=, $pop181, $pop374
 	br_if   	1, $pop375      # 1: down to label0
-# BB#97:                                # %if.end630
+# %bb.97:                               # %if.end630
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$1=, $6
+	copy_local	$2=, $4
 	#APP
 	#NO_APP
-	i32.load	$push185=, 8($6)
-	i32.load	$push187=, 0($2)
-	i32.const	$push587=, 7
-	i32.rem_s	$push376=, $pop187, $pop587
+	i32.load	$push185=, 8($4)
+	i32.load	$push187=, 8($1)
+	i32.const	$push561=, 7
+	i32.rem_s	$push376=, $pop187, $pop561
 	i32.ne  	$push377=, $pop185, $pop376
 	br_if   	1, $pop377      # 1: down to label0
-# BB#98:                                # %lor.lhs.false636
+# %bb.98:                               # %lor.lhs.false636
                                         #   in Loop: Header=BB24_51 Depth=1
-	i32.load	$push184=, 4($6)
-	i32.load	$push186=, 0($3)
-	i32.const	$push588=, 7
-	i32.rem_s	$push378=, $pop186, $pop588
+	i32.load	$push184=, 4($4)
+	i32.load	$push186=, 4($1)
+	i32.const	$push562=, 7
+	i32.rem_s	$push378=, $pop186, $pop562
 	i32.ne  	$push379=, $pop184, $pop378
 	br_if   	1, $pop379      # 1: down to label0
-# BB#99:                                # %if.end643
+# %bb.99:                               # %if.end643
                                         #   in Loop: Header=BB24_51 Depth=1
-	copy_local	$1=, $6
+	copy_local	$1=, $4
 	#APP
 	#NO_APP
 	i32.const	$push380=, 1
 	i32.add 	$1=, $0, $pop380
 	i32.const	$0=, 1
-	i32.const	$push589=, 2
-	i32.lt_u	$push381=, $1, $pop589
+	i32.const	$push563=, 2
+	i32.lt_u	$push381=, $1, $pop563
 	br_if   	0, $pop381      # 0: up to label2
-# BB#100:                               # %for.end646
+# %bb.100:                              # %for.end646
 	end_loop
 	i32.const	$push389=, 0
 	i32.const	$push387=, 32
-	i32.add 	$push388=, $6, $pop387
+	i32.add 	$push388=, $4, $pop387
 	i32.store	__stack_pointer($pop389), $pop388
 	i32.const	$push382=, 0
 	return  	$pop382
@@ -2071,5 +1860,5 @@ s:
 	.size	s, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr53688.c.s b/test/torture-s/pr53688.c.s
index e93d2e4b0..fc9a5d20a 100644
--- a/test/torture-s/pr53688.c.s
+++ b/test/torture-s/pr53688.c.s
@@ -5,7 +5,7 @@
 	.globl	init
 	.type	init,@function
 init:                                   # @init
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, 6147487297207357523
 	i64.store	p+9($pop1):p2align=0, $pop0
@@ -29,24 +29,23 @@ init:                                   # @init
 main:                                   # @main
 	.result 	i32
 	.local  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	init@FUNCTION
-	i32.const	$push19=, 0
-	i32.const	$push0=, 32
-	i32.store8	headline+9($pop19), $pop0
-	i32.const	$push18=, 0
 	i32.const	$push17=, 0
-	i32.load8_u	$push1=, p+8($pop17)
-	i32.store8	headline+8($pop18), $pop1
+	i32.const	$push0=, 32
+	i32.store8	headline+9($pop17), $pop0
 	i32.const	$push16=, 0
 	i32.const	$push15=, 0
-	i64.load	$push2=, p($pop15):p2align=0
-	i64.store	headline($pop16), $pop2
+	i32.load8_u	$push1=, p+8($pop15)
+	i32.store8	headline+8($pop16), $pop1
 	i32.const	$push14=, 0
 	i32.const	$push13=, 0
-	i64.load	$push12=, p+9($pop13):p2align=0
-	tee_local	$push11=, $0=, $pop12
-	i64.store	headline+10($pop14):p2align=1, $pop11
+	i64.load	$push2=, p($pop13):p2align=0
+	i64.store	headline($pop14), $pop2
+	i32.const	$push12=, 0
+	i64.load	$0=, p+9($pop12):p2align=0
+	i32.const	$push11=, 0
+	i64.store	headline+10($pop11):p2align=1, $0
 	i32.const	$push4=, headline+18
 	i32.const	$push10=, 32
 	i32.const	$push3=, 238
@@ -58,9 +57,9 @@ main:                                   # @main
 	i32.const	$push8=, 83
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push20=, 0
-	return  	$pop20
+# %bb.1:                                # %if.end
+	i32.const	$push18=, 0
+	return  	$pop18
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -93,5 +92,5 @@ headline:
 	.size	headline, 256
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr54471.c.s b/test/torture-s/pr54471.c.s
index 402e4ee8d..616c08aea 100644
--- a/test/torture-s/pr54471.c.s
+++ b/test/torture-s/pr54471.c.s
@@ -7,60 +7,56 @@
 foo:                                    # @foo
 	.param  	i32, i64, i64, i32
 	.local  	i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$push6=, __stack_pointer($pop7)
+	i32.const	$push8=, 32
+	i32.sub 	$6=, $pop6, $pop8
 	i32.const	$push9=, 0
-	i32.load	$push8=, __stack_pointer($pop9)
-	i32.const	$push10=, 32
-	i32.sub 	$push20=, $pop8, $pop10
-	tee_local	$push19=, $6=, $pop20
-	i32.store	__stack_pointer($pop11), $pop19
+	i32.store	__stack_pointer($pop9), $6
 	block   	
-	i32.eqz 	$push28=, $3
-	br_if   	0, $pop28       # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push22=, $3
+	br_if   	0, $pop22       # 0: down to label0
+# %bb.1:                                # %for.body.preheader
 	i64.const	$5=, 0
 	i64.const	$4=, 1
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	call    	__multi3@FUNCTION, $6, $1, $2, $4, $5
+	i32.const	$push13=, 16
+	i32.add 	$push14=, $6, $pop13
+	call    	__multi3@FUNCTION, $pop14, $1, $2, $1, $2
+	i32.const	$push19=, -1
+	i32.add 	$3=, $3, $pop19
 	i32.const	$push15=, 16
 	i32.add 	$push16=, $6, $pop15
-	call    	__multi3@FUNCTION, $pop16, $1, $2, $1, $2
-	i32.const	$push17=, 16
-	i32.add 	$push18=, $6, $pop17
-	i32.const	$push25=, 8
-	i32.add 	$push0=, $pop18, $pop25
+	i32.const	$push18=, 8
+	i32.add 	$push0=, $pop16, $pop18
 	i64.load	$2=, 0($pop0)
-	i32.const	$push24=, 8
-	i32.add 	$push1=, $6, $pop24
+	i32.const	$push17=, 8
+	i32.add 	$push1=, $6, $pop17
 	i64.load	$5=, 0($pop1)
 	i64.load	$1=, 16($6)
 	i64.load	$4=, 0($6)
-	i32.const	$push23=, -1
-	i32.add 	$push22=, $3, $pop23
-	tee_local	$push21=, $3=, $pop22
-	br_if   	0, $pop21       # 0: up to label1
-# BB#3:                                 # %for.end
+	br_if   	0, $3           # 0: up to label1
+# %bb.3:                                # %for.end
 	end_loop
-	i64.const	$push26=, 14348907
-	i64.xor 	$push2=, $4, $pop26
+	i64.const	$push20=, 14348907
+	i64.xor 	$push2=, $4, $pop20
 	i64.or  	$push3=, $pop2, $5
 	i64.eqz 	$push4=, $pop3
-	i32.eqz 	$push29=, $pop4
-	br_if   	0, $pop29       # 0: down to label0
-# BB#4:                                 # %if.end
-	i64.const	$push27=, 14348907
-	i64.store	0($0), $pop27
-	i32.const	$push5=, 8
-	i32.add 	$push6=, $0, $pop5
-	i64.const	$push7=, 0
-	i64.store	0($pop6), $pop7
-	i32.const	$push14=, 0
-	i32.const	$push12=, 32
-	i32.add 	$push13=, $6, $pop12
-	i32.store	__stack_pointer($pop14), $pop13
+	i32.eqz 	$push23=, $pop4
+	br_if   	0, $pop23       # 0: down to label0
+# %bb.4:                                # %if.end
+	i64.const	$push5=, 0
+	i64.store	8($0), $pop5
+	i64.const	$push21=, 14348907
+	i64.store	0($0), $pop21
+	i32.const	$push12=, 0
+	i32.const	$push10=, 32
+	i32.add 	$push11=, $6, $pop10
+	i32.store	__stack_pointer($pop12), $pop11
 	return
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -77,14 +73,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push12=, $pop4, $pop6
-	tee_local	$push11=, $0=, $pop12
-	i32.store	__stack_pointer($pop7), $pop11
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push2=, 3
 	i64.const	$push1=, 0
 	i32.const	$push0=, 4
@@ -100,5 +95,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr54937.c.s b/test/torture-s/pr54937.c.s
index 62535241f..058e0b07e 100644
--- a/test/torture-s/pr54937.c.s
+++ b/test/torture-s/pr54937.c.s
@@ -8,20 +8,20 @@ t:                                      # @t
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	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.preheader
 	i32.const	$1=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	block   	
-	i32.eqz 	$push12=, $1
-	br_if   	0, $pop12       # 0: down to label2
-# BB#3:                                 # %if.then
+	i32.eqz 	$push10=, $1
+	br_if   	0, $pop10       # 0: down to label2
+# %bb.3:                                # %if.then
                                         #   in Loop: Header=BB0_2 Depth=1
 	i32.const	$push5=, 0
 	i32.const	$push4=, 0
@@ -30,21 +30,20 @@ t:                                      # @t
 .LBB0_4:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label2:
-	i32.const	$push11=, a
-	i32.add 	$push3=, $1, $pop11
-	i32.const	$push10=, 0
-	i32.store	0($pop3), $pop10
-	i32.const	$push9=, 4
-	i32.add 	$1=, $1, $pop9
-	i32.const	$push8=, -1
-	i32.add 	$push7=, $0, $pop8
-	tee_local	$push6=, $0=, $pop7
-	br_if   	0, $pop6        # 0: up to label1
+	i32.const	$push9=, a
+	i32.add 	$push3=, $1, $pop9
+	i32.const	$push8=, 0
+	i32.store	0($pop3), $pop8
+	i32.const	$push7=, -1
+	i32.add 	$0=, $0, $pop7
+	i32.const	$push6=, 4
+	i32.add 	$1=, $1, $pop6
+	br_if   	0, $0           # 0: up to label1
 .LBB0_5:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	copy_local	$push13=, $1
-                                        # fallthrough-return: $pop13
+	copy_local	$push11=, $1
+                                        # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end0:
 	.size	t, .Lfunc_end0-t
@@ -55,7 +54,7 @@ t:                                      # @t
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, exit@FUNCTION
 	i32.store	terminate_me($pop1), $pop0
@@ -86,6 +85,6 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr54985.c.s b/test/torture-s/pr54985.c.s
index 2bbb6e587..a19941b0b 100644
--- a/test/torture-s/pr54985.c.s
+++ b/test/torture-s/pr54985.c.s
@@ -8,40 +8,38 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$5=, 0
 	block   	
-	i32.eqz 	$push8=, $1
-	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
+	i32.eqz 	$push4=, $1
+	br_if   	0, $pop4        # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push1=, 4
-	i32.add 	$4=, $0, $pop1
-	i32.load	$0=, 0($0)
+	i32.add 	$3=, $0, $pop1
+	i32.load	$4=, 0($0)
 .LBB0_2:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push4=, -1
-	i32.add 	$push3=, $1, $pop4
-	tee_local	$push2=, $1=, $pop3
-	i32.eqz 	$push9=, $pop2
-	br_if   	1, $pop9        # 1: down to label0
-# BB#3:                                 # %while.cond.while.body_crit_edge
+	i32.const	$push2=, -1
+	i32.add 	$1=, $1, $pop2
+	i32.eqz 	$push5=, $1
+	br_if   	1, $pop5        # 1: down to label0
+# %bb.3:                                # %while.cond.while.body_crit_edge
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.load	$push7=, 0($4)
-	tee_local	$push6=, $2=, $pop7
-	i32.lt_s	$3=, $pop6, $0
-	i32.const	$push5=, 4
-	i32.add 	$push0=, $4, $pop5
-	copy_local	$4=, $pop0
-	copy_local	$0=, $2
-	br_if   	0, $3           # 0: up to label1
-# BB#4:
+	i32.load	$0=, 0($3)
+	i32.lt_s	$2=, $0, $4
+	i32.const	$push3=, 4
+	i32.add 	$push0=, $3, $pop3
+	copy_local	$3=, $pop0
+	copy_local	$4=, $0
+	br_if   	0, $2           # 0: up to label1
+# %bb.4:
 	end_loop
 	i32.const	$5=, 1
 .LBB0_5:                                # %cleanup
 	end_block                       # label0:
-	copy_local	$push10=, $5
-                                        # fallthrough-return: $pop10
+	copy_local	$push6=, $5
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -53,14 +51,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push14=, $pop4, $pop6
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop7), $pop13
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i64.const	$push0=, 4294967298
 	i64.store	8($0), $pop0
 	block   	
@@ -69,7 +66,7 @@ main:                                   # @main
 	i32.const	$push1=, 2
 	i32.call	$push2=, foo@FUNCTION, $pop12, $pop1
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push10=, 0
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $0, $pop8
@@ -85,5 +82,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr55137.c.s b/test/torture-s/pr55137.c.s
index b73cdc20a..fc1cc7f9a 100644
--- a/test/torture-s/pr55137.c.s
+++ b/test/torture-s/pr55137.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2147483645
 	i32.gt_s	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -37,7 +37,7 @@ bar:                                    # @bar
 baz:                                    # @baz
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -51,7 +51,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -59,4 +59,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr55750.c.s b/test/torture-s/pr55750.c.s
index 8031bd7d1..f137a1d65 100644
--- a/test/torture-s/pr55750.c.s
+++ b/test/torture-s/pr55750.c.s
@@ -6,16 +6,15 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, arr
-	i32.add 	$push7=, $pop1, $pop2
-	tee_local	$push6=, $0=, $pop7
+	i32.add 	$0=, $pop1, $pop2
 	i32.load8_u	$push3=, 0($0)
 	i32.const	$push5=, 2
 	i32.add 	$push4=, $pop3, $pop5
-	i32.store8	0($pop6), $pop4
+	i32.store8	0($0), $pop4
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -27,7 +26,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.const	$push1=, 254
 	i32.store8	arr+4($pop13), $pop1
@@ -44,13 +43,13 @@ main:                                   # @main
 	i32.const	$push5=, 129
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push14=, 0
 	i32.load8_u	$push0=, arr+4($pop14)
 	i32.const	$push7=, 255
 	i32.and 	$push8=, $pop0, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	return  	$pop9
 .LBB1_3:                                # %if.then
@@ -71,5 +70,5 @@ arr:
 	.size	arr, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr55875.c.s b/test/torture-s/pr55875.c.s
index c04fefebf..bb36ec623 100644
--- a/test/torture-s/pr55875.c.s
+++ b/test/torture-s/pr55875.c.s
@@ -7,16 +7,16 @@
 t:                                      # @t
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.eqz 	$push3=, $0
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, 256
 	i32.ge_s	$push1=, $0, $pop0
 	br_if   	1, $pop1        # 1: down to label0
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
 	return  	$0
 .LBB0_3:                                # %if.then
 	end_block                       # label1:
@@ -38,7 +38,7 @@ t:                                      # @t
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 5
 .LBB1_1:                                # %for.cond
                                         # =>This Inner Loop Header: Depth=1
@@ -65,6 +65,6 @@ a:
 	.size	a, 1004
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr56051.c.s b/test/torture-s/pr56051.c.s
index 36f349c63..85d53877c 100644
--- a/test/torture-s/pr56051.c.s
+++ b/test/torture-s/pr56051.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr56205.c.s b/test/torture-s/pr56205.c.s
index 95dd1209b..f33309840 100644
--- a/test/torture-s/pr56205.c.s
+++ b/test/torture-s/pr56205.c.s
@@ -7,68 +7,66 @@
 f4:                                     # @f4
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 32
-	i32.sub 	$push23=, $pop13, $pop15
-	tee_local	$push22=, $5=, $pop23
-	i32.store	__stack_pointer($pop16), $pop22
+	i32.sub 	$5=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $5
 	i32.store	28($5), $2
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push24=, 0
-	i32.load8_u	$push0=, c($pop24)
+# %bb.1:                                # %entry
+	i32.const	$push22=, 0
+	i32.load8_u	$push0=, c($pop22)
 	i32.const	$push1=, 255
 	i32.and 	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#2:                                 # %if.then
+# %bb.2:                                # %if.then
 	i32.const	$push3=, 0
-	i32.const	$push25=, 0
-	i32.load	$push4=, b($pop25)
+	i32.const	$push23=, 0
+	i32.load	$push4=, b($pop23)
 	i32.const	$push5=, 1
 	i32.add 	$push6=, $pop4, $pop5
 	i32.store	b($pop3), $pop6
 .LBB0_3:                                # %if.end
 	end_block                       # label0:
-	i32.const	$push30=, 0
-	i32.const	$push29=, 0
-	i32.load	$push7=, a($pop29)
+	i32.const	$push26=, 0
+	i32.load	$push7=, a($pop26)
 	i32.const	$push8=, 1
-	i32.add 	$push28=, $pop7, $pop8
-	tee_local	$push27=, $2=, $pop28
-	i32.store	a($pop30), $pop27
-	i32.const	$push26=, .L.str.3
+	i32.add 	$2=, $pop7, $pop8
+	i32.const	$push25=, 0
+	i32.store	a($pop25), $2
+	i32.const	$push24=, .L.str.3
 	i32.const	$push9=, .L.str.1
-	i32.select	$0=, $pop26, $pop9, $0
+	i32.select	$0=, $pop24, $pop9, $0
 	block   	
 	block   	
-	i32.eqz 	$push33=, $1
-	br_if   	0, $pop33       # 0: down to label2
-# BB#4:                                 # %land.rhs.i
+	i32.eqz 	$push29=, $1
+	br_if   	0, $pop29       # 0: down to label2
+# %bb.4:                                # %land.rhs.i
 	i32.load	$3=, 28($5)
 	i32.load8_u	$4=, 0($1)
 	i32.store	20($5), $2
 	i32.store	16($5), $0
 	i32.const	$push10=, .L.str.4
-	i32.const	$push31=, .L.str.3
-	i32.select	$push11=, $pop10, $pop31, $4
+	i32.const	$push27=, .L.str.3
+	i32.select	$push11=, $pop10, $pop27, $4
 	i32.store	24($5), $pop11
 	i32.const	$push20=, 16
 	i32.add 	$push21=, $5, $pop20
 	call    	f1@FUNCTION, $5, $pop21
 	i32.load8_u	$push12=, 0($1)
-	i32.eqz 	$push34=, $pop12
-	br_if   	1, $pop34       # 1: down to label1
-# BB#5:                                 # %if.then.i
+	i32.eqz 	$push30=, $pop12
+	br_if   	1, $pop30       # 1: down to label1
+# %bb.5:                                # %if.then.i
 	call    	f2@FUNCTION, $1, $3
 	br      	1               # 1: down to label1
 .LBB0_6:                                # %if.end.critedge.i
 	end_block                       # label2:
-	i32.const	$push32=, .L.str.3
-	i32.store	8($5), $pop32
+	i32.const	$push28=, .L.str.3
+	i32.store	8($5), $pop28
 	i32.store	4($5), $2
 	i32.store	0($5), $0
 	call    	f1@FUNCTION, $5, $5
@@ -90,14 +88,13 @@ f4:                                     # @f4
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 32
-	i32.sub 	$push22=, $pop11, $pop13
-	tee_local	$push21=, $0=, $pop22
-	i32.store	__stack_pointer($pop14), $pop21
+	i32.sub 	$0=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $0
 	#APP
 	#NO_APP
 	i32.const	$push1=, 16
@@ -117,13 +114,13 @@ main:                                   # @main
 	i32.const	$push18=, 1
 	i32.ne  	$push8=, $pop7, $pop18
 	br_if   	0, $pop8        # 0: down to label3
-# BB#1:                                 # %entry
-	i32.const	$push24=, 0
-	i32.load	$push0=, b($pop24)
-	i32.const	$push23=, 1
-	i32.ne  	$push9=, $pop0, $pop23
+# %bb.1:                                # %entry
+	i32.const	$push22=, 0
+	i32.load	$push0=, b($pop22)
+	i32.const	$push21=, 1
+	i32.ne  	$push9=, $pop0, $pop21
 	br_if   	0, $pop9        # 0: down to label3
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push17=, 0
 	i32.const	$push15=, 32
 	i32.add 	$push16=, $0, $pop15
@@ -143,35 +140,32 @@ main:                                   # @main
 f1:                                     # @f1
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 16
-	i32.sub 	$push23=, $pop13, $pop15
-	tee_local	$push22=, $4=, $pop23
-	i32.store	__stack_pointer($pop16), $pop22
+	i32.sub 	$4=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $4
+	i32.const	$push0=, 4
+	i32.add 	$2=, $1, $pop0
 	#APP
 	#NO_APP
-	i32.const	$push0=, 4
-	i32.add 	$push21=, $1, $pop0
-	tee_local	$push20=, $2=, $pop21
-	i32.store	12($4), $pop20
+	i32.store	12($4), $2
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, .L.str.1
 	i32.call	$push3=, strcmp@FUNCTION, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label4
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push4=, 8
-	i32.add 	$push25=, $1, $pop4
-	tee_local	$push24=, $3=, $pop25
-	i32.store	12($4), $pop24
+	i32.add 	$3=, $1, $pop4
+	i32.store	12($4), $3
 	i32.load	$push5=, 0($2)
 	i32.const	$push6=, 1
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label4
-# BB#2:                                 # %lor.lhs.false7
+# %bb.2:                                # %lor.lhs.false7
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $1, $pop8
 	i32.store	12($4), $pop9
@@ -179,7 +173,7 @@ f1:                                     # @f1
 	i32.const	$push11=, .L.str.4
 	i32.call	$push12=, strcmp@FUNCTION, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label4
-# BB#3:                                 # %if.end13
+# %bb.3:                                # %if.end13
 	i32.const	$push19=, 0
 	i32.const	$push17=, 16
 	i32.add 	$push18=, $4, $pop17
@@ -197,34 +191,33 @@ f1:                                     # @f1
 	.type	f2,@function            # -- Begin function f2
 f2:                                     # @f2
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
 	block   	
 	i32.const	$push0=, .L.str
 	i32.call	$push1=, strcmp@FUNCTION, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label5
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load	$push2=, 0($1)
 	i32.const	$push3=, .L.str.1
 	i32.call	$push4=, strcmp@FUNCTION, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label5
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i32.const	$push5=, 11
 	i32.add 	$push6=, $1, $pop5
 	i32.const	$push7=, -8
-	i32.and 	$push15=, $pop6, $pop7
-	tee_local	$push14=, $1=, $pop15
-	f64.load	$push8=, 0($pop14)
+	i32.and 	$1=, $pop6, $pop7
+	f64.load	$push8=, 0($1)
 	f64.const	$push9=, 0x1.8p3
 	f64.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label5
-# BB#3:                                 # %lor.lhs.false7
+# %bb.3:                                # %lor.lhs.false7
 	i32.load	$push11=, 8($1)
 	i32.const	$push12=, 26
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label5
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return
 .LBB3_5:                                # %if.then
 	end_block                       # label5:
@@ -284,6 +277,6 @@ a:
 	.size	.L.str.4, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1e6d53305..1ed5ea0ad 100644
--- a/test/torture-s/pr56250.c.s
+++ b/test/torture-s/pr56250.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr56799.c.s b/test/torture-s/pr56799.c.s
index 66723d73d..c175d97cf 100644
--- a/test/torture-s/pr56799.c.s
+++ b/test/torture-s/pr56799.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	i32.const	$push10=, 0
 	i32.load	$push9=, __stack_pointer($pop10)
 	i32.const	$push11=, 16
-	i32.sub 	$push16=, $pop9, $pop11
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop12), $pop15
+	i32.sub 	$0=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $0
 	i64.const	$push2=, 4295032832
 	i64.store	8($0), $pop2
 	block   	
@@ -24,17 +23,17 @@ main:                                   # @main
 	i32.const	$push3=, 2
 	i32.ne  	$push5=, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$push17=, 0
-	i32.load	$push0=, lo($pop17)
+# %bb.1:                                # %entry
+	i32.const	$push15=, 0
+	i32.load	$push0=, lo($pop15)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#2:                                 # %entry
-	i32.const	$push18=, 0
-	i32.load	$push1=, hi($pop18)
+# %bb.2:                                # %entry
+	i32.const	$push16=, 0
+	i32.load	$push1=, hi($pop16)
 	i32.const	$push6=, 1
 	i32.ne  	$push7=, $pop1, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
 	i32.const	$push8=, 0
 	call    	exit@FUNCTION, $pop8
 	unreachable
@@ -54,30 +53,29 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($0)
 	block   	
 	block   	
 	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.and 	$push0=, $1, $pop10
+	i32.eqz 	$push14=, $pop0
+	br_if   	0, $pop14       # 0: down to label3
+# %bb.1:                                # %if.then
 	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
+	i32.const	$push11=, 65535
+	i32.le_u	$push4=, $1, $pop11
 	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
+	i32.const	$push13=, 65535
+	i32.gt_u	$push3=, $1, $pop13
 	br_if   	1, $pop3        # 1: down to label1
 .LBB1_3:                                # %if.end.if.end10_crit_edge
 	end_block                       # label2:
@@ -89,10 +87,9 @@ foo:                                    # @foo
 	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
+	i32.load	$0=, 4($0)
+	i32.add 	$push12=, $0, $2
+	i32.add 	$push8=, $0, $pop12
                                         # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end1:
@@ -117,6 +114,6 @@ lo:
 	.size	lo, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
 	.functype	abort, void
diff --git a/test/torture-s/pr56837.c.s b/test/torture-s/pr56837.c.s
index 8326466f8..d9bdc5230 100644
--- a/test/torture-s/pr56837.c.s
+++ b/test/torture-s/pr56837.c.s
@@ -6,20 +6,19 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, -8192
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push5=, a+8192
-	i32.add 	$push0=, $0, $pop5
-	i64.const	$push4=, 4294967295
-	i64.store	0($pop0), $pop4
-	i32.const	$push3=, 8
-	i32.add 	$push2=, $0, $pop3
-	tee_local	$push1=, $0=, $pop2
-	br_if   	0, $pop1        # 0: up to label0
-# BB#2:                                 # %for.end
+	i32.const	$push3=, a+8192
+	i32.add 	$push0=, $0, $pop3
+	i64.const	$push2=, 4294967295
+	i64.store	0($pop0), $pop2
+	i32.const	$push1=, 8
+	i32.add 	$0=, $0, $pop1
+	br_if   	0, $0           # 0: up to label0
+# %bb.2:                                # %for.end
 	end_loop
                                         # fallthrough-return
 	.endfunc
@@ -33,10 +32,10 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %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   	
@@ -45,23 +44,22 @@ main:                                   # @main
 	i32.const	$push6=, -1
 	i32.ne  	$push2=, $pop1, $pop6
 	br_if   	1, $pop2        # 1: down to label1
-# BB#2:                                 # %for.body
+# %bb.2:                                # %for.body
                                         #   in Loop: Header=BB1_1 Depth=1
 	i32.const	$push7=, 4
 	i32.add 	$push3=, $0, $pop7
 	i32.load	$push0=, 0($pop3)
 	br_if   	1, $pop0        # 1: down to label1
-# BB#3:                                 # %for.cond
+# %bb.3:                                # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push12=, 8
-	i32.add 	$0=, $0, $pop12
-	i32.const	$push11=, 1
-	i32.add 	$push10=, $1, $pop11
-	tee_local	$push9=, $1=, $pop10
-	i32.const	$push8=, 1022
-	i32.le_u	$push4=, $pop9, $pop8
+	i32.const	$push10=, 1
+	i32.add 	$1=, $1, $pop10
+	i32.const	$push9=, 8
+	i32.add 	$0=, $0, $pop9
+	i32.const	$push8=, 1023
+	i32.le_u	$push4=, $1, $pop8
 	br_if   	0, $pop4        # 0: up to label2
-# BB#4:                                 # %for.end
+# %bb.4:                                # %for.end
 	end_loop
 	i32.const	$push5=, 0
 	return  	$pop5
@@ -83,5 +81,5 @@ a:
 	.size	a, 8192
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56866.c.s b/test/torture-s/pr56866.c.s
index 5f7d697ea..603be1e70 100644
--- a/test/torture-s/pr56866.c.s
+++ b/test/torture-s/pr56866.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push50=, 0
+# %bb.0:                                # %entry
 	i32.const	$push48=, 0
 	i32.load	$push47=, __stack_pointer($pop48)
 	i32.const	$push49=, 7712
-	i32.sub 	$push105=, $pop47, $pop49
-	tee_local	$push104=, $4=, $pop105
-	i32.store	__stack_pointer($pop50), $pop104
+	i32.sub 	$4=, $pop47, $pop49
+	i32.const	$push50=, 0
+	i32.store	__stack_pointer($pop50), $4
 	i32.const	$1=, 0
 	i32.const	$push54=, 5664
 	i32.add 	$push55=, $4, $pop54
@@ -74,16 +73,15 @@ main:                                   # @main
 	i32.add 	$push74=, $4, $pop73
 	i32.add 	$push7=, $pop74, $1
 	i64.load	$push8=, 0($pop7)
-	i64.const	$push110=, 56
-	i64.rotl	$push9=, $pop8, $pop110
+	i64.const	$push106=, 56
+	i64.rotl	$push9=, $pop8, $pop106
 	i64.store	0($pop10), $pop9
-	i32.const	$push109=, 8
-	i32.add 	$push108=, $1, $pop109
-	tee_local	$push107=, $1=, $pop108
-	i32.const	$push106=, 2048
-	i32.ne  	$push11=, $pop107, $pop106
+	i32.const	$push105=, 8
+	i32.add 	$1=, $1, $pop105
+	i32.const	$push104=, 2048
+	i32.ne  	$push11=, $1, $pop104
 	br_if   	0, $pop11       # 0: up to label0
-# BB#2:                                 # %for.body16.preheader
+# %bb.2:                                # %for.body16.preheader
 	end_loop
 	i32.const	$1=, 0
 .LBB0_3:                                # %for.body16
@@ -96,68 +94,63 @@ main:                                   # @main
 	i32.add 	$push78=, $4, $pop77
 	i32.add 	$push12=, $pop78, $1
 	i32.load	$push13=, 0($pop12)
-	i32.const	$push115=, 24
-	i32.rotl	$push14=, $pop13, $pop115
+	i32.const	$push109=, 24
+	i32.rotl	$push14=, $pop13, $pop109
 	i32.store	0($pop15), $pop14
-	i32.const	$push114=, 4
-	i32.add 	$push113=, $1, $pop114
-	tee_local	$push112=, $1=, $pop113
-	i32.const	$push111=, 1024
-	i32.ne  	$push16=, $pop112, $pop111
+	i32.const	$push108=, 4
+	i32.add 	$1=, $1, $pop108
+	i32.const	$push107=, 1024
+	i32.ne  	$push16=, $1, $pop107
 	br_if   	0, $pop16       # 0: up to label1
-# BB#4:                                 # %for.body28.preheader
+# %bb.4:                                # %for.body28.preheader
 	end_loop
 	i32.const	$1=, 0
 .LBB0_5:                                # %for.body28
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	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.load16_u	$0=, 0($pop17)
+	i32.const	$push83=, 544
+	i32.add 	$push84=, $4, $pop83
+	i32.add 	$push21=, $pop84, $1
+	i32.const	$push113=, 9
+	i32.shr_u	$push19=, $0, $pop113
+	i32.const	$push112=, 7
+	i32.shl 	$push18=, $0, $pop112
 	i32.or  	$push20=, $pop19, $pop18
 	i32.store16	0($pop21), $pop20
-	i32.const	$push119=, 2
-	i32.add 	$push118=, $1, $pop119
-	tee_local	$push117=, $1=, $pop118
-	i32.const	$push116=, 512
-	i32.ne  	$push22=, $pop117, $pop116
+	i32.const	$push111=, 2
+	i32.add 	$1=, $1, $pop111
+	i32.const	$push110=, 512
+	i32.ne  	$push22=, $1, $pop110
 	br_if   	0, $pop22       # 0: up to label2
-# BB#6:                                 # %for.body43.preheader
+# %bb.6:                                # %for.body43.preheader
 	end_loop
 	i32.const	$1=, 0
 .LBB0_7:                                # %for.body43
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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.load8_u	$0=, 0($pop23)
+	i32.const	$push87=, 32
+	i32.add 	$push88=, $4, $pop87
+	i32.add 	$push27=, $pop88, $1
+	i32.const	$push117=, 5
+	i32.shr_u	$push25=, $0, $pop117
+	i32.const	$push116=, 3
+	i32.shl 	$push24=, $0, $pop116
 	i32.or  	$push26=, $pop25, $pop24
 	i32.store8	0($pop27), $pop26
-	i32.const	$push127=, 1
-	i32.add 	$push126=, $1, $pop127
-	tee_local	$push125=, $1=, $pop126
-	i32.const	$push124=, 256
-	i32.ne  	$push28=, $pop125, $pop124
+	i32.const	$push115=, 1
+	i32.add 	$1=, $1, $pop115
+	i32.const	$push114=, 256
+	i32.ne  	$push28=, $1, $pop114
 	br_if   	0, $pop28       # 0: up to label3
-# BB#8:                                 # %for.end55
+# %bb.8:                                # %for.end55
 	end_loop
 	i32.const	$push89=, 1568
 	i32.add 	$push90=, $4, $pop89
@@ -182,36 +175,36 @@ main:                                   # @main
 	i64.const	$push29=, -1224658842671273011
 	i64.ne  	$push31=, $pop30, $pop29
 	br_if   	0, $pop31       # 0: down to label4
-# BB#9:                                 # %lor.lhs.false
+# %bb.9:                                # %lor.lhs.false
 	i64.load	$push32=, 3624($4)
 	i64.eqz 	$push33=, $pop32
-	i32.eqz 	$push132=, $pop33
-	br_if   	0, $pop132      # 0: down to label4
-# BB#10:                                # %if.end
+	i32.eqz 	$push118=, $pop33
+	br_if   	0, $pop118      # 0: down to label4
+# %bb.10:                               # %if.end
 	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
+# %bb.11:                               # %lor.lhs.false67
 	i32.load	$push37=, 1572($4)
 	br_if   	0, $pop37       # 0: down to label4
-# BB#12:                                # %if.end71
+# %bb.12:                               # %if.end71
 	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
+# %bb.13:                               # %lor.lhs.false76
 	i32.load16_u	$push41=, 546($4)
 	br_if   	0, $pop41       # 0: down to label4
-# BB#14:                                # %if.end81
+# %bb.14:                               # %if.end81
 	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
+# %bb.15:                               # %lor.lhs.false86
 	i32.load8_u	$push45=, 33($4)
 	br_if   	0, $pop45       # 0: down to label4
-# BB#16:                                # %if.end91
+# %bb.16:                               # %if.end91
 	i32.const	$push53=, 0
 	i32.const	$push51=, 7712
 	i32.add 	$push52=, $4, $pop51
@@ -227,5 +220,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56899.c.s b/test/torture-s/pr56899.c.s
index d86613652..17ce93755 100644
--- a/test/torture-s/pr56899.c.s
+++ b/test/torture-s/pr56899.c.s
@@ -6,14 +6,14 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -214748365
 	i32.mul 	$push1=, $0, $pop0
 	i32.const	$push2=, 2147483646
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,14 +29,14 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 214748365
 	i32.mul 	$push1=, $0, $pop0
 	i32.const	$push2=, 2147483646
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label1:
@@ -52,14 +52,14 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -214748365
 	i32.mul 	$push1=, $0, $pop0
 	i32.const	$push2=, 2147483646
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label2:
@@ -75,14 +75,14 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 214748365
 	i32.mul 	$push1=, $0, $pop0
 	i32.const	$push2=, 2147483646
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB3_2:                                # %if.then
 	end_block                       # label3:
@@ -98,7 +98,7 @@ f4:                                     # @f4
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 10
 	call    	f1@FUNCTION, $pop0
 	i32.const	$push1=, -10
@@ -114,5 +114,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56962.c.s b/test/torture-s/pr56962.c.s
index ad3e4d4bb..75d939b2f 100644
--- a/test/torture-s/pr56962.c.s
+++ b/test/torture-s/pr56962.c.s
@@ -6,12 +6,12 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, v+232
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -28,21 +28,19 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32, i32
 	.local  	i32, i64, i32, i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 5
-	i32.mul 	$push36=, $2, $pop2
-	tee_local	$push35=, $3=, $pop36
+	i32.mul 	$3=, $2, $pop2
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $1, $pop0
-	i32.add 	$push3=, $pop35, $pop1
+	i32.add 	$push3=, $3, $pop1
 	i32.const	$push4=, 3
 	i32.shl 	$push5=, $pop3, $pop4
 	i32.add 	$push6=, $0, $pop5
 	i64.load	$4=, 0($pop6)
-	i32.const	$push34=, 3
-	i32.mul 	$push33=, $1, $pop34
-	tee_local	$push32=, $5=, $pop33
-	i32.add 	$push7=, $3, $pop32
+	i32.const	$push32=, 3
+	i32.mul 	$5=, $1, $pop32
+	i32.add 	$push7=, $3, $5
 	i32.const	$push31=, 3
 	i32.shl 	$push8=, $pop7, $pop31
 	i32.add 	$push9=, $0, $pop8
@@ -82,7 +80,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, v
 	i32.const	$push1=, 24
 	i32.const	$push0=, 1
@@ -103,5 +101,5 @@ v:
 	.size	v, 1152
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr56982.c.s b/test/torture-s/pr56982.c.s
index 058a38bf0..d3aaba175 100644
--- a/test/torture-s/pr56982.c.s
+++ b/test/torture-s/pr56982.c.s
@@ -5,7 +5,7 @@
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -21,12 +21,12 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.eqz 	$push6=, $pop0
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push1=, 1
 	return  	$pop1
 .LBB1_2:                                # %if.end
@@ -37,7 +37,7 @@ f:                                      # @f
 	#NO_APP
 	block   	
 	br_if   	0, $1           # 0: down to label1
-# BB#3:                                 # %if.end6
+# %bb.3:                                # %if.end6
 	i32.const	$push5=, env
 	i32.const	$push3=, 42
 	call    	longjmp@FUNCTION, $pop5, $pop3
@@ -59,14 +59,13 @@ main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push12=, $pop2, $pop4
-	tee_local	$push11=, $2=, $pop12
-	i32.store	__stack_pointer($pop5), $pop11
+	i32.sub 	$2=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $2
 	i32.const	$push0=, 0
 	i32.store	12($2), $pop0
 	i32.const	$push9=, 12
@@ -90,7 +89,7 @@ env:
 	.size	env, 156
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 1653c8c7b..4cd939ef1 100644
--- a/test/torture-s/pr57124.c.s
+++ b/test/torture-s/pr57124.c.s
@@ -7,13 +7,13 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load16_u	$push0=, 0($0)
 	i32.const	$push1=, 4095
 	i32.gt_u	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB0_2:                                # %if.end
@@ -32,14 +32,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	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.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push0=, 65531
 	i32.store16	14($0), $pop0
 	i32.const	$push5=, 14
@@ -53,6 +52,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr57130.c.s b/test/torture-s/pr57130.c.s
index 1712d3b69..bd563569b 100644
--- a/test/torture-s/pr57130.c.s
+++ b/test/torture-s/pr57130.c.s
@@ -7,14 +7,13 @@
 foo:                                    # @foo
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push11=, 0
-	i32.load	$push10=, foo.cnt($pop11)
-	tee_local	$push9=, $1=, $pop10
+	i32.load	$1=, foo.cnt($pop0)
+	i32.const	$push9=, 0
 	i32.const	$push1=, 1
-	i32.add 	$push2=, $pop9, $pop1
-	i32.store	foo.cnt($pop0), $pop2
+	i32.add 	$push2=, $1, $pop1
+	i32.store	foo.cnt($pop9), $pop2
 	block   	
 	i32.const	$push3=, 4
 	i32.shl 	$push4=, $1, $pop3
@@ -23,7 +22,7 @@ foo:                                    # @foo
 	i32.const	$push7=, 16
 	i32.call	$push8=, memcmp@FUNCTION, $0, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -40,14 +39,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
+# %bb.0:                                # %entry
 	i32.const	$push9=, 0
 	i32.load	$push8=, __stack_pointer($pop9)
 	i32.const	$push10=, 48
-	i32.sub 	$push25=, $pop8, $pop10
-	tee_local	$push24=, $0=, $pop25
-	i32.store	__stack_pointer($pop11), $pop24
+	i32.sub 	$0=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $0
 	i32.const	$push15=, 16
 	i32.add 	$push16=, $0, $pop15
 	i32.const	$push2=, 8
@@ -116,6 +114,6 @@ foo.cnt:
 	.size	.Lmain.r, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 fc8a86f5b..2b00d9a3e 100644
--- a/test/torture-s/pr57131.c.s
+++ b/test/torture-s/pr57131.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i64, i64, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 48
-	i32.sub 	$push23=, $pop11, $pop13
-	tee_local	$push22=, $5=, $pop23
-	i32.store	__stack_pointer($pop14), $pop22
+	i32.sub 	$5=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $5
 	i32.const	$push21=, 0
 	i32.store	44($5), $pop21
 	i64.const	$push0=, 0
@@ -43,13 +42,13 @@ main:                                   # @main
 	i64.const	$push18=, 1
 	i64.ne  	$push10=, $pop9, $pop18
 	br_if   	0, $pop10       # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push17=, 0
 	i32.const	$push15=, 48
 	i32.add 	$push16=, $5, $pop15
 	i32.store	__stack_pointer($pop17), $pop16
-	i32.const	$push24=, 0
-	return  	$pop24
+	i32.const	$push22=, 0
+	return  	$pop22
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -59,5 +58,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57144.c.s b/test/torture-s/pr57144.c.s
index bab6d85b6..96be4eebe 100644
--- a/test/torture-s/pr57144.c.s
+++ b/test/torture-s/pr57144.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	call    	foo@FUNCTION, $pop0
 	unreachable
@@ -29,5 +29,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr57281.c.s b/test/torture-s/pr57281.c.s
index 9f928444a..a0ac7c24e 100644
--- a/test/torture-s/pr57281.c.s
+++ b/test/torture-s/pr57281.c.s
@@ -8,13 +8,12 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push1=, g($pop0)
-	i32.const	$push7=, 0
-	i32.load	$push6=, b($pop7)
-	tee_local	$push5=, $1=, $pop6
-	i64.extend_s/i32	$push2=, $pop5
+	i32.load	$1=, b($pop0)
+	i32.const	$push5=, 0
+	i32.load	$push1=, g($pop5)
+	i64.extend_s/i32	$push2=, $1
 	i64.store	0($pop1), $pop2
 	i32.const	$push4=, 0
 	i32.select	$push3=, $pop4, $1, $0
@@ -30,14 +29,14 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push7=, 0
 	i32.load	$push0=, b($pop7)
 	i32.const	$push6=, -20
 	i32.eq  	$push1=, $pop0, $pop6
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push10=, 0
 	i32.load	$2=, g($pop10)
 	i32.const	$push9=, 0
@@ -47,33 +46,31 @@ main:                                   # @main
 .LBB1_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push22=, 0
-	i32.store	0($1), $pop22
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.load	$push19=, b($pop20)
-	tee_local	$push18=, $3=, $pop19
-	i32.select	$push2=, $pop21, $pop18, $0
-	i32.store	0($1), $pop2
+	i32.const	$push18=, 0
+	i32.store	0($1), $pop18
 	i32.const	$push17=, 0
-	i64.load	$drop=, f($pop17)
-	i64.extend_s/i32	$push3=, $3
-	i64.store	0($2), $pop3
+	i32.load	$3=, b($pop17)
 	i32.const	$push16=, 0
+	i32.select	$push2=, $pop16, $3, $0
+	i32.store	0($1), $pop2
 	i32.const	$push15=, 0
-	i32.load	$push4=, b($pop15)
-	i32.const	$push14=, -1
-	i32.add 	$push13=, $pop4, $pop14
-	tee_local	$push12=, $3=, $pop13
-	i32.store	b($pop16), $pop12
+	i64.load	$drop=, f($pop15)
+	i64.extend_s/i32	$push3=, $3
+	i64.store	0($2), $pop3
+	i32.const	$push14=, 0
+	i32.load	$push4=, b($pop14)
+	i32.const	$push13=, -1
+	i32.add 	$3=, $pop4, $pop13
+	i32.const	$push12=, 0
+	i32.store	b($pop12), $3
 	i32.const	$push11=, -20
 	i32.ne  	$push5=, $3, $pop11
 	br_if   	0, $pop5        # 0: up to label1
 .LBB1_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	i32.const	$push23=, 0
-                                        # fallthrough-return: $pop23
+	i32.const	$push19=, 0
+                                        # fallthrough-return: $pop19
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -142,4 +139,4 @@ f:
 	.size	f, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr57321.c.s b/test/torture-s/pr57321.c.s
index 126afd974..bb119655b 100644
--- a/test/torture-s/pr57321.c.s
+++ b/test/torture-s/pr57321.c.s
@@ -6,13 +6,13 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, a($pop3)
 	i32.eqz 	$push7=, $pop0
 	br_if   	0, $pop7        # 0: down to label0
-# BB#1:                                 # %foo.exit
+# %bb.1:                                # %foo.exit
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then.i
@@ -55,4 +55,4 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr57344-1.c.s b/test/torture-s/pr57344-1.c.s
index b8cff4b2a..adb7f8059 100644
--- a/test/torture-s/pr57344-1.c.s
+++ b/test/torture-s/pr57344-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -3161
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	#APP
 	#NO_APP
 	return
@@ -30,7 +30,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push19=, 0
 	i64.const	$push0=, 8583460864
 	i64.store	s+8($pop19), $pop0
@@ -40,53 +40,51 @@ main:                                   # @main
 	i32.const	$push17=, 0
 	i32.gt_s	$push2=, $pop1, $pop17
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push3=, -3161
 	call    	foo@FUNCTION, $pop3
-	i32.const	$push24=, 0
-	i32.const	$push23=, 0
-	i32.load	$push22=, i($pop23)
-	tee_local	$push21=, $0=, $pop22
+	i32.const	$push22=, 0
+	i32.load	$0=, i($pop22)
+	i32.const	$push21=, 0
 	i32.const	$push20=, 1
-	i32.add 	$push4=, $pop21, $pop20
-	i32.store	i($pop24), $pop4
+	i32.add 	$push4=, $0, $pop20
+	i32.store	i($pop21), $pop4
 	i32.const	$push5=, -1
 	i32.gt_s	$push6=, $0, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %for.body.for.body_crit_edge.preheader
+# %bb.2:                                # %for.body.for.body_crit_edge.preheader
 .LBB1_3:                                # %for.body.for.body_crit_edge
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push36=, 0
-	i64.load32_u	$push9=, s+8($pop36)
-	i32.const	$push35=, 0
-	i64.load8_u	$push7=, s+12($pop35)
-	i64.const	$push34=, 32
-	i64.shl 	$push8=, $pop7, $pop34
+	i32.const	$push32=, 0
+	i64.load32_u	$push9=, s+8($pop32)
+	i32.const	$push31=, 0
+	i64.load8_u	$push7=, s+12($pop31)
+	i64.const	$push30=, 32
+	i64.shl 	$push8=, $pop7, $pop30
 	i64.or  	$push10=, $pop9, $pop8
-	i64.const	$push33=, 31
-	i64.shl 	$push11=, $pop10, $pop33
-	i64.const	$push32=, 24
-	i64.shr_s	$push12=, $pop11, $pop32
-	i64.const	$push31=, 18
-	i64.shr_u	$push13=, $pop12, $pop31
+	i64.const	$push29=, 31
+	i64.shl 	$push11=, $pop10, $pop29
+	i64.const	$push28=, 24
+	i64.shr_s	$push12=, $pop11, $pop28
+	i64.const	$push27=, 18
+	i64.shr_u	$push13=, $pop12, $pop27
 	i32.wrap/i64	$push14=, $pop13
 	call    	foo@FUNCTION, $pop14
-	i32.const	$push30=, 0
-	i32.const	$push29=, 0
-	i32.load	$push28=, i($pop29)
-	tee_local	$push27=, $0=, $pop28
-	i32.const	$push26=, 1
-	i32.add 	$push15=, $pop27, $pop26
-	i32.store	i($pop30), $pop15
+	i32.const	$push26=, 0
+	i32.load	$0=, i($pop26)
 	i32.const	$push25=, 0
-	i32.lt_s	$push16=, $0, $pop25
+	i32.const	$push24=, 1
+	i32.add 	$push15=, $0, $pop24
+	i32.store	i($pop25), $pop15
+	i32.const	$push23=, 0
+	i32.lt_s	$push16=, $0, $pop23
 	br_if   	0, $pop16       # 0: up to label2
 .LBB1_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
-	i32.const	$push37=, 0
-                                        # fallthrough-return: $pop37
+	i32.const	$push33=, 0
+                                        # fallthrough-return: $pop33
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -110,5 +108,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57344-2.c.s b/test/torture-s/pr57344-2.c.s
index 2e49ea3a2..62ce0c714 100644
--- a/test/torture-s/pr57344-2.c.s
+++ b/test/torture-s/pr57344-2.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -3161
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	#APP
 	#NO_APP
 	return
@@ -30,7 +30,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push21=, 0
 	i64.const	$push0=, 562525691183104
 	i64.store	s+8($pop21), $pop0
@@ -40,56 +40,54 @@ main:                                   # @main
 	i32.const	$push19=, 0
 	i32.gt_s	$push2=, $pop1, $pop19
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push3=, -3161
 	call    	foo@FUNCTION, $pop3
-	i32.const	$push26=, 0
-	i32.const	$push25=, 0
-	i32.load	$push24=, i($pop25)
-	tee_local	$push23=, $0=, $pop24
+	i32.const	$push24=, 0
+	i32.load	$0=, i($pop24)
+	i32.const	$push23=, 0
 	i32.const	$push22=, 1
-	i32.add 	$push4=, $pop23, $pop22
-	i32.store	i($pop26), $pop4
+	i32.add 	$push4=, $0, $pop22
+	i32.store	i($pop23), $pop4
 	i32.const	$push5=, -1
 	i32.gt_s	$push6=, $0, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %for.body.for.body_crit_edge.preheader
+# %bb.2:                                # %for.body.for.body_crit_edge.preheader
 .LBB1_3:                                # %for.body.for.body_crit_edge
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push39=, 0
-	i64.load32_u	$push12=, s+8($pop39)
-	i32.const	$push38=, 0
-	i64.load16_u	$push9=, s+12($pop38)
-	i32.const	$push37=, 0
-	i64.load8_u	$push7=, s+14($pop37)
-	i64.const	$push36=, 16
-	i64.shl 	$push8=, $pop7, $pop36
+	i32.const	$push35=, 0
+	i64.load32_u	$push12=, s+8($pop35)
+	i32.const	$push34=, 0
+	i64.load16_u	$push9=, s+12($pop34)
+	i32.const	$push33=, 0
+	i64.load8_u	$push7=, s+14($pop33)
+	i64.const	$push32=, 16
+	i64.shl 	$push8=, $pop7, $pop32
 	i64.or  	$push10=, $pop9, $pop8
-	i64.const	$push35=, 32
-	i64.shl 	$push11=, $pop10, $pop35
+	i64.const	$push31=, 32
+	i64.shl 	$push11=, $pop10, $pop31
 	i64.or  	$push13=, $pop12, $pop11
-	i64.const	$push34=, 15
-	i64.shl 	$push14=, $pop13, $pop34
-	i64.const	$push33=, 42
-	i64.shr_s	$push15=, $pop14, $pop33
+	i64.const	$push30=, 15
+	i64.shl 	$push14=, $pop13, $pop30
+	i64.const	$push29=, 42
+	i64.shr_s	$push15=, $pop14, $pop29
 	i32.wrap/i64	$push16=, $pop15
 	call    	foo@FUNCTION, $pop16
-	i32.const	$push32=, 0
-	i32.const	$push31=, 0
-	i32.load	$push30=, i($pop31)
-	tee_local	$push29=, $0=, $pop30
-	i32.const	$push28=, 1
-	i32.add 	$push17=, $pop29, $pop28
-	i32.store	i($pop32), $pop17
+	i32.const	$push28=, 0
+	i32.load	$0=, i($pop28)
 	i32.const	$push27=, 0
-	i32.lt_s	$push18=, $0, $pop27
+	i32.const	$push26=, 1
+	i32.add 	$push17=, $0, $pop26
+	i32.store	i($pop27), $pop17
+	i32.const	$push25=, 0
+	i32.lt_s	$push18=, $0, $pop25
 	br_if   	0, $pop18       # 0: up to label2
 .LBB1_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
-	i32.const	$push40=, 0
-                                        # fallthrough-return: $pop40
+	i32.const	$push36=, 0
+                                        # fallthrough-return: $pop36
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -113,5 +111,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57344-3.c.s b/test/torture-s/pr57344-3.c.s
index 6896a188e..f81584010 100644
--- a/test/torture-s/pr57344-3.c.s
+++ b/test/torture-s/pr57344-3.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, -3161
 	i64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	#APP
 	#NO_APP
 	return
@@ -30,7 +30,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push25=, 0
 	i32.const	$push24=, 0
 	i64.load	$push0=, .Lmain.t+8($pop24):p2align=0
@@ -45,60 +45,57 @@ main:                                   # @main
 	i32.const	$push20=, 0
 	i32.gt_s	$push3=, $pop2, $pop20
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i64.const	$push4=, -3161
 	call    	foo@FUNCTION, $pop4
-	i32.const	$push30=, 0
-	i32.const	$push29=, 0
-	i32.load	$push28=, i($pop29)
-	tee_local	$push27=, $1=, $pop28
+	i32.const	$push28=, 0
+	i32.load	$1=, i($pop28)
+	i32.const	$push27=, 0
 	i32.const	$push26=, 1
-	i32.add 	$push5=, $pop27, $pop26
-	i32.store	i($pop30), $pop5
+	i32.add 	$push5=, $1, $pop26
+	i32.store	i($pop27), $pop5
 	i32.const	$push6=, -1
 	i32.gt_s	$push7=, $1, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#2:                                 # %for.body.for.body_crit_edge.preheader
+# %bb.2:                                # %for.body.for.body_crit_edge.preheader
 .LBB1_3:                                # %for.body.for.body_crit_edge
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push47=, 0
-	i64.load	$push46=, s+16($pop47)
-	tee_local	$push45=, $0=, $pop46
-	i64.const	$push44=, 7
-	i64.shl 	$push15=, $pop45, $pop44
-	i64.const	$push43=, 50
-	i64.shr_u	$push16=, $pop15, $pop43
-	i32.const	$push42=, 0
-	i64.load8_u	$push9=, s+24($pop42)
-	i64.const	$push41=, 7
-	i64.shl 	$push10=, $pop9, $pop41
-	i64.const	$push40=, 57
-	i64.shr_u	$push8=, $0, $pop40
+	i32.const	$push41=, 0
+	i64.load	$0=, s+16($pop41)
+	i64.const	$push40=, 7
+	i64.shl 	$push15=, $0, $pop40
+	i64.const	$push39=, 50
+	i64.shr_u	$push16=, $pop15, $pop39
+	i32.const	$push38=, 0
+	i64.load8_u	$push9=, s+24($pop38)
+	i64.const	$push37=, 7
+	i64.shl 	$push10=, $pop9, $pop37
+	i64.const	$push36=, 57
+	i64.shr_u	$push8=, $0, $pop36
 	i64.or  	$push11=, $pop10, $pop8
-	i64.const	$push39=, 56
-	i64.shl 	$push12=, $pop11, $pop39
-	i64.const	$push38=, 56
-	i64.shr_s	$push13=, $pop12, $pop38
-	i64.const	$push37=, 14
-	i64.shl 	$push14=, $pop13, $pop37
+	i64.const	$push35=, 56
+	i64.shl 	$push12=, $pop11, $pop35
+	i64.const	$push34=, 56
+	i64.shr_s	$push13=, $pop12, $pop34
+	i64.const	$push33=, 14
+	i64.shl 	$push14=, $pop13, $pop33
 	i64.or  	$push17=, $pop16, $pop14
 	call    	foo@FUNCTION, $pop17
-	i32.const	$push36=, 0
-	i32.const	$push35=, 0
-	i32.load	$push34=, i($pop35)
-	tee_local	$push33=, $1=, $pop34
-	i32.const	$push32=, 1
-	i32.add 	$push18=, $pop33, $pop32
-	i32.store	i($pop36), $pop18
+	i32.const	$push32=, 0
+	i32.load	$1=, i($pop32)
 	i32.const	$push31=, 0
-	i32.lt_s	$push19=, $1, $pop31
+	i32.const	$push30=, 1
+	i32.add 	$push18=, $1, $pop30
+	i32.store	i($pop31), $pop18
+	i32.const	$push29=, 0
+	i32.lt_s	$push19=, $1, $pop29
 	br_if   	0, $pop19       # 0: up to label2
 .LBB1_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
-	i32.const	$push48=, 0
-                                        # fallthrough-return: $pop48
+	i32.const	$push42=, 0
+                                        # fallthrough-return: $pop42
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -138,5 +135,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57344-4.c.s b/test/torture-s/pr57344-4.c.s
index 078055a82..d86c4dc6a 100644
--- a/test/torture-s/pr57344-4.c.s
+++ b/test/torture-s/pr57344-4.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push0=, -1220975898975746
 	i64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	#APP
 	#NO_APP
 	return
@@ -30,7 +30,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push28=, 0
 	i32.const	$push27=, 0
 	i64.load	$push0=, .Lmain.t+8($pop27):p2align=0
@@ -45,62 +45,60 @@ main:                                   # @main
 	i32.const	$push23=, 0
 	i32.gt_s	$push3=, $pop2, $pop23
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i64.const	$push4=, -1220975898975746
 	call    	foo@FUNCTION, $pop4
-	i32.const	$push33=, 0
-	i32.const	$push32=, 0
-	i32.load	$push31=, i($pop32)
-	tee_local	$push30=, $0=, $pop31
+	i32.const	$push31=, 0
+	i32.load	$0=, i($pop31)
+	i32.const	$push30=, 0
 	i32.const	$push29=, 1
-	i32.add 	$push5=, $pop30, $pop29
-	i32.store	i($pop33), $pop5
+	i32.add 	$push5=, $0, $pop29
+	i32.store	i($pop30), $pop5
 	i32.const	$push6=, -1
 	i32.gt_s	$push7=, $0, $pop6
 	br_if   	0, $pop7        # 0: down to label1
-# BB#2:                                 # %for.body.for.body_crit_edge.preheader
+# %bb.2:                                # %for.body.for.body_crit_edge.preheader
 .LBB1_3:                                # %for.body.for.body_crit_edge
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push49=, 0
-	i64.load32_u	$push15=, s+24($pop49)
-	i32.const	$push48=, 0
-	i64.load16_u	$push12=, s+28($pop48)
-	i32.const	$push47=, 0
-	i64.load8_u	$push10=, s+30($pop47)
-	i64.const	$push46=, 16
-	i64.shl 	$push11=, $pop10, $pop46
+	i32.const	$push45=, 0
+	i64.load32_u	$push15=, s+24($pop45)
+	i32.const	$push44=, 0
+	i64.load16_u	$push12=, s+28($pop44)
+	i32.const	$push43=, 0
+	i64.load8_u	$push10=, s+30($pop43)
+	i64.const	$push42=, 16
+	i64.shl 	$push11=, $pop10, $pop42
 	i64.or  	$push13=, $pop12, $pop11
-	i64.const	$push45=, 32
-	i64.shl 	$push14=, $pop13, $pop45
+	i64.const	$push41=, 32
+	i64.shl 	$push14=, $pop13, $pop41
 	i64.or  	$push16=, $pop15, $pop14
-	i64.const	$push44=, 7
-	i64.shl 	$push17=, $pop16, $pop44
-	i32.const	$push43=, 0
-	i64.load	$push8=, s+16($pop43)
-	i64.const	$push42=, 57
-	i64.shr_u	$push9=, $pop8, $pop42
+	i64.const	$push40=, 7
+	i64.shl 	$push17=, $pop16, $pop40
+	i32.const	$push39=, 0
+	i64.load	$push8=, s+16($pop39)
+	i64.const	$push38=, 57
+	i64.shr_u	$push9=, $pop8, $pop38
 	i64.or  	$push18=, $pop17, $pop9
-	i64.const	$push41=, 8
-	i64.shl 	$push19=, $pop18, $pop41
-	i64.const	$push40=, 10
-	i64.shr_s	$push20=, $pop19, $pop40
+	i64.const	$push37=, 8
+	i64.shl 	$push19=, $pop18, $pop37
+	i64.const	$push36=, 10
+	i64.shr_s	$push20=, $pop19, $pop36
 	call    	foo@FUNCTION, $pop20
-	i32.const	$push39=, 0
-	i32.const	$push38=, 0
-	i32.load	$push37=, i($pop38)
-	tee_local	$push36=, $0=, $pop37
-	i32.const	$push35=, 1
-	i32.add 	$push21=, $pop36, $pop35
-	i32.store	i($pop39), $pop21
+	i32.const	$push35=, 0
+	i32.load	$0=, i($pop35)
 	i32.const	$push34=, 0
-	i32.lt_s	$push22=, $0, $pop34
+	i32.const	$push33=, 1
+	i32.add 	$push21=, $0, $pop33
+	i32.store	i($pop34), $pop21
+	i32.const	$push32=, 0
+	i32.lt_s	$push22=, $0, $pop32
 	br_if   	0, $pop22       # 0: up to label2
 .LBB1_4:                                # %for.end
 	end_loop
 	end_block                       # label1:
-	i32.const	$push50=, 0
-                                        # fallthrough-return: $pop50
+	i32.const	$push46=, 0
+                                        # fallthrough-return: $pop46
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
@@ -145,5 +143,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57568.c.s b/test/torture-s/pr57568.c.s
index ca1eca3fd..42d848fd3 100644
--- a/test/torture-s/pr57568.c.s
+++ b/test/torture-s/pr57568.c.s
@@ -6,28 +6,26 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, i32
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, b($pop3)
-	i32.eqz 	$push10=, $pop0
-	br_if   	0, $pop10       # 0: down to label1
-# BB#1:                                 # %land.lhs.true
-	i32.const	$push8=, 0
-	i32.load	$push7=, c($pop8)
-	tee_local	$push6=, $0=, $pop7
-	i32.load	$push5=, 0($0)
-	tee_local	$push4=, $0=, $pop5
+	i32.eqz 	$push6=, $pop0
+	br_if   	0, $pop6        # 0: down to label1
+# %bb.1:                                # %land.lhs.true
+	i32.const	$push4=, 0
+	i32.load	$0=, c($pop4)
+	i32.load	$1=, 0($0)
 	i32.const	$push1=, 1
-	i32.shl 	$push2=, $pop4, $pop1
-	i32.store	0($pop6), $pop2
-	br_if   	1, $0           # 1: down to label0
+	i32.shl 	$push2=, $1, $pop1
+	i32.store	0($0), $pop2
+	br_if   	1, $1           # 1: down to label0
 .LBB0_2:                                # %if.end
 	end_block                       # label1:
-	i32.const	$push9=, 0
-	return  	$pop9
+	i32.const	$push5=, 0
+	return  	$pop5
 .LBB0_3:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -64,5 +62,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57829.c.s b/test/torture-s/pr57829.c.s
index db0e250cd..9c790cf28 100644
--- a/test/torture-s/pr57829.c.s
+++ b/test/torture-s/pr57829.c.s
@@ -7,7 +7,7 @@
 f1:                                     # @f1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 31
@@ -26,7 +26,7 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 31
@@ -45,7 +45,7 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 63
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push2=, 2
@@ -65,32 +65,32 @@ f3:                                     # @f3
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push14=, 1
 	i32.call	$push0=, f1@FUNCTION, $pop14
 	i32.const	$push13=, 2
 	i32.ne  	$push1=, $pop0, $pop13
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.const	$push16=, 1
 	i32.call	$push2=, f2@FUNCTION, $pop16
 	i32.const	$push15=, 2
 	i32.ne  	$push3=, $pop2, $pop15
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i32.const	$push4=, 63
 	i32.call	$push5=, f3@FUNCTION, $pop4
 	i32.const	$push6=, 6
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false6
+# %bb.3:                                # %lor.lhs.false6
 	i32.const	$push8=, 1
 	i32.call	$push9=, f3@FUNCTION, $pop8
 	i32.const	$push10=, 4
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	i32.const	$push12=, 0
 	return  	$pop12
 .LBB3_5:                                # %if.then
@@ -102,5 +102,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57860.c.s b/test/torture-s/pr57860.c.s
index 28d20dc5f..55f8d7ec5 100644
--- a/test/torture-s/pr57860.c.s
+++ b/test/torture-s/pr57860.c.s
@@ -8,7 +8,7 @@ foo:                                    # @foo
 	.param  	i32
 	.result 	i32
 	.local  	i64, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	i32.load	$4=, f($pop14)
 	i32.const	$push13=, 0
@@ -21,7 +21,7 @@ foo:                                    # @foo
 	i32.const	$push11=, 0
 	i32.load	$push0=, c($pop11)
 	br_if   	0, $pop0        # 0: down to label1
-# BB#1:
+# %bb.1:
 	i32.const	$5=, 1
 	br      	1               # 1: down to label0
 .LBB0_2:
@@ -49,9 +49,9 @@ foo:                                    # @foo
 	i32.store	g($pop17), $pop10
 	i32.const	$push15=, 0
 	i32.load	$push1=, c($pop15)
-	i32.eqz 	$push29=, $pop1
-	br_if   	3, $pop29       # 3: down to label4
-# BB#5:                                 #   in Loop: Header=BB0_3 Depth=1
+	i32.eqz 	$push25=, $pop1
+	br_if   	3, $pop25       # 3: down to label4
+# %bb.5:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$5=, 0
 	br      	5               # 5: up to label2
 .LBB0_6:                                # %for.inc.lr.ph
@@ -60,33 +60,31 @@ foo:                                    # @foo
 	i32.const	$push19=, 0
 	i32.const	$push18=, 0
 	i32.store	c($pop19), $pop18
-# BB#7:                                 #   in Loop: Header=BB0_3 Depth=1
+# %bb.7:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$5=, 1
 	br      	4               # 4: up to label2
 .LBB0_8:                                # %for.end
                                         #   in Loop: Header=BB0_3 Depth=1
 	end_block                       # label6:
-	i32.const	$push28=, 0
-	i64.load32_s	$push2=, a($pop28)
-	i64.const	$push27=, 8589934591
-	i64.xor 	$push3=, $pop2, $pop27
+	i32.const	$push24=, 0
+	i64.load32_s	$push2=, a($pop24)
+	i64.const	$push23=, 8589934591
+	i64.xor 	$push3=, $pop2, $pop23
 	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
+	i64.lt_s	$0=, $pop5, $1
+	i32.store	0($3), $0
 	i32.store	0($4), $0
-	i32.const	$push24=, 0
-	i32.load	$push23=, g($pop24)
-	tee_local	$push22=, $0=, $pop23
+	i32.const	$push22=, 0
+	i32.load	$0=, g($pop22)
 	i32.const	$push21=, 2
-	i32.shl 	$push6=, $pop22, $pop21
+	i32.shl 	$push6=, $0, $pop21
 	i32.const	$push20=, k
 	i32.add 	$push7=, $pop6, $pop20
 	i32.load	$push8=, 0($pop7)
-	i32.eqz 	$push30=, $pop8
-	br_if   	2, $pop30       # 2: down to label3
-# BB#9:                                 #   in Loop: Header=BB0_3 Depth=1
+	i32.eqz 	$push26=, $pop8
+	br_if   	2, $pop26       # 2: down to label3
+# %bb.9:                                #   in Loop: Header=BB0_3 Depth=1
 	i32.const	$5=, 2
 	br      	3               # 3: up to label2
 .LBB0_10:                               # %if.then
@@ -114,7 +112,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$2=, f($pop16)
 	i32.const	$push15=, 0
@@ -126,7 +124,7 @@ main:                                   # @main
 	i32.const	$push13=, 0
 	i32.load	$push0=, c($pop13)
 	br_if   	0, $pop0        # 0: down to label10
-# BB#1:
+# %bb.1:
 	i32.const	$4=, 1
 	br      	1               # 1: down to label9
 .LBB1_2:
@@ -159,9 +157,9 @@ main:                                   # @main
 	i32.store	g($pop19), $pop12
 	i32.const	$push17=, 0
 	i32.load	$push1=, c($pop17)
-	i32.eqz 	$push34=, $pop1
-	br_if   	5, $pop34       # 5: down to label14
-# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.eqz 	$push30=, $pop1
+	br_if   	5, $pop30       # 5: down to label14
+# %bb.5:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$4=, 0
 	br      	8               # 8: up to label11
 .LBB1_6:                                # %for.inc.lr.ph.i
@@ -170,51 +168,49 @@ main:                                   # @main
 	i32.const	$push21=, 0
 	i32.const	$push20=, 0
 	i32.store	c($pop21), $pop20
-# BB#7:                                 #   in Loop: Header=BB1_3 Depth=1
+# %bb.7:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$4=, 1
 	br      	7               # 7: up to label11
 .LBB1_8:                                # %for.end.i
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label18:
-	i32.const	$push31=, 0
-	i64.load32_s	$push2=, a($pop31)
-	i64.const	$push30=, 8589934591
-	i64.xor 	$push3=, $pop2, $pop30
+	i32.const	$push27=, 0
+	i64.load32_s	$push2=, a($pop27)
+	i64.const	$push26=, 8589934591
+	i64.xor 	$push3=, $pop2, $pop26
 	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
-	i32.store	0($1), $pop27
+	i64.const	$push25=, 1
+	i64.lt_s	$3=, $pop5, $pop25
+	i32.store	0($1), $3
 	i32.store	0($2), $3
-	i32.const	$push26=, 0
-	i32.load	$push25=, g($pop26)
-	tee_local	$push24=, $3=, $pop25
+	i32.const	$push24=, 0
+	i32.load	$3=, g($pop24)
 	i32.const	$push23=, 2
-	i32.shl 	$push6=, $pop24, $pop23
+	i32.shl 	$push6=, $3, $pop23
 	i32.const	$push22=, k
 	i32.add 	$push7=, $pop6, $pop22
 	i32.load	$push8=, 0($pop7)
-	i32.eqz 	$push35=, $pop8
-	br_if   	4, $pop35       # 4: down to label13
-# BB#9:                                 #   in Loop: Header=BB1_3 Depth=1
+	i32.eqz 	$push31=, $pop8
+	br_if   	4, $pop31       # 4: down to label13
+# %bb.9:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$4=, 2
 	br      	6               # 6: up to label11
 .LBB1_10:                               # %foo.exit
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label17:
-	i32.const	$push32=, 0
-	i32.load	$push9=, d($pop32)
+	i32.const	$push28=, 0
+	i32.load	$push9=, d($pop28)
 	i32.const	$push10=, 1
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	4, $pop11       # 4: down to label12
-# BB#11:                                #   in Loop: Header=BB1_3 Depth=1
+# %bb.11:                               #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$4=, 4
 	br      	5               # 5: up to label11
 .LBB1_12:                               # %if.end
 	end_block                       # label16:
-	i32.const	$push33=, 0
-	return  	$pop33
+	i32.const	$push29=, 0
+	return  	$pop29
 .LBB1_13:                               # %if.then
 	end_block                       # label15:
 	call    	abort@FUNCTION
@@ -319,5 +315,5 @@ g:
 	.size	g, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57861.c.s b/test/torture-s/pr57861.c.s
index 059e14758..cbdecbbac 100644
--- a/test/torture-s/pr57861.c.s
+++ b/test/torture-s/pr57861.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
-	i32.const	$push22=, 0
-	i32.store	c($pop23), $pop22
+# %bb.0:                                # %entry
 	i32.const	$push21=, 0
-	i32.load16_u	$push20=, a($pop21)
-	tee_local	$push19=, $0=, $pop20
-	copy_local	$1=, $pop19
+	i32.const	$push20=, 0
+	i32.store	c($pop21), $pop20
+	i32.const	$push19=, 0
+	i32.load16_u	$0=, a($pop19)
+	copy_local	$1=, $0
 	block   	
 	i32.const	$push18=, 0
 	i32.load	$push3=, e($pop18)
@@ -24,45 +23,44 @@ main:                                   # @main
 	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	$push7=, d($pop31)
-	i32.const	$push30=, 0
-	i32.ne  	$push8=, $pop7, $pop30
-	i32.const	$push29=, 0
-	i32.load	$push5=, h($pop29)
+# %bb.1:                                # %if.then.1.i
 	i32.const	$push28=, 0
-	i32.ne  	$push6=, $pop5, $pop28
-	i32.and 	$push27=, $pop8, $pop6
-	tee_local	$push26=, $1=, $pop27
-	i32.store16	a($pop32), $pop26
+	i32.load	$push7=, d($pop28)
+	i32.const	$push27=, 0
+	i32.ne  	$push8=, $pop7, $pop27
+	i32.const	$push26=, 0
+	i32.load	$push5=, h($pop26)
 	i32.const	$push25=, 0
+	i32.ne  	$push6=, $pop5, $pop25
+	i32.and 	$1=, $pop8, $pop6
 	i32.const	$push24=, 0
-	i32.store16	f($pop25), $pop24
+	i32.store16	a($pop24), $1
+	i32.const	$push23=, 0
+	i32.const	$push22=, 0
+	i32.store16	f($pop23), $pop22
 .LBB0_2:                                # %foo.exit
 	end_block                       # label0:
-	i32.const	$push39=, 0
+	i32.const	$push35=, 0
 	i32.const	$push9=, 2
-	i32.store	c($pop39), $pop9
-	i32.const	$push38=, 0
+	i32.store	c($pop35), $pop9
+	i32.const	$push34=, 0
 	i32.const	$push10=, 255
 	i32.and 	$push11=, $0, $pop10
-	i32.const	$push37=, 0
-	i32.ne  	$push12=, $pop11, $pop37
-	i32.store	i($pop38), $pop12
-	i32.const	$push36=, 0
-	i32.const	$push35=, 0
-	i32.store	j($pop36), $pop35
-	i32.const	$push34=, 0
-	i32.load	$push13=, g($pop34)
 	i32.const	$push33=, 0
-	i32.store	0($pop13), $pop33
+	i32.ne  	$push12=, $pop11, $pop33
+	i32.store	i($pop34), $pop12
+	i32.const	$push32=, 0
+	i32.const	$push31=, 0
+	i32.store	j($pop32), $pop31
+	i32.const	$push30=, 0
+	i32.load	$push13=, g($pop30)
+	i32.const	$push29=, 0
+	i32.store	0($pop13), $pop29
 	block   	
 	i32.const	$push14=, 65535
 	i32.and 	$push15=, $1, $pop14
 	br_if   	0, $pop15       # 0: down to label1
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push16=, 0
 	return  	$pop16
 .LBB0_4:                                # %if.then
@@ -164,5 +162,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57875.c.s b/test/torture-s/pr57875.c.s
index 20b889af2..bb67c123f 100644
--- a/test/torture-s/pr57875.c.s
+++ b/test/torture-s/pr57875.c.s
@@ -7,81 +7,78 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push13=, 0
+	i32.load	$4=, i($pop13)
 	block   	
-	i32.const	$push15=, 0
-	i32.load	$push14=, i($pop15)
-	tee_local	$push13=, $4=, $pop14
 	i32.const	$push12=, 0
-	i32.gt_s	$push0=, $pop13, $pop12
+	i32.gt_s	$push0=, $4, $pop12
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
-	i32.const	$push17=, 0
-	i32.load	$1=, c($pop17)
-	i32.const	$push16=, 0
-	i32.load	$0=, d($pop16)
+# %bb.1:                                # %for.body.lr.ph
+	i32.const	$push15=, 0
+	i32.load	$1=, c($pop15)
+	i32.const	$push14=, 0
+	i32.load	$0=, d($pop14)
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
 	block   	
 	br_if   	0, $0           # 0: down to label2
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
                                         #   in Loop: Header=BB0_2 Depth=1
 	block   	
 	block   	
-	i32.eqz 	$push31=, $1
-	br_if   	0, $pop31       # 0: down to label4
-# BB#4:                                 # %if.then.if.end_crit_edge
+	i32.eqz 	$push25=, $1
+	br_if   	0, $pop25       # 0: down to label4
+# %bb.4:                                # %if.then.if.end_crit_edge
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push18=, 0
-	i32.load	$3=, f($pop18)
+	i32.const	$push16=, 0
+	i32.load	$2=, f($pop16)
 	br      	1               # 1: down to label3
 .LBB0_5:                                # %if.then2
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label4:
-	i32.const	$3=, 2
-	i32.const	$push20=, 0
-	i32.const	$push19=, 2
-	i32.store	f($pop20), $pop19
+	i32.const	$2=, 2
+	i32.const	$push18=, 0
+	i32.const	$push17=, 2
+	i32.store	f($pop18), $pop17
 .LBB0_6:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label3:
-	i32.const	$push22=, 0
-	i32.const	$push21=, 0
-	i32.load8_u	$push1=, e($pop21)
-	i32.and 	$push2=, $3, $pop1
-	i32.store8	e($pop22), $pop2
+	i32.const	$push20=, 0
+	i32.const	$push19=, 0
+	i32.load8_u	$push1=, e($pop19)
+	i32.and 	$push2=, $2, $pop1
+	i32.store8	e($pop20), $pop2
 .LBB0_7:                                # %for.inc
                                         #   in Loop: Header=BB0_2 Depth=1
 	end_block                       # label2:
-	i32.const	$push26=, 0
-	i32.lt_s	$3=, $4, $pop26
-	i32.const	$push25=, 1
-	i32.add 	$push24=, $4, $pop25
-	tee_local	$push23=, $2=, $pop24
-	copy_local	$4=, $pop23
+	i32.const	$push22=, 1
+	i32.add 	$2=, $4, $pop22
+	i32.const	$push21=, 0
+	i32.lt_s	$3=, $4, $pop21
+	copy_local	$4=, $2
 	br_if   	0, $3           # 0: up to label1
-# BB#8:                                 # %for.cond.for.end_crit_edge
+# %bb.8:                                # %for.cond.for.end_crit_edge
 	end_loop
 	i32.const	$push3=, 0
 	i32.store	i($pop3), $2
 .LBB0_9:                                # %for.end
 	end_block                       # label0:
-	i32.const	$push30=, 0
-	i32.const	$push29=, 0
-	i32.load8_u	$push4=, e($pop29)
+	i32.const	$push24=, 0
+	i32.load8_u	$push4=, e($pop24)
 	i32.const	$push5=, 1
 	i32.shl 	$push6=, $pop4, $pop5
 	i32.const	$push7=, 4
 	i32.and 	$push8=, $pop6, $pop7
 	i32.const	$push9=, a
 	i32.add 	$push10=, $pop8, $pop9
-	i32.load	$push28=, 0($pop10)
-	tee_local	$push27=, $4=, $pop28
-	i32.store	b($pop30), $pop27
+	i32.load	$4=, 0($pop10)
+	i32.const	$push23=, 0
+	i32.store	b($pop23), $4
 	block   	
 	br_if   	0, $4           # 0: down to label5
-# BB#10:                                # %if.end10
+# %bb.10:                               # %if.end10
 	i32.const	$push11=, 0
 	return  	$pop11
 .LBB0_11:                               # %if.then9
@@ -155,5 +152,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57876.c.s b/test/torture-s/pr57876.c.s
index 94f3be514..5c1105980 100644
--- a/test/torture-s/pr57876.c.s
+++ b/test/torture-s/pr57876.c.s
@@ -7,237 +7,214 @@
 main:                                   # @main
 	.result 	i32
 	.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.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($0)
-	tee_local	$push161=, $1=, $pop162
-	i32.store	j($pop163), $pop161
-	i32.const	$push160=, 0
+# %bb.0:                                # %entry
+	i32.const	$push44=, 0
+	i32.load	$push43=, __stack_pointer($pop44)
+	i32.const	$push45=, 16
+	i32.sub 	$4=, $pop43, $pop45
+	i32.const	$push46=, 0
+	i32.store	__stack_pointer($pop46), $4
+	i32.const	$push128=, 0
+	i32.load	$0=, d($pop128)
+	i32.const	$push127=, 0
+	i32.const	$push126=, 0
+	i32.store	f($pop127), $pop126
+	i32.load	$1=, 0($0)
+	i32.const	$push125=, 0
+	i32.store	j($pop125), $1
+	i32.const	$push124=, 0
 	i32.const	$push0=, 1
-	i32.store	f($pop160), $pop0
-	i32.const	$push159=, 0
-	i32.const	$push158=, 0
-	i32.load	$push157=, a($pop158)
-	tee_local	$push156=, $2=, $pop157
-	i32.mul 	$push1=, $1, $pop156
+	i32.store	f($pop124), $pop0
+	i32.const	$push123=, 0
+	i32.load	$2=, a($pop123)
+	i32.const	$push122=, 0
+	i32.mul 	$push1=, $2, $1
 	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.store	h($pop122), $pop3
+	i32.load	$1=, 0($0)
+	i32.const	$push121=, 0
+	i32.store	j($pop121), $1
+	i32.const	$push120=, 0
 	i32.const	$push4=, 2
-	i32.store	f($pop152), $pop4
-	i32.const	$push151=, 0
+	i32.store	f($pop120), $pop4
+	i32.const	$push119=, 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	$push118=, -1
+	i32.add 	$push6=, $pop5, $pop118
+	i32.store	h($pop119), $pop6
+	i32.load	$1=, 0($0)
+	i32.const	$push117=, 0
+	i32.store	j($pop117), $1
+	i32.const	$push116=, 0
 	i32.const	$push7=, 3
-	i32.store	f($pop146), $pop7
-	i32.const	$push145=, 0
+	i32.store	f($pop116), $pop7
+	i32.const	$push115=, 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($0)
-	tee_local	$push141=, $1=, $pop142
-	i32.store	j($pop143), $pop141
-	i32.const	$push140=, 0
+	i32.const	$push114=, -1
+	i32.add 	$push9=, $pop8, $pop114
+	i32.store	h($pop115), $pop9
+	i32.load	$1=, 0($0)
+	i32.const	$push113=, 0
+	i32.store	j($pop113), $1
+	i32.const	$push112=, 0
 	i32.const	$push10=, 4
-	i32.store	f($pop140), $pop10
-	i32.const	$push139=, 0
+	i32.store	f($pop112), $pop10
+	i32.const	$push111=, 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.const	$push110=, -1
+	i32.add 	$push12=, $pop11, $pop110
+	i32.store	h($pop111), $pop12
+	i32.load	$1=, 0($0)
+	i32.const	$push109=, 0
+	i32.store	j($pop109), $1
+	i32.const	$push108=, 0
 	i32.const	$push13=, 5
-	i32.store	f($pop134), $pop13
-	i32.const	$push133=, 0
+	i32.store	f($pop108), $pop13
+	i32.const	$push107=, 0
 	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.const	$push106=, -1
+	i32.add 	$push15=, $pop14, $pop106
+	i32.store	h($pop107), $pop15
+	i32.load	$1=, 0($0)
+	i32.const	$push105=, 0
+	i32.store	j($pop105), $1
+	i32.const	$push104=, 0
 	i32.const	$push16=, 6
-	i32.store	f($pop128), $pop16
-	i32.const	$push127=, 0
+	i32.store	f($pop104), $pop16
+	i32.const	$push103=, 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
-	i64.load32_s	$3=, b($pop114)
-	i32.const	$push113=, 0
-	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.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.load	$push103=, 0($0)
-	tee_local	$push102=, $1=, $pop103
-	i32.store	j($pop104), $pop102
+	i32.const	$push102=, -1
+	i32.add 	$push18=, $pop17, $pop102
+	i32.store	h($pop103), $pop18
+	i32.load	$1=, 0($0)
 	i32.const	$push101=, 0
-	i32.const	$push100=, 2
-	i32.store	f($pop101), $pop100
+	i32.store	j($pop101), $1
+	i32.const	$push100=, 0
+	i32.const	$push19=, 7
+	i32.store	f($pop100), $pop19
 	i32.const	$push99=, 0
-	i32.mul 	$push26=, $2, $1
+	i32.mul 	$push20=, $2, $1
 	i32.const	$push98=, -1
-	i32.add 	$push27=, $pop26, $pop98
-	i32.store	h($pop99), $pop27
+	i32.add 	$push21=, $pop20, $pop98
+	i32.store	h($pop99), $pop21
+	i32.load	$1=, 0($0)
 	i32.const	$push97=, 0
-	i32.load	$push96=, 0($0)
-	tee_local	$push95=, $1=, $pop96
-	i32.store	j($pop97), $pop95
+	i32.store	j($pop97), $1
+	i32.const	$push96=, 0
+	i32.mul 	$push22=, $2, $1
+	i32.const	$push95=, -1
+	i32.add 	$push23=, $pop22, $pop95
+	i32.store	h($pop96), $pop23
 	i32.const	$push94=, 0
-	i32.const	$push93=, 3
-	i32.store	f($pop94), $pop93
+	i64.load32_s	$3=, b($pop94)
+	i32.const	$push93=, 0
 	i32.const	$push92=, 0
-	i32.mul 	$push28=, $2, $1
-	i32.const	$push91=, -1
-	i32.add 	$push29=, $pop28, $pop91
-	i32.store	h($pop92), $pop29
+	i32.store	f($pop93), $pop92
+	i32.load	$1=, 0($0)
+	i32.const	$push91=, 0
+	i32.store	j($pop91), $1
 	i32.const	$push90=, 0
-	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	$push89=, 1
+	i32.store	f($pop90), $pop89
+	i32.const	$push88=, 0
+	i32.mul 	$push24=, $2, $1
+	i32.const	$push87=, -1
+	i32.add 	$push25=, $pop24, $pop87
+	i32.store	h($pop88), $pop25
+	i32.load	$1=, 0($0)
+	i32.const	$push86=, 0
+	i32.store	j($pop86), $1
 	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	$push84=, 2
+	i32.store	f($pop85), $pop84
 	i32.const	$push83=, 0
-	i32.load	$push82=, 0($0)
-	tee_local	$push81=, $1=, $pop82
-	i32.store	j($pop83), $pop81
+	i32.mul 	$push26=, $2, $1
+	i32.const	$push82=, -1
+	i32.add 	$push27=, $pop26, $pop82
+	i32.store	h($pop83), $pop27
+	i32.load	$1=, 0($0)
+	i32.const	$push81=, 0
+	i32.store	j($pop81), $1
 	i32.const	$push80=, 0
-	i32.const	$push79=, 5
+	i32.const	$push79=, 3
 	i32.store	f($pop80), $pop79
 	i32.const	$push78=, 0
-	i32.mul 	$push32=, $2, $1
+	i32.mul 	$push28=, $2, $1
 	i32.const	$push77=, -1
-	i32.add 	$push33=, $pop32, $pop77
-	i32.store	h($pop78), $pop33
+	i32.add 	$push29=, $pop28, $pop77
+	i32.store	h($pop78), $pop29
+	i32.load	$1=, 0($0)
 	i32.const	$push76=, 0
-	i32.load	$push75=, 0($0)
-	tee_local	$push74=, $1=, $pop75
-	i32.store	j($pop76), $pop74
+	i32.store	j($pop76), $1
+	i32.const	$push75=, 0
+	i32.const	$push74=, 4
+	i32.store	f($pop75), $pop74
 	i32.const	$push73=, 0
-	i32.const	$push72=, 6
-	i32.store	f($pop73), $pop72
+	i32.mul 	$push30=, $2, $1
+	i32.const	$push72=, -1
+	i32.add 	$push31=, $pop30, $pop72
+	i32.store	h($pop73), $pop31
+	i32.load	$1=, 0($0)
 	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.store	j($pop71), $1
+	i32.const	$push70=, 0
+	i32.const	$push69=, 5
+	i32.store	f($pop70), $pop69
+	i32.const	$push68=, 0
+	i32.mul 	$push32=, $2, $1
+	i32.const	$push67=, -1
+	i32.add 	$push33=, $pop32, $pop67
+	i32.store	h($pop68), $pop33
+	i32.load	$1=, 0($0)
 	i32.const	$push66=, 0
-	i32.const	$push65=, 7
-	i32.store	f($pop66), $pop65
-	i32.const	$push64=, 0
+	i32.store	j($pop66), $1
+	i32.const	$push65=, 0
+	i32.const	$push64=, 6
+	i32.store	f($pop65), $pop64
+	i32.const	$push63=, 0
+	i32.mul 	$push34=, $2, $1
+	i32.const	$push62=, -1
+	i32.add 	$push35=, $pop34, $pop62
+	i32.store	h($pop63), $pop35
+	i32.load	$1=, 0($0)
+	i32.const	$push61=, 0
+	i32.store	j($pop61), $1
+	i32.const	$push60=, 0
+	i32.const	$push59=, 7
+	i32.store	f($pop60), $pop59
+	i32.const	$push58=, 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	$push57=, -1
+	i32.add 	$push37=, $pop36, $pop57
+	i32.store	h($pop58), $pop37
+	i32.load	$0=, 0($0)
+	i32.const	$push56=, 0
+	i32.store	j($pop56), $0
+	i32.const	$push55=, 0
 	i32.const	$push38=, 8
-	i32.store	f($pop59), $pop38
-	i32.const	$push58=, 0
+	i32.store	f($pop55), $pop38
 	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.const	$push54=, -1
+	i32.add 	$0=, $pop39, $pop54
+	i32.const	$push53=, 0
+	i32.store	h($pop53), $0
+	i32.const	$push52=, 0
+	i32.const	$push50=, 12
+	i32.add 	$push51=, $4, $pop50
+	i32.store	g($pop52), $pop51
+	block   	
 	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 	$push170=, $0
-	br_if   	0, $pop170      # 0: down to label0
-# BB#1:                                 # %if.end
-	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
+	i64.ge_s	$push42=, $pop41, $3
+	br_if   	0, $pop42       # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push49=, 0
+	i32.const	$push47=, 16
+	i32.add 	$push48=, $4, $pop47
+	i32.store	__stack_pointer($pop49), $pop48
+	i32.const	$push129=, 0
+	return  	$pop129
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -282,13 +259,6 @@ f:
 	.int32	0                       # 0x0
 	.size	f, 4
 
-	.type	e,@object               # @e
-	.section	.bss.e,"aw",@nobits
-	.p2align	2
-e:
-	.int32	0                       # 0x0
-	.size	e, 4
-
 	.hidden	j                       # @j
 	.type	j,@object
 	.section	.bss.j,"aw",@nobits
@@ -326,5 +296,5 @@ g:
 	.size	g, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr57877.c.s b/test/torture-s/pr57877.c.s
index c68ab29ca..2e627a1b8 100644
--- a/test/torture-s/pr57877.c.s
+++ b/test/torture-s/pr57877.c.s
@@ -7,57 +7,53 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i64, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push13=, 0
+	i32.load	$4=, g($pop13)
 	block   	
 	block   	
-	i32.const	$push15=, 0
-	i32.load	$push14=, g($pop15)
-	tee_local	$push13=, $4=, $pop14
 	i32.const	$push12=, 1
-	i32.lt_s	$push0=, $pop13, $pop12
-	br_if   	0, $pop0        # 0: down to label1
-# BB#1:                                 # %entry.foo.exit_crit_edge
-	i32.const	$push16=, 0
-	i32.load	$5=, e($pop16)
+	i32.lt_s	$push1=, $4, $pop12
+	br_if   	0, $pop1        # 0: down to label1
+# %bb.1:                                # %entry.foo.exit_crit_edge
+	i32.const	$push14=, 0
+	i32.load	$5=, e($pop14)
 	br      	1               # 1: down to label0
 .LBB0_2:                                # %for.body.lr.ph.i
 	end_block                       # label1:
-	i32.const	$push19=, 0
-	i64.load32_s	$0=, f($pop19)
-	i32.const	$push1=, -1
-	i32.add 	$4=, $4, $pop1
-	i32.const	$push18=, 0
-	i32.load	$2=, a($pop18)
 	i32.const	$push17=, 0
-	i32.load	$1=, c($pop17)
+	i64.load32_s	$0=, f($pop17)
+	i32.const	$push2=, -1
+	i32.add 	$4=, $4, $pop2
+	i32.const	$push16=, 0
+	i32.load	$2=, a($pop16)
+	i32.const	$push15=, 0
+	i32.load	$1=, c($pop15)
 .LBB0_3:                                # %for.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push33=, 0
-	i32.load	$push32=, 0($1)
-	tee_local	$push31=, $3=, $pop32
-	i32.store	h($pop33), $pop31
-	i32.const	$push30=, 0
-	i32.const	$push29=, 2
-	i32.add 	$push2=, $4, $pop29
-	i32.store	g($pop30), $pop2
-	i32.const	$push28=, 0
-	i32.const	$push27=, 16
-	i32.shl 	$push3=, $3, $pop27
-	i32.const	$push26=, 16
-	i32.shr_s	$push4=, $pop3, $pop26
-	i32.eq  	$push5=, $pop4, $2
-	i64.extend_u/i32	$push6=, $pop5
-	i64.lt_u	$push25=, $pop6, $0
-	tee_local	$push24=, $5=, $pop25
-	i32.store	e($pop28), $pop24
-	i32.const	$push23=, 1
-	i32.add 	$push22=, $4, $pop23
-	tee_local	$push21=, $4=, $pop22
+	i32.load	$3=, 0($1)
+	i32.const	$push25=, 0
+	i32.store	h($pop25), $3
+	i32.const	$push24=, 0
+	i32.const	$push23=, 2
+	i32.add 	$push3=, $4, $pop23
+	i32.store	g($pop24), $pop3
+	i32.const	$push22=, 16
+	i32.shl 	$push4=, $3, $pop22
+	i32.const	$push21=, 16
+	i32.shr_s	$push5=, $pop4, $pop21
+	i32.eq  	$push6=, $pop5, $2
+	i64.extend_u/i32	$push0=, $pop6
+	i64.lt_u	$5=, $pop0, $0
 	i32.const	$push20=, 0
-	i32.lt_s	$push7=, $pop21, $pop20
+	i32.store	e($pop20), $5
+	i32.const	$push19=, 1
+	i32.add 	$4=, $4, $pop19
+	i32.const	$push18=, 0
+	i32.lt_s	$push7=, $4, $pop18
 	br_if   	0, $pop7        # 0: up to label2
-# BB#4:                                 # %for.cond.for.end_crit_edge.i
+# %bb.4:                                # %for.cond.for.end_crit_edge.i
 	end_loop
 	i32.const	$push8=, 0
 	i32.store16	d($pop8), $3
@@ -67,7 +63,7 @@ main:                                   # @main
 	i32.const	$push9=, 1
 	i32.ne  	$push10=, $5, $pop9
 	br_if   	0, $pop10       # 0: down to label3
-# BB#6:                                 # %if.end
+# %bb.6:                                # %if.end
 	i32.const	$push11=, 0
 	return  	$pop11
 .LBB0_7:                                # %if.then
@@ -151,5 +147,5 @@ d:
 	.size	d, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58209.c.s b/test/torture-s/pr58209.c.s
index 317e3311a..30e1a463e 100644
--- a/test/torture-s/pr58209.c.s
+++ b/test/torture-s/pr58209.c.s
@@ -7,11 +7,11 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push6=, $0
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo@FUNCTION, $pop1
@@ -33,11 +33,11 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.eqz 	$push6=, $0
 	br_if   	0, $pop6        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $0, $pop0
 	i32.call	$push2=, foo@FUNCTION, $pop1
@@ -59,52 +59,48 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$2=, 0
 	i32.const	$1=, buf-4
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label3:
-	i32.const	$push13=, 4
-	i32.add 	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.call	$push10=, foo@FUNCTION, $2
-	tee_local	$push9=, $0=, $pop10
-	i32.ne  	$push1=, $pop11, $pop9
-	br_if   	1, $pop1        # 1: down to label2
-# BB#2:                                 # %lor.lhs.false
+	i32.const	$push9=, 4
+	i32.add 	$1=, $1, $pop9
+	i32.call	$0=, foo@FUNCTION, $2
+	i32.ne  	$push0=, $1, $0
+	br_if   	1, $pop0        # 1: down to label2
+# %bb.2:                                # %lor.lhs.false
                                         #   in Loop: Header=BB2_1 Depth=1
 	block   	
 	block   	
-	i32.eqz 	$push18=, $2
-	br_if   	0, $pop18       # 0: down to label5
-# BB#3:                                 # %if.end.i
+	i32.eqz 	$push14=, $2
+	br_if   	0, $pop14       # 0: down to label5
+# %bb.3:                                # %if.end.i
                                         #   in Loop: Header=BB2_1 Depth=1
-	i32.const	$push15=, -1
-	i32.add 	$push2=, $2, $pop15
-	i32.call	$push3=, foo@FUNCTION, $pop2
-	i32.const	$push14=, 4
-	i32.add 	$push7=, $pop3, $pop14
-	i32.eq  	$push5=, $pop7, $0
-	br_if   	1, $pop5        # 1: down to label4
+	i32.const	$push11=, -1
+	i32.add 	$push1=, $2, $pop11
+	i32.call	$push2=, foo@FUNCTION, $pop1
+	i32.const	$push10=, 4
+	i32.add 	$push7=, $pop2, $pop10
+	i32.eq  	$push4=, $pop7, $0
+	br_if   	1, $pop4        # 1: down to label4
 	br      	3               # 3: down to label2
 .LBB2_4:                                #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label5:
 	i32.const	$push8=, buf
-	i32.ne  	$push4=, $pop8, $0
-	br_if   	2, $pop4        # 2: down to label2
+	i32.ne  	$push3=, $pop8, $0
+	br_if   	2, $pop3        # 2: down to label2
 .LBB2_5:                                # %for.cond
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label4:
-	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
+	i32.const	$push13=, 1
+	i32.add 	$2=, $2, $pop13
+	i32.const	$push12=, 26
+	i32.le_u	$push5=, $2, $pop12
+	br_if   	0, $pop5        # 0: up to label3
+# %bb.6:                                # %for.end
 	end_loop
 	i32.const	$push6=, 0
 	return  	$pop6
@@ -126,5 +122,5 @@ buf:
 	.size	buf, 4096
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58277-1.c.s b/test/torture-s/pr58277-1.c.s
index ce8d3a685..52911989e 100644
--- a/test/torture-s/pr58277-1.c.s
+++ b/test/torture-s/pr58277-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store8	u($pop0), $pop2
@@ -21,7 +21,7 @@ bar:                                    # @bar
 	.globl	baz
 	.type	baz,@function
 baz:                                    # @baz
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	#APP
 	#NO_APP
                                         # fallthrough-return
@@ -36,14 +36,13 @@ baz:                                    # @baz
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push334=, 0
+# %bb.0:                                # %entry
 	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.sub 	$2=, $pop331, $pop333
+	i32.const	$push334=, 0
+	i32.store	__stack_pointer($pop334), $2
 	i32.const	$push343=, 0
 	i32.const	$push342=, 1
 	i32.store	n($pop343), $pop342
@@ -59,697 +58,692 @@ main:                                   # @main
                                         #     Child Loop BB2_4 Depth 2
                                         #       Child Loop BB2_6 Depth 3
 	loop    	                # label0:
-	i32.const	$push348=, 0
-	i32.const	$push347=, 0
-	i32.store	g($pop348), $pop347
+	i32.const	$push346=, 0
+	i32.const	$push345=, 0
+	i32.store	g($pop346), $pop345
 	block   	
 	block   	
-	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
+	i32.const	$push344=, 0
+	i32.load	$push0=, l($pop344)
+	i32.eqz 	$push600=, $pop0
+	br_if   	0, $pop600      # 0: down to label2
+# %bb.2:                                # %for.end
                                         #   in Loop: Header=BB2_1 Depth=1
-	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.load	$push1=, j($pop359)
 	i32.const	$push358=, 0
-	i32.load	$push3=, j($pop358)
-	i32.load	$push4=, 0($pop3)
-	i32.store	0($pop2), $pop4
+	i32.store	0($pop1), $pop358
 	i32.const	$push357=, 0
-	i32.load	$push5=, i($pop357)
+	i32.load	$push2=, i($pop357)
 	i32.const	$push356=, 0
-	i32.store	0($pop5), $pop356
+	i32.load	$push3=, j($pop356)
+	i32.load	$push4=, 0($pop3)
+	i32.store	0($pop2), $pop4
 	i32.const	$push355=, 0
-	i32.const	$push354=, 1
-	i32.store8	u($pop355), $pop354
+	i32.load	$push5=, i($pop355)
+	i32.const	$push354=, 0
+	i32.store	0($pop5), $pop354
 	i32.const	$push353=, 0
-	i32.load	$push6=, i($pop353)
-	i32.const	$push352=, 0
-	i32.store	0($pop6), $pop352
+	i32.const	$push352=, 1
+	i32.store8	u($pop353), $pop352
 	i32.const	$push351=, 0
+	i32.load	$push6=, i($pop351)
 	i32.const	$push350=, 0
-	i32.store	d($pop351), $pop350
+	i32.store	0($pop6), $pop350
 	i32.const	$push349=, 0
-	i32.load	$push7=, i($pop349)
+	i32.const	$push348=, 0
+	i32.store	d($pop349), $pop348
+	i32.const	$push347=, 0
+	i32.load	$push7=, i($pop347)
 	i32.store	0($pop7), $2
 	br      	1               # 1: down to label1
 .LBB2_3:                                # %if.else.i
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label2:
-	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.load	$push8=, i($pop366)
 	i32.const	$push365=, 0
-	i32.store	0($pop9), $pop365
+	i32.store	0($pop8), $pop365
 	i32.const	$push364=, 0
+	i32.load	$push9=, e($pop364)
 	i32.const	$push363=, 0
-	i32.store	o($pop364), $pop363
-	block   	
+	i32.store	0($pop9), $pop363
 	i32.const	$push362=, 0
-	i32.load	$push10=, p($pop362)
+	i32.const	$push361=, 0
+	i32.store	o($pop362), $pop361
+	block   	
+	i32.const	$push360=, 0
+	i32.load	$push10=, p($pop360)
 	br_if   	0, $pop10       # 0: down to label3
 .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	$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	$push369=, 0
-	i32.load	$push12=, j($pop369)
+	i32.load	$1=, i($pop369)
+	i32.load	$push11=, 0($1)
+	i32.const	$push368=, 0
+	i32.store	0($pop11), $pop368
+	block   	
+	i32.const	$push367=, 0
+	i32.load	$push12=, j($pop367)
 	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
+# %bb.5:                                # %if.end110.lr.ph.i
                                         #   in Loop: Header=BB2_4 Depth=2
-	i32.const	$push376=, 0
-	i32.load	$push375=, i($pop376)
-	tee_local	$push374=, $1=, $pop375
-	i32.load	$0=, 0($pop374)
+	i32.const	$push370=, 0
+	i32.load	$1=, i($pop370)
+	i32.load	$0=, 0($1)
 .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	$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.const	$push376=, 0
+	i32.load	$push15=, k($pop376)
+	i32.const	$push375=, 1
+	i32.add 	$push16=, $pop15, $pop375
+	i32.store	k($pop377), $pop16
+	i32.const	$push374=, 0
+	i32.store	0($0), $pop374
+	i32.const	$push373=, 0
+	i32.const	$push372=, 0
+	i32.store8	u($pop373), $pop372
+	i32.const	$push371=, 0
+	i32.load	$push17=, j($pop371)
 	i32.load	$push18=, 0($pop17)
 	i32.load	$push19=, 0($pop18)
-	i32.eqz 	$push613=, $pop19
-	br_if   	0, $pop613      # 0: up to label6
+	i32.eqz 	$push601=, $pop19
+	br_if   	0, $pop601      # 0: up to label6
 .LBB2_7:                                # %for.end.i
                                         #   in Loop: Header=BB2_4 Depth=2
 	end_loop
 	end_block                       # label5:
-	i32.const	$push404=, 0
-	i32.load	$push20=, j($pop404)
+	i32.const	$push398=, 0
+	i32.load	$push20=, j($pop398)
 	i32.load	$push21=, 0($pop20)
 	i32.store	0($1), $pop21
-	i32.const	$push403=, 0
-	i32.load	$push22=, i($pop403)
-	i32.const	$push402=, 0
-	i32.load	$push23=, j($pop402)
+	i32.const	$push397=, 0
+	i32.load	$push22=, i($pop397)
+	i32.const	$push396=, 0
+	i32.load	$push23=, j($pop396)
 	i32.load	$push24=, 0($pop23)
 	i32.store	0($pop22), $pop24
-	i32.const	$push401=, 0
-	i32.load	$push25=, i($pop401)
-	i32.const	$push400=, 0
-	i32.load	$push26=, j($pop400)
+	i32.const	$push395=, 0
+	i32.load	$push25=, i($pop395)
+	i32.const	$push394=, 0
+	i32.load	$push26=, j($pop394)
 	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.const	$push393=, 0
+	i32.load	$push28=, i($pop393)
+	i32.const	$push392=, 0
+	i32.load	$push29=, j($pop392)
 	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.const	$push391=, 0
+	i32.load	$push31=, i($pop391)
+	i32.const	$push390=, 0
+	i32.load	$push32=, j($pop390)
 	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.const	$push389=, 0
+	i32.load	$push34=, i($pop389)
+	i32.const	$push388=, 0
+	i32.load	$push35=, j($pop388)
 	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.load	$push37=, i($pop387)
 	i32.const	$push386=, 0
+	i32.store	0($pop37), $pop386
 	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
+	i32.load	$push38=, h($pop384)
+	i32.const	$push383=, 1
+	i32.add 	$push39=, $pop38, $pop383
+	i32.store	h($pop385), $pop39
+	i32.const	$push382=, 0
+	i32.load	$push40=, e($pop382)
+	i32.const	$push381=, 0
+	i32.store	0($pop40), $pop381
+	i32.const	$push380=, 0
+	i32.const	$push379=, 0
+	i32.store	o($pop380), $pop379
+	i32.const	$push378=, 0
+	i32.load	$push41=, p($pop378)
+	i32.eqz 	$push602=, $pop41
+	br_if   	0, $pop602      # 0: up to label4
 .LBB2_8:                                # %foo.exit.thread
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_loop
 	end_block                       # label3:
-	i32.const	$push407=, 0
-	i32.const	$push406=, 0
-	i32.store	f($pop407), $pop406
-	i32.const	$push405=, 0
-	i32.load	$0=, n($pop405)
+	i32.const	$push401=, 0
+	i32.const	$push400=, 0
+	i32.store	f($pop401), $pop400
+	i32.const	$push399=, 0
+	i32.load	$0=, n($pop399)
 .LBB2_9:                                # %for.inc7
                                         #   in Loop: Header=BB2_1 Depth=1
 	end_block                       # label1:
-	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
+	i32.const	$push405=, -1
+	i32.add 	$0=, $0, $pop405
+	i32.const	$push404=, 0
+	i32.store	n($pop404), $0
+	i32.const	$push403=, 0
+	i32.const	$push402=, 0
+	i32.store8	u($pop403), $pop402
 	br_if   	0, $0           # 0: up to label0
-# BB#10:                                # %for.end8
+# %bb.10:                               # %for.end8
 	end_loop
+	i32.const	$push406=, 0
+	i32.load	$0=, b($pop406)
 	block   	
-	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)
+	i32.eqz 	$push603=, $0
+	br_if   	0, $pop603      # 0: down to label7
+# %bb.11:                               # %for.body11.lr.ph
+	i32.const	$push407=, 0
+	i32.load	$1=, c($pop407)
 .LBB2_12:                               # %for.body11
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
-	i32.const	$push580=, 2
-	i32.shl 	$push42=, $0, $pop580
-	i32.const	$push579=, a
-	i32.add 	$push43=, $pop42, $pop579
+	i32.const	$push568=, 1
+	i32.add 	$0=, $0, $pop568
+	i32.const	$push567=, 2
+	i32.shl 	$push42=, $1, $pop567
+	i32.const	$push566=, a
+	i32.add 	$push43=, $pop42, $pop566
 	i32.load	$push44=, 0($pop43)
-	i32.const	$push578=, 2
-	i32.shl 	$push45=, $pop44, $pop578
-	i32.const	$push577=, a
-	i32.add 	$push46=, $pop45, $pop577
+	i32.const	$push565=, 2
+	i32.shl 	$push45=, $pop44, $pop565
+	i32.const	$push564=, a
+	i32.add 	$push46=, $pop45, $pop564
 	i32.load	$push47=, 0($pop46)
-	i32.const	$push576=, 2
-	i32.shl 	$push48=, $pop47, $pop576
-	i32.const	$push575=, a
-	i32.add 	$push49=, $pop48, $pop575
+	i32.const	$push563=, 2
+	i32.shl 	$push48=, $pop47, $pop563
+	i32.const	$push562=, a
+	i32.add 	$push49=, $pop48, $pop562
 	i32.load	$push50=, 0($pop49)
-	i32.const	$push574=, 2
-	i32.shl 	$push51=, $pop50, $pop574
-	i32.const	$push573=, a
-	i32.add 	$push52=, $pop51, $pop573
+	i32.const	$push561=, 2
+	i32.shl 	$push51=, $pop50, $pop561
+	i32.const	$push560=, a
+	i32.add 	$push52=, $pop51, $pop560
 	i32.load	$push53=, 0($pop52)
-	i32.const	$push572=, 2
-	i32.shl 	$push54=, $pop53, $pop572
-	i32.const	$push571=, a
-	i32.add 	$push55=, $pop54, $pop571
+	i32.const	$push559=, 2
+	i32.shl 	$push54=, $pop53, $pop559
+	i32.const	$push558=, a
+	i32.add 	$push55=, $pop54, $pop558
 	i32.load	$push56=, 0($pop55)
-	i32.const	$push570=, 2
-	i32.shl 	$push57=, $pop56, $pop570
-	i32.const	$push569=, a
-	i32.add 	$push58=, $pop57, $pop569
+	i32.const	$push557=, 2
+	i32.shl 	$push57=, $pop56, $pop557
+	i32.const	$push556=, a
+	i32.add 	$push58=, $pop57, $pop556
 	i32.load	$push59=, 0($pop58)
-	i32.const	$push568=, 2
-	i32.shl 	$push60=, $pop59, $pop568
-	i32.const	$push567=, a
-	i32.add 	$push61=, $pop60, $pop567
+	i32.const	$push555=, 2
+	i32.shl 	$push60=, $pop59, $pop555
+	i32.const	$push554=, a
+	i32.add 	$push61=, $pop60, $pop554
 	i32.load	$push62=, 0($pop61)
-	i32.const	$push566=, 2
-	i32.shl 	$push63=, $pop62, $pop566
-	i32.const	$push565=, a
-	i32.add 	$push64=, $pop63, $pop565
+	i32.const	$push553=, 2
+	i32.shl 	$push63=, $pop62, $pop553
+	i32.const	$push552=, a
+	i32.add 	$push64=, $pop63, $pop552
 	i32.load	$push65=, 0($pop64)
-	i32.const	$push564=, 2
-	i32.shl 	$push66=, $pop65, $pop564
-	i32.const	$push563=, a
-	i32.add 	$push67=, $pop66, $pop563
+	i32.const	$push551=, 2
+	i32.shl 	$push66=, $pop65, $pop551
+	i32.const	$push550=, a
+	i32.add 	$push67=, $pop66, $pop550
 	i32.load	$push68=, 0($pop67)
-	i32.const	$push562=, 2
-	i32.shl 	$push69=, $pop68, $pop562
-	i32.const	$push561=, a
-	i32.add 	$push70=, $pop69, $pop561
+	i32.const	$push549=, 2
+	i32.shl 	$push69=, $pop68, $pop549
+	i32.const	$push548=, a
+	i32.add 	$push70=, $pop69, $pop548
 	i32.load	$push71=, 0($pop70)
-	i32.const	$push560=, 2
-	i32.shl 	$push72=, $pop71, $pop560
-	i32.const	$push559=, a
-	i32.add 	$push73=, $pop72, $pop559
+	i32.const	$push547=, 2
+	i32.shl 	$push72=, $pop71, $pop547
+	i32.const	$push546=, a
+	i32.add 	$push73=, $pop72, $pop546
 	i32.load	$push74=, 0($pop73)
-	i32.const	$push558=, 2
-	i32.shl 	$push75=, $pop74, $pop558
-	i32.const	$push557=, a
-	i32.add 	$push76=, $pop75, $pop557
+	i32.const	$push545=, 2
+	i32.shl 	$push75=, $pop74, $pop545
+	i32.const	$push544=, a
+	i32.add 	$push76=, $pop75, $pop544
 	i32.load	$push77=, 0($pop76)
-	i32.const	$push556=, 2
-	i32.shl 	$push78=, $pop77, $pop556
-	i32.const	$push555=, a
-	i32.add 	$push79=, $pop78, $pop555
+	i32.const	$push543=, 2
+	i32.shl 	$push78=, $pop77, $pop543
+	i32.const	$push542=, a
+	i32.add 	$push79=, $pop78, $pop542
 	i32.load	$push80=, 0($pop79)
-	i32.const	$push554=, 2
-	i32.shl 	$push81=, $pop80, $pop554
-	i32.const	$push553=, a
-	i32.add 	$push82=, $pop81, $pop553
+	i32.const	$push541=, 2
+	i32.shl 	$push81=, $pop80, $pop541
+	i32.const	$push540=, a
+	i32.add 	$push82=, $pop81, $pop540
 	i32.load	$push83=, 0($pop82)
-	i32.const	$push552=, 2
-	i32.shl 	$push84=, $pop83, $pop552
-	i32.const	$push551=, a
-	i32.add 	$push85=, $pop84, $pop551
+	i32.const	$push539=, 2
+	i32.shl 	$push84=, $pop83, $pop539
+	i32.const	$push538=, a
+	i32.add 	$push85=, $pop84, $pop538
 	i32.load	$push86=, 0($pop85)
-	i32.const	$push550=, 2
-	i32.shl 	$push87=, $pop86, $pop550
-	i32.const	$push549=, a
-	i32.add 	$push88=, $pop87, $pop549
+	i32.const	$push537=, 2
+	i32.shl 	$push87=, $pop86, $pop537
+	i32.const	$push536=, a
+	i32.add 	$push88=, $pop87, $pop536
 	i32.load	$push89=, 0($pop88)
-	i32.const	$push548=, 2
-	i32.shl 	$push90=, $pop89, $pop548
-	i32.const	$push547=, a
-	i32.add 	$push91=, $pop90, $pop547
+	i32.const	$push535=, 2
+	i32.shl 	$push90=, $pop89, $pop535
+	i32.const	$push534=, a
+	i32.add 	$push91=, $pop90, $pop534
 	i32.load	$push92=, 0($pop91)
-	i32.const	$push546=, 2
-	i32.shl 	$push93=, $pop92, $pop546
-	i32.const	$push545=, a
-	i32.add 	$push94=, $pop93, $pop545
+	i32.const	$push533=, 2
+	i32.shl 	$push93=, $pop92, $pop533
+	i32.const	$push532=, a
+	i32.add 	$push94=, $pop93, $pop532
 	i32.load	$push95=, 0($pop94)
-	i32.const	$push544=, 2
-	i32.shl 	$push96=, $pop95, $pop544
-	i32.const	$push543=, a
-	i32.add 	$push97=, $pop96, $pop543
+	i32.const	$push531=, 2
+	i32.shl 	$push96=, $pop95, $pop531
+	i32.const	$push530=, a
+	i32.add 	$push97=, $pop96, $pop530
 	i32.load	$push98=, 0($pop97)
-	i32.const	$push542=, 2
-	i32.shl 	$push99=, $pop98, $pop542
-	i32.const	$push541=, a
-	i32.add 	$push100=, $pop99, $pop541
+	i32.const	$push529=, 2
+	i32.shl 	$push99=, $pop98, $pop529
+	i32.const	$push528=, a
+	i32.add 	$push100=, $pop99, $pop528
 	i32.load	$push101=, 0($pop100)
-	i32.const	$push540=, 2
-	i32.shl 	$push102=, $pop101, $pop540
-	i32.const	$push539=, a
-	i32.add 	$push103=, $pop102, $pop539
+	i32.const	$push527=, 2
+	i32.shl 	$push102=, $pop101, $pop527
+	i32.const	$push526=, a
+	i32.add 	$push103=, $pop102, $pop526
 	i32.load	$push104=, 0($pop103)
-	i32.const	$push538=, 2
-	i32.shl 	$push105=, $pop104, $pop538
-	i32.const	$push537=, a
-	i32.add 	$push106=, $pop105, $pop537
+	i32.const	$push525=, 2
+	i32.shl 	$push105=, $pop104, $pop525
+	i32.const	$push524=, a
+	i32.add 	$push106=, $pop105, $pop524
 	i32.load	$push107=, 0($pop106)
-	i32.const	$push536=, 2
-	i32.shl 	$push108=, $pop107, $pop536
-	i32.const	$push535=, a
-	i32.add 	$push109=, $pop108, $pop535
+	i32.const	$push523=, 2
+	i32.shl 	$push108=, $pop107, $pop523
+	i32.const	$push522=, a
+	i32.add 	$push109=, $pop108, $pop522
 	i32.load	$push110=, 0($pop109)
-	i32.const	$push534=, 2
-	i32.shl 	$push111=, $pop110, $pop534
-	i32.const	$push533=, a
-	i32.add 	$push112=, $pop111, $pop533
+	i32.const	$push521=, 2
+	i32.shl 	$push111=, $pop110, $pop521
+	i32.const	$push520=, a
+	i32.add 	$push112=, $pop111, $pop520
 	i32.load	$push113=, 0($pop112)
-	i32.const	$push532=, 2
-	i32.shl 	$push114=, $pop113, $pop532
-	i32.const	$push531=, a
-	i32.add 	$push115=, $pop114, $pop531
+	i32.const	$push519=, 2
+	i32.shl 	$push114=, $pop113, $pop519
+	i32.const	$push518=, a
+	i32.add 	$push115=, $pop114, $pop518
 	i32.load	$push116=, 0($pop115)
-	i32.const	$push530=, 2
-	i32.shl 	$push117=, $pop116, $pop530
-	i32.const	$push529=, a
-	i32.add 	$push118=, $pop117, $pop529
+	i32.const	$push517=, 2
+	i32.shl 	$push117=, $pop116, $pop517
+	i32.const	$push516=, a
+	i32.add 	$push118=, $pop117, $pop516
 	i32.load	$push119=, 0($pop118)
-	i32.const	$push528=, 2
-	i32.shl 	$push120=, $pop119, $pop528
-	i32.const	$push527=, a
-	i32.add 	$push121=, $pop120, $pop527
+	i32.const	$push515=, 2
+	i32.shl 	$push120=, $pop119, $pop515
+	i32.const	$push514=, a
+	i32.add 	$push121=, $pop120, $pop514
 	i32.load	$push122=, 0($pop121)
-	i32.const	$push526=, 2
-	i32.shl 	$push123=, $pop122, $pop526
-	i32.const	$push525=, a
-	i32.add 	$push124=, $pop123, $pop525
+	i32.const	$push513=, 2
+	i32.shl 	$push123=, $pop122, $pop513
+	i32.const	$push512=, a
+	i32.add 	$push124=, $pop123, $pop512
 	i32.load	$push125=, 0($pop124)
-	i32.const	$push524=, 2
-	i32.shl 	$push126=, $pop125, $pop524
-	i32.const	$push523=, a
-	i32.add 	$push127=, $pop126, $pop523
+	i32.const	$push511=, 2
+	i32.shl 	$push126=, $pop125, $pop511
+	i32.const	$push510=, a
+	i32.add 	$push127=, $pop126, $pop510
 	i32.load	$push128=, 0($pop127)
-	i32.const	$push522=, 2
-	i32.shl 	$push129=, $pop128, $pop522
-	i32.const	$push521=, a
-	i32.add 	$push130=, $pop129, $pop521
+	i32.const	$push509=, 2
+	i32.shl 	$push129=, $pop128, $pop509
+	i32.const	$push508=, a
+	i32.add 	$push130=, $pop129, $pop508
 	i32.load	$push131=, 0($pop130)
-	i32.const	$push520=, 2
-	i32.shl 	$push132=, $pop131, $pop520
-	i32.const	$push519=, a
-	i32.add 	$push133=, $pop132, $pop519
+	i32.const	$push507=, 2
+	i32.shl 	$push132=, $pop131, $pop507
+	i32.const	$push506=, a
+	i32.add 	$push133=, $pop132, $pop506
 	i32.load	$push134=, 0($pop133)
-	i32.const	$push518=, 2
-	i32.shl 	$push135=, $pop134, $pop518
-	i32.const	$push517=, a
-	i32.add 	$push136=, $pop135, $pop517
+	i32.const	$push505=, 2
+	i32.shl 	$push135=, $pop134, $pop505
+	i32.const	$push504=, a
+	i32.add 	$push136=, $pop135, $pop504
 	i32.load	$push137=, 0($pop136)
-	i32.const	$push516=, 2
-	i32.shl 	$push138=, $pop137, $pop516
-	i32.const	$push515=, a
-	i32.add 	$push139=, $pop138, $pop515
+	i32.const	$push503=, 2
+	i32.shl 	$push138=, $pop137, $pop503
+	i32.const	$push502=, a
+	i32.add 	$push139=, $pop138, $pop502
 	i32.load	$push140=, 0($pop139)
-	i32.const	$push514=, 2
-	i32.shl 	$push141=, $pop140, $pop514
-	i32.const	$push513=, a
-	i32.add 	$push142=, $pop141, $pop513
+	i32.const	$push501=, 2
+	i32.shl 	$push141=, $pop140, $pop501
+	i32.const	$push500=, a
+	i32.add 	$push142=, $pop141, $pop500
 	i32.load	$push143=, 0($pop142)
-	i32.const	$push512=, 2
-	i32.shl 	$push144=, $pop143, $pop512
-	i32.const	$push511=, a
-	i32.add 	$push145=, $pop144, $pop511
+	i32.const	$push499=, 2
+	i32.shl 	$push144=, $pop143, $pop499
+	i32.const	$push498=, a
+	i32.add 	$push145=, $pop144, $pop498
 	i32.load	$push146=, 0($pop145)
-	i32.const	$push510=, 2
-	i32.shl 	$push147=, $pop146, $pop510
-	i32.const	$push509=, a
-	i32.add 	$push148=, $pop147, $pop509
+	i32.const	$push497=, 2
+	i32.shl 	$push147=, $pop146, $pop497
+	i32.const	$push496=, a
+	i32.add 	$push148=, $pop147, $pop496
 	i32.load	$push149=, 0($pop148)
-	i32.const	$push508=, 2
-	i32.shl 	$push150=, $pop149, $pop508
-	i32.const	$push507=, a
-	i32.add 	$push151=, $pop150, $pop507
+	i32.const	$push495=, 2
+	i32.shl 	$push150=, $pop149, $pop495
+	i32.const	$push494=, a
+	i32.add 	$push151=, $pop150, $pop494
 	i32.load	$push152=, 0($pop151)
-	i32.const	$push506=, 2
-	i32.shl 	$push153=, $pop152, $pop506
-	i32.const	$push505=, a
-	i32.add 	$push154=, $pop153, $pop505
+	i32.const	$push493=, 2
+	i32.shl 	$push153=, $pop152, $pop493
+	i32.const	$push492=, a
+	i32.add 	$push154=, $pop153, $pop492
 	i32.load	$push155=, 0($pop154)
-	i32.const	$push504=, 2
-	i32.shl 	$push156=, $pop155, $pop504
-	i32.const	$push503=, a
-	i32.add 	$push157=, $pop156, $pop503
+	i32.const	$push491=, 2
+	i32.shl 	$push156=, $pop155, $pop491
+	i32.const	$push490=, a
+	i32.add 	$push157=, $pop156, $pop490
 	i32.load	$push158=, 0($pop157)
-	i32.const	$push502=, 2
-	i32.shl 	$push159=, $pop158, $pop502
-	i32.const	$push501=, a
-	i32.add 	$push160=, $pop159, $pop501
+	i32.const	$push489=, 2
+	i32.shl 	$push159=, $pop158, $pop489
+	i32.const	$push488=, a
+	i32.add 	$push160=, $pop159, $pop488
 	i32.load	$push161=, 0($pop160)
-	i32.const	$push500=, 2
-	i32.shl 	$push162=, $pop161, $pop500
-	i32.const	$push499=, a
-	i32.add 	$push163=, $pop162, $pop499
+	i32.const	$push487=, 2
+	i32.shl 	$push162=, $pop161, $pop487
+	i32.const	$push486=, a
+	i32.add 	$push163=, $pop162, $pop486
 	i32.load	$push164=, 0($pop163)
-	i32.const	$push498=, 2
-	i32.shl 	$push165=, $pop164, $pop498
-	i32.const	$push497=, a
-	i32.add 	$push166=, $pop165, $pop497
+	i32.const	$push485=, 2
+	i32.shl 	$push165=, $pop164, $pop485
+	i32.const	$push484=, a
+	i32.add 	$push166=, $pop165, $pop484
 	i32.load	$push167=, 0($pop166)
-	i32.const	$push496=, 2
-	i32.shl 	$push168=, $pop167, $pop496
-	i32.const	$push495=, a
-	i32.add 	$push169=, $pop168, $pop495
+	i32.const	$push483=, 2
+	i32.shl 	$push168=, $pop167, $pop483
+	i32.const	$push482=, a
+	i32.add 	$push169=, $pop168, $pop482
 	i32.load	$push170=, 0($pop169)
-	i32.const	$push494=, 2
-	i32.shl 	$push171=, $pop170, $pop494
-	i32.const	$push493=, a
-	i32.add 	$push172=, $pop171, $pop493
+	i32.const	$push481=, 2
+	i32.shl 	$push171=, $pop170, $pop481
+	i32.const	$push480=, a
+	i32.add 	$push172=, $pop171, $pop480
 	i32.load	$push173=, 0($pop172)
-	i32.const	$push492=, 2
-	i32.shl 	$push174=, $pop173, $pop492
-	i32.const	$push491=, a
-	i32.add 	$push175=, $pop174, $pop491
+	i32.const	$push479=, 2
+	i32.shl 	$push174=, $pop173, $pop479
+	i32.const	$push478=, a
+	i32.add 	$push175=, $pop174, $pop478
 	i32.load	$push176=, 0($pop175)
-	i32.const	$push490=, 2
-	i32.shl 	$push177=, $pop176, $pop490
-	i32.const	$push489=, a
-	i32.add 	$push178=, $pop177, $pop489
+	i32.const	$push477=, 2
+	i32.shl 	$push177=, $pop176, $pop477
+	i32.const	$push476=, a
+	i32.add 	$push178=, $pop177, $pop476
 	i32.load	$push179=, 0($pop178)
-	i32.const	$push488=, 2
-	i32.shl 	$push180=, $pop179, $pop488
-	i32.const	$push487=, a
-	i32.add 	$push181=, $pop180, $pop487
+	i32.const	$push475=, 2
+	i32.shl 	$push180=, $pop179, $pop475
+	i32.const	$push474=, a
+	i32.add 	$push181=, $pop180, $pop474
 	i32.load	$push182=, 0($pop181)
-	i32.const	$push486=, 2
-	i32.shl 	$push183=, $pop182, $pop486
-	i32.const	$push485=, a
-	i32.add 	$push184=, $pop183, $pop485
+	i32.const	$push473=, 2
+	i32.shl 	$push183=, $pop182, $pop473
+	i32.const	$push472=, a
+	i32.add 	$push184=, $pop183, $pop472
 	i32.load	$push185=, 0($pop184)
-	i32.const	$push484=, 2
-	i32.shl 	$push186=, $pop185, $pop484
-	i32.const	$push483=, a
-	i32.add 	$push187=, $pop186, $pop483
+	i32.const	$push471=, 2
+	i32.shl 	$push186=, $pop185, $pop471
+	i32.const	$push470=, a
+	i32.add 	$push187=, $pop186, $pop470
 	i32.load	$push188=, 0($pop187)
-	i32.const	$push482=, 2
-	i32.shl 	$push189=, $pop188, $pop482
-	i32.const	$push481=, a
-	i32.add 	$push190=, $pop189, $pop481
+	i32.const	$push469=, 2
+	i32.shl 	$push189=, $pop188, $pop469
+	i32.const	$push468=, a
+	i32.add 	$push190=, $pop189, $pop468
 	i32.load	$push191=, 0($pop190)
-	i32.const	$push480=, 2
-	i32.shl 	$push192=, $pop191, $pop480
-	i32.const	$push479=, a
-	i32.add 	$push193=, $pop192, $pop479
+	i32.const	$push467=, 2
+	i32.shl 	$push192=, $pop191, $pop467
+	i32.const	$push466=, a
+	i32.add 	$push193=, $pop192, $pop466
 	i32.load	$push194=, 0($pop193)
-	i32.const	$push478=, 2
-	i32.shl 	$push195=, $pop194, $pop478
-	i32.const	$push477=, a
-	i32.add 	$push196=, $pop195, $pop477
+	i32.const	$push465=, 2
+	i32.shl 	$push195=, $pop194, $pop465
+	i32.const	$push464=, a
+	i32.add 	$push196=, $pop195, $pop464
 	i32.load	$push197=, 0($pop196)
-	i32.const	$push476=, 2
-	i32.shl 	$push198=, $pop197, $pop476
-	i32.const	$push475=, a
-	i32.add 	$push199=, $pop198, $pop475
+	i32.const	$push463=, 2
+	i32.shl 	$push198=, $pop197, $pop463
+	i32.const	$push462=, a
+	i32.add 	$push199=, $pop198, $pop462
 	i32.load	$push200=, 0($pop199)
-	i32.const	$push474=, 2
-	i32.shl 	$push201=, $pop200, $pop474
-	i32.const	$push473=, a
-	i32.add 	$push202=, $pop201, $pop473
+	i32.const	$push461=, 2
+	i32.shl 	$push201=, $pop200, $pop461
+	i32.const	$push460=, a
+	i32.add 	$push202=, $pop201, $pop460
 	i32.load	$push203=, 0($pop202)
-	i32.const	$push472=, 2
-	i32.shl 	$push204=, $pop203, $pop472
-	i32.const	$push471=, a
-	i32.add 	$push205=, $pop204, $pop471
+	i32.const	$push459=, 2
+	i32.shl 	$push204=, $pop203, $pop459
+	i32.const	$push458=, a
+	i32.add 	$push205=, $pop204, $pop458
 	i32.load	$push206=, 0($pop205)
-	i32.const	$push470=, 2
-	i32.shl 	$push207=, $pop206, $pop470
-	i32.const	$push469=, a
-	i32.add 	$push208=, $pop207, $pop469
+	i32.const	$push457=, 2
+	i32.shl 	$push207=, $pop206, $pop457
+	i32.const	$push456=, a
+	i32.add 	$push208=, $pop207, $pop456
 	i32.load	$push209=, 0($pop208)
-	i32.const	$push468=, 2
-	i32.shl 	$push210=, $pop209, $pop468
-	i32.const	$push467=, a
-	i32.add 	$push211=, $pop210, $pop467
+	i32.const	$push455=, 2
+	i32.shl 	$push210=, $pop209, $pop455
+	i32.const	$push454=, a
+	i32.add 	$push211=, $pop210, $pop454
 	i32.load	$push212=, 0($pop211)
-	i32.const	$push466=, 2
-	i32.shl 	$push213=, $pop212, $pop466
-	i32.const	$push465=, a
-	i32.add 	$push214=, $pop213, $pop465
+	i32.const	$push453=, 2
+	i32.shl 	$push213=, $pop212, $pop453
+	i32.const	$push452=, a
+	i32.add 	$push214=, $pop213, $pop452
 	i32.load	$push215=, 0($pop214)
-	i32.const	$push464=, 2
-	i32.shl 	$push216=, $pop215, $pop464
-	i32.const	$push463=, a
-	i32.add 	$push217=, $pop216, $pop463
+	i32.const	$push451=, 2
+	i32.shl 	$push216=, $pop215, $pop451
+	i32.const	$push450=, a
+	i32.add 	$push217=, $pop216, $pop450
 	i32.load	$push218=, 0($pop217)
-	i32.const	$push462=, 2
-	i32.shl 	$push219=, $pop218, $pop462
-	i32.const	$push461=, a
-	i32.add 	$push220=, $pop219, $pop461
+	i32.const	$push449=, 2
+	i32.shl 	$push219=, $pop218, $pop449
+	i32.const	$push448=, a
+	i32.add 	$push220=, $pop219, $pop448
 	i32.load	$push221=, 0($pop220)
-	i32.const	$push460=, 2
-	i32.shl 	$push222=, $pop221, $pop460
-	i32.const	$push459=, a
-	i32.add 	$push223=, $pop222, $pop459
+	i32.const	$push447=, 2
+	i32.shl 	$push222=, $pop221, $pop447
+	i32.const	$push446=, a
+	i32.add 	$push223=, $pop222, $pop446
 	i32.load	$push224=, 0($pop223)
-	i32.const	$push458=, 2
-	i32.shl 	$push225=, $pop224, $pop458
-	i32.const	$push457=, a
-	i32.add 	$push226=, $pop225, $pop457
+	i32.const	$push445=, 2
+	i32.shl 	$push225=, $pop224, $pop445
+	i32.const	$push444=, a
+	i32.add 	$push226=, $pop225, $pop444
 	i32.load	$push227=, 0($pop226)
-	i32.const	$push456=, 2
-	i32.shl 	$push228=, $pop227, $pop456
-	i32.const	$push455=, a
-	i32.add 	$push229=, $pop228, $pop455
+	i32.const	$push443=, 2
+	i32.shl 	$push228=, $pop227, $pop443
+	i32.const	$push442=, a
+	i32.add 	$push229=, $pop228, $pop442
 	i32.load	$push230=, 0($pop229)
-	i32.const	$push454=, 2
-	i32.shl 	$push231=, $pop230, $pop454
-	i32.const	$push453=, a
-	i32.add 	$push232=, $pop231, $pop453
+	i32.const	$push441=, 2
+	i32.shl 	$push231=, $pop230, $pop441
+	i32.const	$push440=, a
+	i32.add 	$push232=, $pop231, $pop440
 	i32.load	$push233=, 0($pop232)
-	i32.const	$push452=, 2
-	i32.shl 	$push234=, $pop233, $pop452
-	i32.const	$push451=, a
-	i32.add 	$push235=, $pop234, $pop451
+	i32.const	$push439=, 2
+	i32.shl 	$push234=, $pop233, $pop439
+	i32.const	$push438=, a
+	i32.add 	$push235=, $pop234, $pop438
 	i32.load	$push236=, 0($pop235)
-	i32.const	$push450=, 2
-	i32.shl 	$push237=, $pop236, $pop450
-	i32.const	$push449=, a
-	i32.add 	$push238=, $pop237, $pop449
+	i32.const	$push437=, 2
+	i32.shl 	$push237=, $pop236, $pop437
+	i32.const	$push436=, a
+	i32.add 	$push238=, $pop237, $pop436
 	i32.load	$push239=, 0($pop238)
-	i32.const	$push448=, 2
-	i32.shl 	$push240=, $pop239, $pop448
-	i32.const	$push447=, a
-	i32.add 	$push241=, $pop240, $pop447
+	i32.const	$push435=, 2
+	i32.shl 	$push240=, $pop239, $pop435
+	i32.const	$push434=, a
+	i32.add 	$push241=, $pop240, $pop434
 	i32.load	$push242=, 0($pop241)
-	i32.const	$push446=, 2
-	i32.shl 	$push243=, $pop242, $pop446
-	i32.const	$push445=, a
-	i32.add 	$push244=, $pop243, $pop445
+	i32.const	$push433=, 2
+	i32.shl 	$push243=, $pop242, $pop433
+	i32.const	$push432=, a
+	i32.add 	$push244=, $pop243, $pop432
 	i32.load	$push245=, 0($pop244)
-	i32.const	$push444=, 2
-	i32.shl 	$push246=, $pop245, $pop444
-	i32.const	$push443=, a
-	i32.add 	$push247=, $pop246, $pop443
+	i32.const	$push431=, 2
+	i32.shl 	$push246=, $pop245, $pop431
+	i32.const	$push430=, a
+	i32.add 	$push247=, $pop246, $pop430
 	i32.load	$push248=, 0($pop247)
-	i32.const	$push442=, 2
-	i32.shl 	$push249=, $pop248, $pop442
-	i32.const	$push441=, a
-	i32.add 	$push250=, $pop249, $pop441
+	i32.const	$push429=, 2
+	i32.shl 	$push249=, $pop248, $pop429
+	i32.const	$push428=, a
+	i32.add 	$push250=, $pop249, $pop428
 	i32.load	$push251=, 0($pop250)
-	i32.const	$push440=, 2
-	i32.shl 	$push252=, $pop251, $pop440
-	i32.const	$push439=, a
-	i32.add 	$push253=, $pop252, $pop439
+	i32.const	$push427=, 2
+	i32.shl 	$push252=, $pop251, $pop427
+	i32.const	$push426=, a
+	i32.add 	$push253=, $pop252, $pop426
 	i32.load	$push254=, 0($pop253)
-	i32.const	$push438=, 2
-	i32.shl 	$push255=, $pop254, $pop438
-	i32.const	$push437=, a
-	i32.add 	$push256=, $pop255, $pop437
+	i32.const	$push425=, 2
+	i32.shl 	$push255=, $pop254, $pop425
+	i32.const	$push424=, a
+	i32.add 	$push256=, $pop255, $pop424
 	i32.load	$push257=, 0($pop256)
-	i32.const	$push436=, 2
-	i32.shl 	$push258=, $pop257, $pop436
-	i32.const	$push435=, a
-	i32.add 	$push259=, $pop258, $pop435
+	i32.const	$push423=, 2
+	i32.shl 	$push258=, $pop257, $pop423
+	i32.const	$push422=, a
+	i32.add 	$push259=, $pop258, $pop422
 	i32.load	$push260=, 0($pop259)
-	i32.const	$push434=, 2
-	i32.shl 	$push261=, $pop260, $pop434
-	i32.const	$push433=, a
-	i32.add 	$push262=, $pop261, $pop433
+	i32.const	$push421=, 2
+	i32.shl 	$push261=, $pop260, $pop421
+	i32.const	$push420=, a
+	i32.add 	$push262=, $pop261, $pop420
 	i32.load	$push263=, 0($pop262)
-	i32.const	$push432=, 2
-	i32.shl 	$push264=, $pop263, $pop432
-	i32.const	$push431=, a
-	i32.add 	$push265=, $pop264, $pop431
+	i32.const	$push419=, 2
+	i32.shl 	$push264=, $pop263, $pop419
+	i32.const	$push418=, a
+	i32.add 	$push265=, $pop264, $pop418
 	i32.load	$push266=, 0($pop265)
-	i32.const	$push430=, 2
-	i32.shl 	$push267=, $pop266, $pop430
-	i32.const	$push429=, a
-	i32.add 	$push268=, $pop267, $pop429
+	i32.const	$push417=, 2
+	i32.shl 	$push267=, $pop266, $pop417
+	i32.const	$push416=, a
+	i32.add 	$push268=, $pop267, $pop416
 	i32.load	$push269=, 0($pop268)
-	i32.const	$push428=, 2
-	i32.shl 	$push270=, $pop269, $pop428
-	i32.const	$push427=, a
-	i32.add 	$push271=, $pop270, $pop427
+	i32.const	$push415=, 2
+	i32.shl 	$push270=, $pop269, $pop415
+	i32.const	$push414=, a
+	i32.add 	$push271=, $pop270, $pop414
 	i32.load	$push272=, 0($pop271)
-	i32.const	$push426=, 2
-	i32.shl 	$push273=, $pop272, $pop426
-	i32.const	$push425=, a
-	i32.add 	$push274=, $pop273, $pop425
+	i32.const	$push413=, 2
+	i32.shl 	$push273=, $pop272, $pop413
+	i32.const	$push412=, a
+	i32.add 	$push274=, $pop273, $pop412
 	i32.load	$push275=, 0($pop274)
-	i32.const	$push424=, 2
-	i32.shl 	$push276=, $pop275, $pop424
-	i32.const	$push423=, a
-	i32.add 	$push277=, $pop276, $pop423
+	i32.const	$push411=, 2
+	i32.shl 	$push276=, $pop275, $pop411
+	i32.const	$push410=, a
+	i32.add 	$push277=, $pop276, $pop410
 	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
+	i32.const	$push409=, 2
+	i32.shl 	$push279=, $pop278, $pop409
+	i32.const	$push408=, a
+	i32.add 	$push280=, $pop279, $pop408
+	i32.load	$1=, 0($pop280)
+	br_if   	0, $0           # 0: up to label8
+# %bb.13:                               # %for.cond9.for.end29_crit_edge
 	end_loop
 	i32.const	$push281=, 0
-	i32.store	c($pop281), $0
-	i32.const	$push582=, 0
-	i32.const	$push581=, 0
-	i32.store	b($pop582), $pop581
+	i32.store	c($pop281), $1
+	i32.const	$push570=, 0
+	i32.const	$push569=, 0
+	i32.store	b($pop570), $pop569
 .LBB2_14:                               # %for.end29
 	end_block                       # label7:
 	call    	baz@FUNCTION
 	block   	
-	i32.const	$push611=, 0
-	i32.load8_s	$push282=, u($pop611)
+	i32.const	$push599=, 0
+	i32.load8_s	$push282=, u($pop599)
 	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.shl 	$push288=, $pop287, $pop598
 	i32.const	$push597=, a
-	i32.add 	$push307=, $pop306, $pop597
-	i32.load	$push308=, 0($pop307)
+	i32.add 	$push289=, $pop288, $pop597
+	i32.load	$push290=, 0($pop289)
 	i32.const	$push596=, 2
-	i32.shl 	$push309=, $pop308, $pop596
+	i32.shl 	$push291=, $pop290, $pop596
 	i32.const	$push595=, a
-	i32.add 	$push310=, $pop309, $pop595
-	i32.load	$push311=, 0($pop310)
+	i32.add 	$push292=, $pop291, $pop595
+	i32.load	$push293=, 0($pop292)
 	i32.const	$push594=, 2
-	i32.shl 	$push312=, $pop311, $pop594
+	i32.shl 	$push294=, $pop293, $pop594
 	i32.const	$push593=, a
-	i32.add 	$push313=, $pop312, $pop593
-	i32.load	$push314=, 0($pop313)
+	i32.add 	$push295=, $pop294, $pop593
+	i32.load	$push296=, 0($pop295)
 	i32.const	$push592=, 2
-	i32.shl 	$push315=, $pop314, $pop592
+	i32.shl 	$push297=, $pop296, $pop592
 	i32.const	$push591=, a
-	i32.add 	$push316=, $pop315, $pop591
-	i32.load	$push317=, 0($pop316)
+	i32.add 	$push298=, $pop297, $pop591
+	i32.load	$push299=, 0($pop298)
 	i32.const	$push590=, 2
-	i32.shl 	$push318=, $pop317, $pop590
+	i32.shl 	$push300=, $pop299, $pop590
 	i32.const	$push589=, a
-	i32.add 	$push319=, $pop318, $pop589
-	i32.load	$push320=, 0($pop319)
+	i32.add 	$push301=, $pop300, $pop589
+	i32.load	$push302=, 0($pop301)
 	i32.const	$push588=, 2
-	i32.shl 	$push321=, $pop320, $pop588
+	i32.shl 	$push303=, $pop302, $pop588
 	i32.const	$push587=, a
-	i32.add 	$push322=, $pop321, $pop587
-	i32.load	$push323=, 0($pop322)
+	i32.add 	$push304=, $pop303, $pop587
+	i32.load	$push305=, 0($pop304)
 	i32.const	$push586=, 2
-	i32.shl 	$push324=, $pop323, $pop586
+	i32.shl 	$push306=, $pop305, $pop586
 	i32.const	$push585=, a
-	i32.add 	$push325=, $pop324, $pop585
-	i32.load	$push326=, 0($pop325)
+	i32.add 	$push307=, $pop306, $pop585
+	i32.load	$push308=, 0($pop307)
 	i32.const	$push584=, 2
-	i32.shl 	$push327=, $pop326, $pop584
+	i32.shl 	$push309=, $pop308, $pop584
 	i32.const	$push583=, a
-	i32.add 	$push328=, $pop327, $pop583
+	i32.add 	$push310=, $pop309, $pop583
+	i32.load	$push311=, 0($pop310)
+	i32.const	$push582=, 2
+	i32.shl 	$push312=, $pop311, $pop582
+	i32.const	$push581=, a
+	i32.add 	$push313=, $pop312, $pop581
+	i32.load	$push314=, 0($pop313)
+	i32.const	$push580=, 2
+	i32.shl 	$push315=, $pop314, $pop580
+	i32.const	$push579=, a
+	i32.add 	$push316=, $pop315, $pop579
+	i32.load	$push317=, 0($pop316)
+	i32.const	$push578=, 2
+	i32.shl 	$push318=, $pop317, $pop578
+	i32.const	$push577=, a
+	i32.add 	$push319=, $pop318, $pop577
+	i32.load	$push320=, 0($pop319)
+	i32.const	$push576=, 2
+	i32.shl 	$push321=, $pop320, $pop576
+	i32.const	$push575=, a
+	i32.add 	$push322=, $pop321, $pop575
+	i32.load	$push323=, 0($pop322)
+	i32.const	$push574=, 2
+	i32.shl 	$push324=, $pop323, $pop574
+	i32.const	$push573=, a
+	i32.add 	$push325=, $pop324, $pop573
+	i32.load	$push326=, 0($pop325)
+	i32.const	$push572=, 2
+	i32.shl 	$push327=, $pop326, $pop572
+	i32.const	$push571=, a
+	i32.add 	$push328=, $pop327, $pop571
 	i32.load	$push329=, 0($pop328)
-	i32.eqz 	$push616=, $pop329
-	br_if   	0, $pop616      # 0: down to label9
-# BB#15:                                # %if.end47
+	i32.eqz 	$push604=, $pop329
+	br_if   	0, $pop604      # 0: down to label9
+# %bb.15:                               # %if.end47
 	i32.const	$push337=, 0
 	i32.const	$push335=, 32
 	i32.add 	$push336=, $2, $pop335
@@ -913,5 +907,5 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58277-2.c.s b/test/torture-s/pr58277-2.c.s
index 067ee2f98..5bd323f71 100644
--- a/test/torture-s/pr58277-2.c.s
+++ b/test/torture-s/pr58277-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.const	$push6=, 0
 	i32.store8	n($pop7), $pop6
@@ -16,7 +16,7 @@ main:                                   # @main
 	i32.load	$push0=, g($pop5)
 	i32.eqz 	$push16=, $pop0
 	br_if   	0, $pop16       # 0: down to label1
-# BB#1:                                 # %fn2.exit.thread.i
+# %bb.1:                                # %fn2.exit.thread.i
 	i32.const	$push8=, 0
 	i32.load	$drop=, d($pop8)
 	br      	1               # 1: down to label0
@@ -121,4 +121,4 @@ s:
 	.size	s, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr58364.c.s b/test/torture-s/pr58364.c.s
index 60ee4fec6..63fe9b254 100644
--- a/test/torture-s/pr58364.c.s
+++ b/test/torture-s/pr58364.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 1
 	i32.const	$push0=, 0
 	i32.lt_s	$push1=, $0, $pop0
@@ -23,7 +23,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.const	$push5=, 0
 	i32.store	b($pop6), $pop5
@@ -34,7 +34,7 @@ main:                                   # @main
 	i32.load	$push0=, c($pop3)
 	i32.le_s	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB1_2:                                # %if.then
@@ -73,5 +73,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58365.c.s b/test/torture-s/pr58365.c.s
index 8ca6d48d7..abc45de83 100644
--- a/test/torture-s/pr58365.c.s
+++ b/test/torture-s/pr58365.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load8_s	$push1=, i($pop0)
                                         # fallthrough-return: $pop1
@@ -21,76 +21,75 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push25=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop22, $pop24
+	i32.const	$push25=, 0
+	i32.store	__stack_pointer($pop25), $0
 	block   	
 	block   	
 	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.eqz 	$push41=, $pop0
+	br_if   	0, $pop41       # 0: down to label1
+# %bb.1:                                # %if.then.i
 	i32.const	$push2=, 24
 	i32.add 	$push3=, $0, $pop2
-	i32.const	$push34=, 0
-	i32.load	$push1=, f+16($pop34)
+	i32.const	$push32=, 0
+	i32.load	$push1=, f+16($pop32)
 	i32.store	0($pop3), $pop1
 	i32.const	$push5=, 16
 	i32.add 	$push6=, $0, $pop5
-	i32.const	$push33=, 0
-	i64.load	$push4=, f+8($pop33):p2align=2
+	i32.const	$push31=, 0
+	i64.load	$push4=, f+8($pop31):p2align=2
 	i64.store	0($pop6), $pop4
-	i32.const	$push32=, 0
-	i64.load	$push7=, f($pop32):p2align=2
+	i32.const	$push30=, 0
+	i64.load	$push7=, f($pop30):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	$push36=, 0
-	i32.store	0($pop9), $pop36
+	i32.const	$push34=, 0
+	i32.store	0($pop9), $pop34
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $0, $pop10
 	i64.const	$push12=, 0
 	i64.store	0($pop11), $pop12
-	i64.const	$push35=, 0
-	i64.store	8($0), $pop35
+	i64.const	$push33=, 0
+	i64.store	8($0), $pop33
 .LBB1_3:                                # %bar.exit
 	end_block                       # label0:
-	i32.const	$push41=, 0
+	i32.const	$push39=, 0
 	i64.load	$push13=, 8($0)
-	i64.store	h($pop41):p2align=2, $pop13
-	i32.const	$push40=, 0
+	i64.store	h($pop39):p2align=2, $pop13
+	i32.const	$push38=, 0
 	i32.const	$push14=, 1
-	i32.store	f+4($pop40), $pop14
-	i32.const	$push39=, 0
+	i32.store	f+4($pop38), $pop14
+	i32.const	$push37=, 0
 	i32.const	$push15=, 24
 	i32.add 	$push16=, $0, $pop15
 	i32.load	$push17=, 0($pop16)
-	i32.store	h+16($pop39), $pop17
-	i32.const	$push38=, 0
+	i32.store	h+16($pop37), $pop17
+	i32.const	$push36=, 0
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $0, $pop18
 	i64.load	$push20=, 0($pop19)
-	i64.store	h+8($pop38):p2align=2, $pop20
+	i64.store	h+8($pop36):p2align=2, $pop20
 	block   	
-	i32.const	$push37=, 0
-	i32.load	$push21=, h+4($pop37)
+	i32.const	$push35=, 0
+	i32.load	$push21=, h+4($pop35)
 	br_if   	0, $pop21       # 0: down to label2
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	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
+	i32.const	$push40=, 0
+	return  	$pop40
 .LBB1_5:                                # %if.then
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -125,5 +124,5 @@ f:
 	.size	f, 20
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58385.c.s b/test/torture-s/pr58385.c.s
index 88b7c6921..50190976a 100644
--- a/test/torture-s/pr58385.c.s
+++ b/test/torture-s/pr58385.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	b($pop0), $pop2
@@ -22,7 +22,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	b($pop0), $pop2
@@ -51,4 +51,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr58387.c.s b/test/torture-s/pr58387.c.s
index 1e38c7373..23d26d939 100644
--- a/test/torture-s/pr58387.c.s
+++ b/test/torture-s/pr58387.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, a($pop3)
 	i32.const	$push2=, 0
 	i32.ge_s	$push1=, $pop0, $pop2
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB0_2:                                # %if.then
@@ -34,5 +34,5 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58419.c.s b/test/torture-s/pr58419.c.s
index 4660ff7a8..dc865c90e 100644
--- a/test/torture-s/pr58419.c.s
+++ b/test/torture-s/pr58419.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.sub 	$push0=, $0, $1
 	i32.const	$push1=, 24
 	i32.shl 	$push2=, $pop0, $pop1
@@ -24,7 +24,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store16	c($pop1), $pop0
@@ -45,245 +45,241 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push56=, 0
+# %bb.0:                                # %entry
+	i32.const	$push50=, 0
 	i32.const	$push0=, 234
-	i32.store8	b($pop56), $pop0
+	i32.store8	b($pop50), $pop0
+	i32.const	$push49=, 0
+	i32.load16_u	$3=, c($pop49)
+	i32.const	$push48=, 0
+	i32.load	$4=, k($pop48)
+	i32.const	$push47=, 0
+	i32.load	$2=, i($pop47)
 	i32.const	$5=, 1
-	i32.const	$push55=, 0
-	i32.load	$0=, p($pop55)
+	i32.const	$push46=, 0
+	i32.load	$0=, p($pop46)
 	i32.const	$1=, 1
 	block   	
-	i32.const	$push54=, 0
-	i32.load	$push53=, k($pop54)
-	tee_local	$push52=, $4=, $pop53
-	i32.const	$push51=, 0
-	i32.ne  	$push2=, $pop52, $pop51
-	i32.const	$push50=, 0
-	i32.load16_u	$push49=, c($pop50)
-	tee_local	$push48=, $3=, $pop49
-	i32.const	$push47=, 0
-	i32.ne  	$push1=, $pop48, $pop47
+	i32.const	$push45=, 0
+	i32.ne  	$push2=, $4, $pop45
+	i32.const	$push44=, 0
+	i32.ne  	$push1=, $3, $pop44
 	i32.and 	$push3=, $pop2, $pop1
-	i32.const	$push46=, 0
-	i32.load	$push45=, i($pop46)
-	tee_local	$push44=, $2=, $pop45
 	i32.const	$push43=, 1
-	i32.lt_s	$push4=, $pop44, $pop43
+	i32.lt_s	$push4=, $2, $pop43
 	i32.sub 	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %lor.rhs
-	i32.const	$push61=, 0
-	i32.store	0($0), $pop61
+# %bb.1:                                # %lor.rhs
+	i32.const	$push55=, 0
+	i32.store	0($0), $pop55
 	i32.const	$3=, 1
-	i32.const	$push60=, 0
-	i32.const	$push59=, 1
-	i32.store16	c($pop60), $pop59
-	i32.const	$push58=, 0
-	i32.load	$2=, i($pop58)
-	i32.const	$push57=, 0
-	i32.load	$4=, k($pop57)
+	i32.const	$push54=, 0
+	i32.const	$push53=, 1
+	i32.store16	c($pop54), $pop53
+	i32.const	$push52=, 0
+	i32.load	$2=, i($pop52)
+	i32.const	$push51=, 0
+	i32.load	$4=, k($pop51)
 	i32.const	$1=, 0
 .LBB2_2:                                # %lor.end
 	end_block                       # label0:
-	i32.const	$push65=, 0
-	i32.store	g($pop65), $1
+	i32.const	$push59=, 0
+	i32.store	g($pop59), $1
 	block   	
-	i32.const	$push64=, 0
-	i32.ne  	$push7=, $4, $pop64
-	i32.const	$push63=, 0
-	i32.ne  	$push6=, $3, $pop63
+	i32.const	$push58=, 0
+	i32.ne  	$push7=, $4, $pop58
+	i32.const	$push57=, 0
+	i32.ne  	$push6=, $3, $pop57
 	i32.and 	$push8=, $pop7, $pop6
-	i32.const	$push62=, 1
-	i32.lt_s	$push9=, $2, $pop62
+	i32.const	$push56=, 1
+	i32.lt_s	$push9=, $2, $pop56
 	i32.sub 	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label1
-# BB#3:                                 # %lor.rhs.1
+# %bb.3:                                # %lor.rhs.1
 	i32.const	$5=, 0
-	i32.const	$push70=, 0
-	i32.store	0($0), $pop70
+	i32.const	$push64=, 0
+	i32.store	0($0), $pop64
 	i32.const	$3=, 1
-	i32.const	$push69=, 0
-	i32.const	$push68=, 1
-	i32.store16	c($pop69), $pop68
-	i32.const	$push67=, 0
-	i32.load	$2=, i($pop67)
-	i32.const	$push66=, 0
-	i32.load	$4=, k($pop66)
+	i32.const	$push63=, 0
+	i32.const	$push62=, 1
+	i32.store16	c($pop63), $pop62
+	i32.const	$push61=, 0
+	i32.load	$2=, i($pop61)
+	i32.const	$push60=, 0
+	i32.load	$4=, k($pop60)
 .LBB2_4:                                # %lor.end.1
 	end_block                       # label1:
-	i32.const	$push74=, 0
-	i32.store	g($pop74), $5
+	i32.const	$push68=, 0
+	i32.store	g($pop68), $5
 	i32.const	$5=, 1
 	i32.const	$1=, 1
 	block   	
-	i32.const	$push73=, 0
-	i32.ne  	$push12=, $4, $pop73
-	i32.const	$push72=, 0
-	i32.ne  	$push11=, $3, $pop72
+	i32.const	$push67=, 0
+	i32.ne  	$push12=, $4, $pop67
+	i32.const	$push66=, 0
+	i32.ne  	$push11=, $3, $pop66
 	i32.and 	$push13=, $pop12, $pop11
-	i32.const	$push71=, 1
-	i32.lt_s	$push14=, $2, $pop71
+	i32.const	$push65=, 1
+	i32.lt_s	$push14=, $2, $pop65
 	i32.sub 	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label2
-# BB#5:                                 # %lor.rhs.2
-	i32.const	$push79=, 0
-	i32.store	0($0), $pop79
+# %bb.5:                                # %lor.rhs.2
+	i32.const	$push73=, 0
+	i32.store	0($0), $pop73
 	i32.const	$3=, 1
-	i32.const	$push78=, 0
-	i32.const	$push77=, 1
-	i32.store16	c($pop78), $pop77
-	i32.const	$push76=, 0
-	i32.load	$2=, i($pop76)
-	i32.const	$push75=, 0
-	i32.load	$4=, k($pop75)
+	i32.const	$push72=, 0
+	i32.const	$push71=, 1
+	i32.store16	c($pop72), $pop71
+	i32.const	$push70=, 0
+	i32.load	$2=, i($pop70)
+	i32.const	$push69=, 0
+	i32.load	$4=, k($pop69)
 	i32.const	$1=, 0
 .LBB2_6:                                # %lor.end.2
 	end_block                       # label2:
-	i32.const	$push83=, 0
-	i32.store	g($pop83), $1
+	i32.const	$push77=, 0
+	i32.store	g($pop77), $1
 	block   	
-	i32.const	$push82=, 0
-	i32.ne  	$push17=, $4, $pop82
-	i32.const	$push81=, 0
-	i32.ne  	$push16=, $3, $pop81
+	i32.const	$push76=, 0
+	i32.ne  	$push17=, $4, $pop76
+	i32.const	$push75=, 0
+	i32.ne  	$push16=, $3, $pop75
 	i32.and 	$push18=, $pop17, $pop16
-	i32.const	$push80=, 1
-	i32.lt_s	$push19=, $2, $pop80
+	i32.const	$push74=, 1
+	i32.lt_s	$push19=, $2, $pop74
 	i32.sub 	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label3
-# BB#7:                                 # %lor.rhs.3
+# %bb.7:                                # %lor.rhs.3
 	i32.const	$5=, 0
-	i32.const	$push88=, 0
-	i32.store	0($0), $pop88
+	i32.const	$push82=, 0
+	i32.store	0($0), $pop82
 	i32.const	$3=, 1
-	i32.const	$push87=, 0
-	i32.const	$push86=, 1
-	i32.store16	c($pop87), $pop86
-	i32.const	$push85=, 0
-	i32.load	$2=, i($pop85)
-	i32.const	$push84=, 0
-	i32.load	$4=, k($pop84)
+	i32.const	$push81=, 0
+	i32.const	$push80=, 1
+	i32.store16	c($pop81), $pop80
+	i32.const	$push79=, 0
+	i32.load	$2=, i($pop79)
+	i32.const	$push78=, 0
+	i32.load	$4=, k($pop78)
 .LBB2_8:                                # %lor.end.3
 	end_block                       # label3:
-	i32.const	$push92=, 0
-	i32.store	g($pop92), $5
+	i32.const	$push86=, 0
+	i32.store	g($pop86), $5
 	i32.const	$5=, 1
 	i32.const	$1=, 1
 	block   	
-	i32.const	$push91=, 0
-	i32.ne  	$push22=, $4, $pop91
-	i32.const	$push90=, 0
-	i32.ne  	$push21=, $3, $pop90
+	i32.const	$push85=, 0
+	i32.ne  	$push22=, $4, $pop85
+	i32.const	$push84=, 0
+	i32.ne  	$push21=, $3, $pop84
 	i32.and 	$push23=, $pop22, $pop21
-	i32.const	$push89=, 1
-	i32.lt_s	$push24=, $2, $pop89
+	i32.const	$push83=, 1
+	i32.lt_s	$push24=, $2, $pop83
 	i32.sub 	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label4
-# BB#9:                                 # %lor.rhs.4
-	i32.const	$push97=, 0
-	i32.store	0($0), $pop97
+# %bb.9:                                # %lor.rhs.4
+	i32.const	$push91=, 0
+	i32.store	0($0), $pop91
 	i32.const	$3=, 1
-	i32.const	$push96=, 0
-	i32.const	$push95=, 1
-	i32.store16	c($pop96), $pop95
-	i32.const	$push94=, 0
-	i32.load	$2=, i($pop94)
-	i32.const	$push93=, 0
-	i32.load	$4=, k($pop93)
+	i32.const	$push90=, 0
+	i32.const	$push89=, 1
+	i32.store16	c($pop90), $pop89
+	i32.const	$push88=, 0
+	i32.load	$2=, i($pop88)
+	i32.const	$push87=, 0
+	i32.load	$4=, k($pop87)
 	i32.const	$1=, 0
 .LBB2_10:                               # %lor.end.4
 	end_block                       # label4:
-	i32.const	$push101=, 0
-	i32.store	g($pop101), $1
+	i32.const	$push95=, 0
+	i32.store	g($pop95), $1
 	block   	
-	i32.const	$push100=, 0
-	i32.ne  	$push27=, $4, $pop100
-	i32.const	$push99=, 0
-	i32.ne  	$push26=, $3, $pop99
+	i32.const	$push94=, 0
+	i32.ne  	$push27=, $4, $pop94
+	i32.const	$push93=, 0
+	i32.ne  	$push26=, $3, $pop93
 	i32.and 	$push28=, $pop27, $pop26
-	i32.const	$push98=, 1
-	i32.lt_s	$push29=, $2, $pop98
+	i32.const	$push92=, 1
+	i32.lt_s	$push29=, $2, $pop92
 	i32.sub 	$push30=, $pop28, $pop29
 	br_if   	0, $pop30       # 0: down to label5
-# BB#11:                                # %lor.rhs.5
+# %bb.11:                               # %lor.rhs.5
 	i32.const	$5=, 0
-	i32.const	$push106=, 0
-	i32.store	0($0), $pop106
+	i32.const	$push100=, 0
+	i32.store	0($0), $pop100
 	i32.const	$3=, 1
-	i32.const	$push105=, 0
-	i32.const	$push104=, 1
-	i32.store16	c($pop105), $pop104
-	i32.const	$push103=, 0
-	i32.load	$2=, i($pop103)
-	i32.const	$push102=, 0
-	i32.load	$4=, k($pop102)
+	i32.const	$push99=, 0
+	i32.const	$push98=, 1
+	i32.store16	c($pop99), $pop98
+	i32.const	$push97=, 0
+	i32.load	$2=, i($pop97)
+	i32.const	$push96=, 0
+	i32.load	$4=, k($pop96)
 .LBB2_12:                               # %lor.end.5
 	end_block                       # label5:
-	i32.const	$push110=, 0
-	i32.store	g($pop110), $5
+	i32.const	$push104=, 0
+	i32.store	g($pop104), $5
 	i32.const	$5=, 1
 	i32.const	$1=, 1
 	block   	
-	i32.const	$push109=, 0
-	i32.ne  	$push32=, $4, $pop109
-	i32.const	$push108=, 0
-	i32.ne  	$push31=, $3, $pop108
+	i32.const	$push103=, 0
+	i32.ne  	$push32=, $4, $pop103
+	i32.const	$push102=, 0
+	i32.ne  	$push31=, $3, $pop102
 	i32.and 	$push33=, $pop32, $pop31
-	i32.const	$push107=, 1
-	i32.lt_s	$push34=, $2, $pop107
+	i32.const	$push101=, 1
+	i32.lt_s	$push34=, $2, $pop101
 	i32.sub 	$push35=, $pop33, $pop34
 	br_if   	0, $pop35       # 0: down to label6
-# BB#13:                                # %lor.rhs.6
-	i32.const	$push115=, 0
-	i32.store	0($0), $pop115
+# %bb.13:                               # %lor.rhs.6
+	i32.const	$push109=, 0
+	i32.store	0($0), $pop109
 	i32.const	$3=, 1
-	i32.const	$push114=, 0
-	i32.const	$push113=, 1
-	i32.store16	c($pop114), $pop113
-	i32.const	$push112=, 0
-	i32.load	$2=, i($pop112)
-	i32.const	$push111=, 0
-	i32.load	$4=, k($pop111)
+	i32.const	$push108=, 0
+	i32.const	$push107=, 1
+	i32.store16	c($pop108), $pop107
+	i32.const	$push106=, 0
+	i32.load	$2=, i($pop106)
+	i32.const	$push105=, 0
+	i32.load	$4=, k($pop105)
 	i32.const	$1=, 0
 .LBB2_14:                               # %lor.end.6
 	end_block                       # label6:
-	i32.const	$push122=, 0
-	i32.store	g($pop122), $1
-	i32.const	$push121=, 0
-	i32.load	$1=, a($pop121)
+	i32.const	$push114=, 0
+	i32.store	g($pop114), $1
+	i32.const	$push113=, 0
+	i32.ne  	$push37=, $4, $pop113
+	i32.const	$push112=, 0
+	i32.ne  	$push36=, $3, $pop112
+	i32.and 	$3=, $pop37, $pop36
+	i32.const	$push111=, 0
+	i32.load	$4=, a($pop111)
 	block   	
-	i32.const	$push120=, 0
-	i32.ne  	$push37=, $4, $pop120
-	i32.const	$push119=, 0
-	i32.ne  	$push36=, $3, $pop119
-	i32.and 	$push118=, $pop37, $pop36
-	tee_local	$push117=, $4=, $pop118
-	i32.const	$push116=, 1
-	i32.lt_s	$push38=, $2, $pop116
-	i32.sub 	$push39=, $pop117, $pop38
+	i32.const	$push110=, 1
+	i32.lt_s	$push38=, $2, $pop110
+	i32.sub 	$push39=, $3, $pop38
 	br_if   	0, $pop39       # 0: down to label7
-# BB#15:                                # %lor.rhs.7
+# %bb.15:                               # %lor.rhs.7
 	i32.const	$5=, 0
-	i32.const	$push124=, 0
-	i32.store	0($0), $pop124
-	i32.const	$push123=, 0
+	i32.const	$push116=, 0
+	i32.store	0($0), $pop116
+	i32.const	$push115=, 0
 	i32.const	$push40=, 1
-	i32.store16	c($pop123), $pop40
+	i32.store16	c($pop115), $pop40
 .LBB2_16:                               # %lor.end.7
 	end_block                       # label7:
 	i32.const	$push41=, 0
-	i32.store16	h($pop41), $1
-	i32.const	$push128=, 0
-	i32.store	g($pop128), $5
-	i32.const	$push127=, 0
-	i32.store8	e($pop127), $4
-	i32.const	$push126=, 0
+	i32.store16	h($pop41), $4
+	i32.const	$push120=, 0
+	i32.store	g($pop120), $5
+	i32.const	$push119=, 0
+	i32.store8	e($pop119), $3
+	i32.const	$push118=, 0
 	i32.const	$push42=, 226
-	i32.store8	b($pop126), $pop42
+	i32.store8	b($pop118), $pop42
 	i32.call	$drop=, getpid@FUNCTION
-	i32.const	$push125=, 0
-                                        # fallthrough-return: $pop125
+	i32.const	$push117=, 0
+                                        # fallthrough-return: $pop117
 	.endfunc
 .Lfunc_end2:
 	.size	main, .Lfunc_end2-main
@@ -368,5 +364,5 @@ g:
 	.size	g, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	getpid, i32
diff --git a/test/torture-s/pr58431.c.s b/test/torture-s/pr58431.c.s
index 80254f5ed..1fdb23ecc 100644
--- a/test/torture-s/pr58431.c.s
+++ b/test/torture-s/pr58431.c.s
@@ -7,19 +7,18 @@
 main:                                   # @main
 	.result 	i32
 	.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
+# %bb.0:                                # %entry
 	i32.const	$push23=, 0
 	i32.const	$push22=, 0
-	i32.load16_u	$push1=, i($pop22)
-	i32.const	$push21=, 1
-	i32.xor 	$push20=, $pop1, $pop21
-	tee_local	$push19=, $1=, $pop20
-	i32.store16	i($pop23), $pop19
+	i32.load	$push0=, k($pop22)
+	i32.store	g($pop23), $pop0
+	i32.const	$2=, 1
+	i32.const	$push21=, 0
+	i32.load16_u	$push1=, i($pop21)
+	i32.const	$push20=, 1
+	i32.xor 	$1=, $pop1, $pop20
+	i32.const	$push19=, 0
+	i32.store16	i($pop19), $1
 	i32.const	$push18=, 0
 	i32.const	$push17=, 0
 	i32.store	b($pop18), $pop17
@@ -33,60 +32,60 @@ main:                                   # @main
 	i32.const	$push14=, 0
 	i32.load	$push4=, j($pop14)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %lor.rhs
-	i32.const	$push27=, 0
-	i32.load	$push5=, c($pop27)
-	i32.const	$push26=, 0
-	i32.ne  	$2=, $pop5, $pop26
+# %bb.1:                                # %lor.rhs
+	i32.const	$push25=, 0
+	i32.load	$push5=, c($pop25)
+	i32.const	$push24=, 0
+	i32.ne  	$2=, $pop5, $pop24
 .LBB0_2:                                # %lor.end
 	end_block                       # label0:
-	i32.const	$push28=, 0
-	i32.store	j($pop28), $2
+	i32.const	$push26=, 0
+	i32.store	j($pop26), $2
 	block   	
 	block   	
 	i32.eq  	$push6=, $1, $0
 	br_if   	0, $pop6        # 0: down to label2
-# BB#3:                                 # %if.then
+# %bb.3:                                # %if.then
 	block   	
-	i32.const	$push30=, 0
-	i32.load	$push7=, d($pop30)
-	i32.const	$push29=, 0
-	i32.gt_s	$push8=, $pop7, $pop29
+	i32.const	$push28=, 0
+	i32.load	$push7=, d($pop28)
+	i32.const	$push27=, 0
+	i32.gt_s	$push8=, $pop7, $pop27
 	br_if   	0, $pop8        # 0: down to label3
-# BB#4:                                 # %for.inc.lr.ph
-	i32.const	$push31=, 0
+# %bb.4:                                # %for.inc.lr.ph
+	i32.const	$push29=, 0
 	i32.const	$push9=, 1
-	i32.store	d($pop31), $pop9
+	i32.store	d($pop29), $pop9
 .LBB0_5:                                # %if.end
 	end_block                       # label3:
-	i32.const	$push33=, 0
+	i32.const	$push31=, 0
 	i32.const	$push10=, 1
-	i32.store	b($pop33), $pop10
-	i32.const	$push32=, 0
-	i32.load8_u	$push11=, h($pop32)
+	i32.store	b($pop31), $pop10
+	i32.const	$push30=, 0
+	i32.load8_u	$push11=, h($pop30)
 	br_if   	1, $pop11       # 1: down to label1
-# BB#6:                                 # %if.end27
+# %bb.6:                                # %if.end27
 	i32.const	$push12=, 0
 	return  	$pop12
 .LBB0_7:                                # %if.else
 	end_block                       # label2:
-	i32.const	$push36=, 0
-	i32.const	$push35=, 1
-	i32.store8	h($pop36), $pop35
-	block   	
 	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
-	i32.store	e($pop38), $pop37
+	i32.const	$push33=, 1
+	i32.store8	h($pop34), $pop33
+	block   	
+	i32.const	$push32=, 0
+	i32.load	$push13=, e($pop32)
+	i32.eqz 	$push39=, $pop13
+	br_if   	0, $pop39       # 0: down to label4
+# %bb.8:                                # %for.inc17.lr.ph
+	i32.const	$push36=, 0
+	i32.const	$push35=, 0
+	i32.store	e($pop36), $pop35
 .LBB0_9:                                # %if.end.thread
 	end_block                       # label4:
-	i32.const	$push40=, 0
-	i32.const	$push39=, 1
-	i32.store	b($pop40), $pop39
+	i32.const	$push38=, 0
+	i32.const	$push37=, 1
+	i32.store	b($pop38), $pop37
 .LBB0_10:                               # %if.then26
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -184,5 +183,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58564.c.s b/test/torture-s/pr58564.c.s
index 9956e0b66..c63a5aa65 100644
--- a/test/torture-s/pr58564.c.s
+++ b/test/torture-s/pr58564.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push2=, 0
 	i32.store	b($pop0), $pop2
@@ -53,4 +53,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr58570.c.s b/test/torture-s/pr58570.c.s
index da1879140..90f5dcf7a 100644
--- a/test/torture-s/pr58570.c.s
+++ b/test/torture-s/pr58570.c.s
@@ -7,36 +7,34 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push25=, 0
 	i32.load	$push0=, e($pop25)
-	i32.eqz 	$push33=, $pop0
-	br_if   	0, $pop33       # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push30=, 0
-	i32.load	$push1=, i($pop30)
+	i32.eqz 	$push29=, $pop0
+	br_if   	0, $pop29       # 0: down to label0
+# %bb.1:                                # %if.then
+	i32.const	$push26=, 0
+	i32.load	$push1=, i($pop26)
 	i32.const	$push2=, 6
 	i32.mul 	$push3=, $pop1, $pop2
 	i32.const	$push4=, d
-	i32.add 	$push29=, $pop3, $pop4
-	tee_local	$push28=, $0=, $pop29
+	i32.add 	$0=, $pop3, $pop4
 	i64.const	$push5=, 32769
-	i64.store32	0($pop28):p2align=1, $pop5
+	i64.store32	0($0):p2align=1, $pop5
 	i32.const	$push6=, 4
-	i32.add 	$push27=, $0, $pop6
-	tee_local	$push26=, $0=, $pop27
+	i32.add 	$0=, $0, $pop6
 	i64.load16_u	$push7=, 0($0)
 	i64.const	$push8=, 61440
 	i64.and 	$push9=, $pop7, $pop8
-	i64.store16	0($pop26), $pop9
+	i64.store16	0($0), $pop9
 .LBB0_2:                                # %if.end
 	end_block                       # label0:
 	block   	
-	i32.const	$push32=, 0
-	i64.load32_u	$push13=, d($pop32)
-	i32.const	$push31=, 0
-	i64.load16_u	$push10=, d+4($pop31)
+	i32.const	$push28=, 0
+	i64.load32_u	$push13=, d($pop28)
+	i32.const	$push27=, 0
+	i64.load16_u	$push10=, d+4($pop27)
 	i64.const	$push11=, 32
 	i64.shl 	$push12=, $pop10, $pop11
 	i64.or  	$push14=, $pop13, $pop12
@@ -50,7 +48,7 @@ main:                                   # @main
 	i32.const	$push22=, 1
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label1
-# BB#3:                                 # %if.end7
+# %bb.3:                                # %if.end7
 	i32.const	$push24=, 0
 	return  	$pop24
 .LBB0_4:                                # %if.then6
@@ -87,5 +85,5 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58574.c.s b/test/torture-s/pr58574.c.s
index ec431687e..e0a859e49 100644
--- a/test/torture-s/pr58574.c.s
+++ b/test/torture-s/pr58574.c.s
@@ -8,15 +8,27 @@ foo:                                    # @foo
 	.param  	f64
 	.result 	f64
 	.local  	i32, f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	block   	
+	block   	
+	f64.abs 	$push1282=, $0
+	f64.const	$push1283=, 0x1p31
+	f64.lt  	$push1284=, $pop1282, $pop1283
+	br_if   	0, $pop1284     # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label0
+.LBB0_2:                                # %entry
+	end_block                       # label1:
+	i32.trunc_s/f64	$1=, $0
+.LBB0_3:                                # %entry
+	end_block                       # label0:
 	f64.const	$2=, 0x1p0
 	block   	
-	i32.trunc_s/f64	$push1346=, $0
-	tee_local	$push1345=, $1=, $pop1346
 	i32.const	$push0=, 93
-	i32.gt_u	$push1=, $pop1345, $pop0
-	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+	i32.gt_u	$push1=, $1, $pop0
+	br_if   	0, $pop1        # 0: down to label2
+# %bb.4:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -81,77 +93,76 @@ foo:                                    # @foo
 	block   	
 	block   	
 	block   	
-	br_table 	$1, 0, 1, 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, 64, 64, 64, 27, 64, 64, 64, 64, 64, 64, 64, 64, 64, 28, 64, 64, 64, 64, 64, 64, 64, 64, 64, 29, 64, 64, 64, 64, 64, 64, 64, 64, 64, 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, 0 # 0: down to label64
-                                        # 1: down to label63
-                                        # 2: down to label62
-                                        # 3: down to label61
-                                        # 4: down to label60
-                                        # 5: down to label59
-                                        # 6: down to label58
-                                        # 7: down to label57
-                                        # 8: down to label56
-                                        # 9: down to label55
-                                        # 10: down to label54
-                                        # 11: down to label53
-                                        # 12: down to label52
-                                        # 13: down to label51
-                                        # 14: down to label50
-                                        # 15: down to label49
-                                        # 16: down to label48
-                                        # 17: down to label47
-                                        # 18: down to label46
-                                        # 19: down to label45
-                                        # 20: down to label44
-                                        # 21: down to label43
-                                        # 22: down to label42
-                                        # 23: down to label41
-                                        # 24: down to label40
-                                        # 25: down to label39
-                                        # 26: down to label38
-                                        # 64: down to label0
-                                        # 27: down to label37
-                                        # 28: down to label36
-                                        # 29: down to label35
-                                        # 30: down to label34
-                                        # 31: down to label33
-                                        # 32: down to label32
-                                        # 33: down to label31
-                                        # 34: down to label30
-                                        # 35: down to label29
-                                        # 36: down to label28
-                                        # 37: down to label27
-                                        # 38: down to label26
-                                        # 39: down to label25
-                                        # 40: down to label24
-                                        # 41: down to label23
-                                        # 42: down to label22
-                                        # 43: down to label21
-                                        # 44: down to label20
-                                        # 45: down to label19
-                                        # 46: down to label18
-                                        # 47: down to label17
-                                        # 48: down to label16
-                                        # 49: down to label15
-                                        # 50: down to label14
-                                        # 51: down to label13
-                                        # 52: down to label12
-                                        # 53: down to label11
-                                        # 54: down to label10
-                                        # 55: down to label9
-                                        # 56: down to label8
-                                        # 57: down to label7
-                                        # 58: down to label6
-                                        # 59: down to label5
-                                        # 60: down to label4
-                                        # 61: down to label3
-                                        # 62: down to label2
-                                        # 63: down to label1
-.LBB0_2:                                # %sw.bb
-	end_block                       # label64:
+	br_table 	$1, 0, 1, 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, 64, 64, 64, 27, 64, 64, 64, 64, 64, 64, 64, 64, 64, 28, 64, 64, 64, 64, 64, 64, 64, 64, 64, 29, 64, 64, 64, 64, 64, 64, 64, 64, 64, 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, 0 # 0: down to label66
+                                        # 1: down to label65
+                                        # 2: down to label64
+                                        # 3: down to label63
+                                        # 4: down to label62
+                                        # 5: down to label61
+                                        # 6: down to label60
+                                        # 7: down to label59
+                                        # 8: down to label58
+                                        # 9: down to label57
+                                        # 10: down to label56
+                                        # 11: down to label55
+                                        # 12: down to label54
+                                        # 13: down to label53
+                                        # 14: down to label52
+                                        # 15: down to label51
+                                        # 16: down to label50
+                                        # 17: down to label49
+                                        # 18: down to label48
+                                        # 19: down to label47
+                                        # 20: down to label46
+                                        # 21: down to label45
+                                        # 22: down to label44
+                                        # 23: down to label43
+                                        # 24: down to label42
+                                        # 25: down to label41
+                                        # 26: down to label40
+                                        # 64: down to label2
+                                        # 27: down to label39
+                                        # 28: down to label38
+                                        # 29: down to label37
+                                        # 30: down to label36
+                                        # 31: down to label35
+                                        # 32: down to label34
+                                        # 33: down to label33
+                                        # 34: down to label32
+                                        # 35: down to label31
+                                        # 36: down to label30
+                                        # 37: down to label29
+                                        # 38: down to label28
+                                        # 39: down to label27
+                                        # 40: down to label26
+                                        # 41: down to label25
+                                        # 42: down to label24
+                                        # 43: down to label23
+                                        # 44: down to label22
+                                        # 45: down to label21
+                                        # 46: down to label20
+                                        # 47: down to label19
+                                        # 48: down to label18
+                                        # 49: down to label17
+                                        # 50: down to label16
+                                        # 51: down to label15
+                                        # 52: down to label14
+                                        # 53: down to label13
+                                        # 54: down to label12
+                                        # 55: down to label11
+                                        # 56: down to label10
+                                        # 57: down to label9
+                                        # 58: down to label8
+                                        # 59: down to label7
+                                        # 60: down to label6
+                                        # 61: down to label5
+                                        # 62: down to label4
+                                        # 63: down to label3
+.LBB0_5:                                # %sw.bb
+	end_block                       # label66:
 	f64.add 	$push1262=, $0, $0
 	f64.const	$push1263=, -0x1p0
-	f64.add 	$push1348=, $pop1262, $pop1263
-	tee_local	$push1347=, $0=, $pop1348
+	f64.add 	$0=, $pop1262, $pop1263
 	f64.const	$push1264=, 0x1.cac6baec528a3p-50
 	f64.mul 	$push1265=, $0, $pop1264
 	f64.const	$push1266=, 0x1.9f49c634d36c8p-42
@@ -168,16 +179,15 @@ foo:                                    # @foo
 	f64.mul 	$push1277=, $0, $pop1276
 	f64.const	$push1278=, 0x1.7578a807708cbp-11
 	f64.add 	$push1279=, $pop1277, $pop1278
-	f64.mul 	$push1280=, $pop1347, $pop1279
+	f64.mul 	$push1280=, $0, $pop1279
 	f64.const	$push1281=, 0x1.739ad75c47d48p-11
-	f64.add 	$push1344=, $pop1280, $pop1281
-	return  	$pop1344
-.LBB0_3:                                # %sw.bb12
-	end_block                       # label63:
+	f64.add 	$push1347=, $pop1280, $pop1281
+	return  	$pop1347
+.LBB0_6:                                # %sw.bb12
+	end_block                       # label65:
 	f64.add 	$push1242=, $0, $0
 	f64.const	$push1243=, -0x1.8p1
-	f64.add 	$push1350=, $pop1242, $pop1243
-	tee_local	$push1349=, $0=, $pop1350
+	f64.add 	$0=, $pop1242, $pop1243
 	f64.const	$push1244=, 0x1.e62fdf221a945p-50
 	f64.mul 	$push1245=, $0, $pop1244
 	f64.const	$push1246=, 0x1.b56f4407b2b3fp-42
@@ -194,16 +204,15 @@ foo:                                    # @foo
 	f64.mul 	$push1257=, $0, $pop1256
 	f64.const	$push1258=, 0x1.7d157f6e1f426p-11
 	f64.add 	$push1259=, $pop1257, $pop1258
-	f64.mul 	$push1260=, $pop1349, $pop1259
+	f64.mul 	$push1260=, $0, $pop1259
 	f64.const	$push1261=, 0x1.1987908299a2dp-9
-	f64.add 	$push1343=, $pop1260, $pop1261
-	return  	$pop1343
-.LBB0_4:                                # %sw.bb27
-	end_block                       # label62:
+	f64.add 	$push1346=, $pop1260, $pop1261
+	return  	$pop1346
+.LBB0_7:                                # %sw.bb27
+	end_block                       # label64:
 	f64.add 	$push1222=, $0, $0
 	f64.const	$push1223=, -0x1.4p2
-	f64.add 	$push1352=, $pop1222, $pop1223
-	tee_local	$push1351=, $0=, $pop1352
+	f64.add 	$0=, $pop1222, $pop1223
 	f64.const	$push1224=, 0x1.01900ac1a16a7p-49
 	f64.mul 	$push1225=, $0, $pop1224
 	f64.const	$push1226=, 0x1.cce31abf0cfe7p-42
@@ -220,16 +229,15 @@ foo:                                    # @foo
 	f64.mul 	$push1237=, $0, $pop1236
 	f64.const	$push1238=, 0x1.84ed651dbbfdap-11
 	f64.add 	$push1239=, $pop1237, $pop1238
-	f64.mul 	$push1240=, $pop1351, $pop1239
+	f64.mul 	$push1240=, $0, $pop1239
 	f64.const	$push1241=, 0x1.da059a73b42ccp-9
-	f64.add 	$push1342=, $pop1240, $pop1241
-	return  	$pop1342
-.LBB0_5:                                # %sw.bb42
-	end_block                       # label61:
+	f64.add 	$push1345=, $pop1240, $pop1241
+	return  	$pop1345
+.LBB0_8:                                # %sw.bb42
+	end_block                       # label63:
 	f64.add 	$push1202=, $0, $0
 	f64.const	$push1203=, -0x1.cp2
-	f64.add 	$push1354=, $pop1202, $pop1203
-	tee_local	$push1353=, $0=, $pop1354
+	f64.add 	$0=, $pop1202, $pop1203
 	f64.const	$push1204=, 0x1.10f093c3894a7p-49
 	f64.mul 	$push1205=, $0, $pop1204
 	f64.const	$push1206=, 0x1.e5bf3b2ed15bap-42
@@ -246,16 +254,15 @@ foo:                                    # @foo
 	f64.mul 	$push1217=, $0, $pop1216
 	f64.const	$push1218=, 0x1.8d00591646be5p-11
 	f64.add 	$push1219=, $pop1217, $pop1218
-	f64.mul 	$push1220=, $pop1353, $pop1219
+	f64.mul 	$push1220=, $0, $pop1219
 	f64.const	$push1221=, 0x1.4f3e2bb4b9b09p-8
-	f64.add 	$push1341=, $pop1220, $pop1221
-	return  	$pop1341
-.LBB0_6:                                # %sw.bb57
-	end_block                       # label60:
+	f64.add 	$push1344=, $pop1220, $pop1221
+	return  	$pop1344
+.LBB0_9:                                # %sw.bb57
+	end_block                       # label62:
 	f64.add 	$push1182=, $0, $0
 	f64.const	$push1183=, -0x1.2p3
-	f64.add 	$push1356=, $pop1182, $pop1183
-	tee_local	$push1355=, $0=, $pop1356
+	f64.add 	$0=, $pop1182, $pop1183
 	f64.const	$push1184=, 0x1.21535de6eaaa3p-49
 	f64.mul 	$push1185=, $0, $pop1184
 	f64.const	$push1186=, 0x1.000d5a2623093p-41
@@ -272,16 +279,15 @@ foo:                                    # @foo
 	f64.mul 	$push1197=, $0, $pop1196
 	f64.const	$push1198=, 0x1.9553b9bb7810bp-11
 	f64.add 	$push1199=, $pop1197, $pop1198
-	f64.mul 	$push1200=, $pop1355, $pop1199
+	f64.mul 	$push1200=, $0, $pop1199
 	f64.const	$push1201=, 0x1.b3885828b601bp-8
-	f64.add 	$push1340=, $pop1200, $pop1201
-	return  	$pop1340
-.LBB0_7:                                # %sw.bb72
-	end_block                       # label59:
+	f64.add 	$push1343=, $pop1200, $pop1201
+	return  	$pop1343
+.LBB0_10:                               # %sw.bb72
+	end_block                       # label61:
 	f64.add 	$push1162=, $0, $0
 	f64.const	$push1163=, -0x1.6p3
-	f64.add 	$push1358=, $pop1162, $pop1163
-	tee_local	$push1357=, $0=, $pop1358
+	f64.add 	$0=, $pop1162, $pop1163
 	f64.const	$push1164=, 0x1.32bfca1e19775p-49
 	f64.mul 	$push1165=, $0, $pop1164
 	f64.const	$push1166=, 0x1.0e04d99704505p-41
@@ -298,16 +304,15 @@ foo:                                    # @foo
 	f64.mul 	$push1177=, $0, $pop1176
 	f64.const	$push1178=, 0x1.9de7870d4ff4bp-11
 	f64.add 	$push1179=, $pop1177, $pop1178
-	f64.mul 	$push1180=, $pop1357, $pop1179
+	f64.mul 	$push1180=, $0, $pop1179
 	f64.const	$push1181=, 0x1.0cf75f478e341p-7
-	f64.add 	$push1339=, $pop1180, $pop1181
-	return  	$pop1339
-.LBB0_8:                                # %sw.bb87
-	end_block                       # label58:
+	f64.add 	$push1342=, $pop1180, $pop1181
+	return  	$pop1342
+.LBB0_11:                               # %sw.bb87
+	end_block                       # label60:
 	f64.add 	$push1142=, $0, $0
 	f64.const	$push1143=, -0x1.ap3
-	f64.add 	$push1360=, $pop1142, $pop1143
-	tee_local	$push1359=, $0=, $pop1360
+	f64.add 	$0=, $pop1142, $pop1143
 	f64.const	$push1144=, 0x1.454fabb93b71cp-49
 	f64.mul 	$push1145=, $0, $pop1144
 	f64.const	$push1146=, 0x1.1cd31454040b1p-41
@@ -324,16 +329,15 @@ foo:                                    # @foo
 	f64.mul 	$push1157=, $0, $pop1156
 	f64.const	$push1158=, 0x1.a6bfc7d698d37p-11
 	f64.add 	$push1159=, $pop1157, $pop1158
-	f64.mul 	$push1160=, $pop1359, $pop1159
+	f64.mul 	$push1160=, $0, $pop1159
 	f64.const	$push1161=, 0x1.414112efc6ccep-7
-	f64.add 	$push1338=, $pop1160, $pop1161
-	return  	$pop1338
-.LBB0_9:                                # %sw.bb102
-	end_block                       # label57:
+	f64.add 	$push1341=, $pop1160, $pop1161
+	return  	$pop1341
+.LBB0_12:                               # %sw.bb102
+	end_block                       # label59:
 	f64.add 	$push1122=, $0, $0
 	f64.const	$push1123=, -0x1.ep3
-	f64.add 	$push1362=, $pop1122, $pop1123
-	tee_local	$push1361=, $0=, $pop1362
+	f64.add 	$0=, $pop1122, $pop1123
 	f64.const	$push1124=, 0x1.5911c49cf8751p-49
 	f64.mul 	$push1125=, $0, $pop1124
 	f64.const	$push1126=, 0x1.2c89559516ee9p-41
@@ -350,16 +354,15 @@ foo:                                    # @foo
 	f64.mul 	$push1137=, $0, $pop1136
 	f64.const	$push1138=, 0x1.afddd3b040dp-11
 	f64.add 	$push1139=, $pop1137, $pop1138
-	f64.mul 	$push1140=, $pop1361, $pop1139
+	f64.mul 	$push1140=, $0, $pop1139
 	f64.const	$push1141=, 0x1.76a2f48c2e771p-7
-	f64.add 	$push1337=, $pop1140, $pop1141
-	return  	$pop1337
-.LBB0_10:                               # %sw.bb117
-	end_block                       # label56:
+	f64.add 	$push1340=, $pop1140, $pop1141
+	return  	$pop1340
+.LBB0_13:                               # %sw.bb117
+	end_block                       # label58:
 	f64.add 	$push1102=, $0, $0
 	f64.const	$push1103=, -0x1.1p4
-	f64.add 	$push1364=, $pop1102, $pop1103
-	tee_local	$push1363=, $0=, $pop1364
+	f64.add 	$0=, $pop1102, $pop1103
 	f64.const	$push1104=, 0x1.6e18872722536p-49
 	f64.mul 	$push1105=, $0, $pop1104
 	f64.const	$push1106=, 0x1.3d3324d4e01e3p-41
@@ -376,16 +379,15 @@ foo:                                    # @foo
 	f64.mul 	$push1117=, $0, $pop1116
 	f64.const	$push1118=, 0x1.b94708fe00767p-11
 	f64.add 	$push1119=, $pop1117, $pop1118
-	f64.mul 	$push1120=, $pop1363, $pop1119
+	f64.mul 	$push1120=, $0, $pop1119
 	f64.const	$push1121=, 0x1.ad3a604e1e71p-7
-	f64.add 	$push1336=, $pop1120, $pop1121
-	return  	$pop1336
-.LBB0_11:                               # %sw.bb132
-	end_block                       # label55:
+	f64.add 	$push1339=, $pop1120, $pop1121
+	return  	$pop1339
+.LBB0_14:                               # %sw.bb132
+	end_block                       # label57:
 	f64.add 	$push1082=, $0, $0
 	f64.const	$push1083=, -0x1.3p4
-	f64.add 	$push1366=, $pop1082, $pop1083
-	tee_local	$push1365=, $0=, $pop1366
+	f64.add 	$0=, $pop1082, $pop1083
 	f64.const	$push1084=, 0x1.847dc6a7decccp-49
 	f64.mul 	$push1085=, $0, $pop1084
 	f64.const	$push1086=, 0x1.4ee05c5bffeaap-41
@@ -402,16 +404,15 @@ foo:                                    # @foo
 	f64.mul 	$push1097=, $0, $pop1096
 	f64.const	$push1098=, 0x1.c2fb67bfd7c6dp-11
 	f64.add 	$push1099=, $pop1097, $pop1098
-	f64.mul 	$push1100=, $pop1365, $pop1099
+	f64.mul 	$push1100=, $0, $pop1099
 	f64.const	$push1101=, 0x1.e4f765fd8adacp-7
-	f64.add 	$push1335=, $pop1100, $pop1101
-	return  	$pop1335
-.LBB0_12:                               # %sw.bb147
-	end_block                       # label54:
+	f64.add 	$push1338=, $pop1100, $pop1101
+	return  	$pop1338
+.LBB0_15:                               # %sw.bb147
+	end_block                       # label56:
 	f64.add 	$push1062=, $0, $0
 	f64.const	$push1063=, -0x1.5p4
-	f64.add 	$push1368=, $pop1062, $pop1063
-	tee_local	$push1367=, $0=, $pop1368
+	f64.add 	$0=, $pop1062, $pop1063
 	f64.const	$push1064=, 0x1.9c57a5f629aa4p-49
 	f64.mul 	$push1065=, $0, $pop1064
 	f64.const	$push1066=, 0x1.61a5294113d1fp-41
@@ -428,16 +429,15 @@ foo:                                    # @foo
 	f64.mul 	$push1077=, $0, $pop1076
 	f64.const	$push1078=, 0x1.ccfef6c0912a3p-11
 	f64.add 	$push1079=, $pop1077, $pop1078
-	f64.mul 	$push1080=, $pop1367, $pop1079
+	f64.mul 	$push1080=, $0, $pop1079
 	f64.const	$push1081=, 0x1.0efdc9c4da9p-6
-	f64.add 	$push1334=, $pop1080, $pop1081
-	return  	$pop1334
-.LBB0_13:                               # %sw.bb162
-	end_block                       # label53:
+	f64.add 	$push1337=, $pop1080, $pop1081
+	return  	$pop1337
+.LBB0_16:                               # %sw.bb162
+	end_block                       # label55:
 	f64.add 	$push1042=, $0, $0
 	f64.const	$push1043=, -0x1.7p4
-	f64.add 	$push1370=, $pop1042, $pop1043
-	tee_local	$push1369=, $0=, $pop1370
+	f64.add 	$0=, $pop1042, $pop1043
 	f64.const	$push1044=, 0x1.b5bff86228abep-49
 	f64.mul 	$push1045=, $0, $pop1044
 	f64.const	$push1046=, 0x1.758ff4dd67c05p-41
@@ -454,16 +454,15 @@ foo:                                    # @foo
 	f64.mul 	$push1057=, $0, $pop1056
 	f64.const	$push1058=, 0x1.d755bccaf709bp-11
 	f64.add 	$push1059=, $pop1057, $pop1058
-	f64.mul 	$push1060=, $pop1369, $pop1059
+	f64.mul 	$push1060=, $0, $pop1059
 	f64.const	$push1061=, 0x1.2c1f42bb6673p-6
-	f64.add 	$push1333=, $pop1060, $pop1061
-	return  	$pop1333
-.LBB0_14:                               # %sw.bb177
-	end_block                       # label52:
+	f64.add 	$push1336=, $pop1060, $pop1061
+	return  	$pop1336
+.LBB0_17:                               # %sw.bb177
+	end_block                       # label54:
 	f64.add 	$push1022=, $0, $0
 	f64.const	$push1023=, -0x1.9p4
-	f64.add 	$push1372=, $pop1022, $pop1023
-	tee_local	$push1371=, $0=, $pop1372
+	f64.add 	$0=, $pop1022, $pop1023
 	f64.const	$push1024=, 0x1.d0cce0c2d79abp-49
 	f64.mul 	$push1025=, $0, $pop1024
 	f64.const	$push1026=, 0x1.8ab4ec479933cp-41
@@ -480,16 +479,15 @@ foo:                                    # @foo
 	f64.mul 	$push1037=, $0, $pop1036
 	f64.const	$push1038=, 0x1.e2026910e5ab7p-11
 	f64.add 	$push1039=, $pop1037, $pop1038
-	f64.mul 	$push1040=, $pop1371, $pop1039
+	f64.mul 	$push1040=, $0, $pop1039
 	f64.const	$push1041=, 0x1.49e8815e39714p-6
-	f64.add 	$push1332=, $pop1040, $pop1041
-	return  	$pop1332
-.LBB0_15:                               # %sw.bb192
-	end_block                       # label51:
+	f64.add 	$push1335=, $pop1040, $pop1041
+	return  	$pop1335
+.LBB0_18:                               # %sw.bb192
+	end_block                       # label53:
 	f64.add 	$push1002=, $0, $0
 	f64.const	$push1003=, -0x1.bp4
-	f64.add 	$push1374=, $pop1002, $pop1003
-	tee_local	$push1373=, $0=, $pop1374
+	f64.add 	$0=, $pop1002, $pop1003
 	f64.const	$push1004=, 0x1.ed9be2e1862d9p-49
 	f64.mul 	$push1005=, $0, $pop1004
 	f64.const	$push1006=, 0x1.a129ad859a0ebp-41
@@ -506,16 +504,15 @@ foo:                                    # @foo
 	f64.mul 	$push1017=, $0, $pop1016
 	f64.const	$push1018=, 0x1.ed0a59f6159b7p-11
 	f64.add 	$push1019=, $pop1017, $pop1018
-	f64.mul 	$push1020=, $pop1373, $pop1019
+	f64.mul 	$push1020=, $0, $pop1019
 	f64.const	$push1021=, 0x1.6861e92923e5cp-6
-	f64.add 	$push1331=, $pop1020, $pop1021
-	return  	$pop1331
-.LBB0_16:                               # %sw.bb207
-	end_block                       # label50:
+	f64.add 	$push1334=, $pop1020, $pop1021
+	return  	$pop1334
+.LBB0_19:                               # %sw.bb207
+	end_block                       # label52:
 	f64.add 	$push982=, $0, $0
 	f64.const	$push983=, -0x1.dp4
-	f64.add 	$push1376=, $pop982, $pop983
-	tee_local	$push1375=, $0=, $pop1376
+	f64.add 	$0=, $pop982, $pop983
 	f64.const	$push984=, 0x1.0627198057091p-48
 	f64.mul 	$push985=, $0, $pop984
 	f64.const	$push986=, 0x1.b903d69d5c337p-41
@@ -532,16 +529,15 @@ foo:                                    # @foo
 	f64.mul 	$push997=, $0, $pop996
 	f64.const	$push998=, 0x1.f86ee71374fcdp-11
 	f64.add 	$push999=, $pop997, $pop998
-	f64.mul 	$push1000=, $pop1375, $pop999
+	f64.mul 	$push1000=, $0, $pop999
 	f64.const	$push1001=, 0x1.878b7a1c25d07p-6
-	f64.add 	$push1330=, $pop1000, $pop1001
-	return  	$pop1330
-.LBB0_17:                               # %sw.bb222
-	end_block                       # label49:
+	f64.add 	$push1333=, $pop1000, $pop1001
+	return  	$pop1333
+.LBB0_20:                               # %sw.bb222
+	end_block                       # label51:
 	f64.add 	$push962=, $0, $0
 	f64.const	$push963=, -0x1.fp4
-	f64.add 	$push1378=, $pop962, $pop963
-	tee_local	$push1377=, $0=, $pop1378
+	f64.add 	$0=, $pop962, $pop963
 	f64.const	$push964=, 0x1.167ed2383a844p-48
 	f64.mul 	$push965=, $0, $pop964
 	f64.const	$push966=, 0x1.d2590594d1848p-41
@@ -558,16 +554,15 @@ foo:                                    # @foo
 	f64.mul 	$push977=, $0, $pop976
 	f64.const	$push978=, 0x1.021ab7665e2dep-10
 	f64.add 	$push979=, $pop977, $pop978
-	f64.mul 	$push980=, $pop1377, $pop979
+	f64.mul 	$push980=, $0, $pop979
 	f64.const	$push981=, 0x1.a771c970f7b9ep-6
-	f64.add 	$push1329=, $pop980, $pop981
-	return  	$pop1329
-.LBB0_18:                               # %sw.bb237
-	end_block                       # label48:
+	f64.add 	$push1332=, $pop980, $pop981
+	return  	$pop1332
+.LBB0_21:                               # %sw.bb237
+	end_block                       # label50:
 	f64.add 	$push942=, $0, $0
 	f64.const	$push943=, -0x1.08p5
-	f64.add 	$push1380=, $pop942, $pop943
-	tee_local	$push1379=, $0=, $pop1380
+	f64.add 	$0=, $pop942, $pop943
 	f64.const	$push944=, 0x1.27e96632d455fp-48
 	f64.mul 	$push945=, $0, $pop944
 	f64.const	$push946=, 0x1.ed449c2f3d75fp-41
@@ -584,16 +579,15 @@ foo:                                    # @foo
 	f64.mul 	$push957=, $0, $pop956
 	f64.const	$push958=, 0x1.08305029e3ff2p-10
 	f64.add 	$push959=, $pop957, $pop958
-	f64.mul 	$push960=, $pop1379, $pop959
+	f64.mul 	$push960=, $0, $pop959
 	f64.const	$push961=, 0x1.c814d72799a2p-6
-	f64.add 	$push1328=, $pop960, $pop961
-	return  	$pop1328
-.LBB0_19:                               # %sw.bb252
-	end_block                       # label47:
+	f64.add 	$push1331=, $pop960, $pop961
+	return  	$pop1331
+.LBB0_22:                               # %sw.bb252
+	end_block                       # label49:
 	f64.add 	$push922=, $0, $0
 	f64.const	$push923=, -0x1.18p5
-	f64.add 	$push1382=, $pop922, $pop923
-	tee_local	$push1381=, $0=, $pop1382
+	f64.add 	$0=, $pop922, $pop923
 	f64.const	$push924=, 0x1.3a73bf18375e2p-48
 	f64.mul 	$push925=, $0, $pop924
 	f64.const	$push926=, 0x1.04ef8d289d598p-40
@@ -610,16 +604,15 @@ foo:                                    # @foo
 	f64.mul 	$push937=, $0, $pop936
 	f64.const	$push938=, 0x1.0e7aed0628383p-10
 	f64.add 	$push939=, $pop937, $pop938
-	f64.mul 	$push940=, $pop1381, $pop939
+	f64.mul 	$push940=, $0, $pop939
 	f64.const	$push941=, 0x1.e9813879c4114p-6
-	f64.add 	$push1327=, $pop940, $pop941
-	return  	$pop1327
-.LBB0_20:                               # %sw.bb267
-	end_block                       # label46:
+	f64.add 	$push1330=, $pop940, $pop941
+	return  	$pop1330
+.LBB0_23:                               # %sw.bb267
+	end_block                       # label48:
 	f64.add 	$push902=, $0, $0
 	f64.const	$push903=, -0x1.28p5
-	f64.add 	$push1384=, $pop902, $pop903
-	tee_local	$push1383=, $0=, $pop1384
+	f64.add 	$0=, $pop902, $pop903
 	f64.const	$push904=, 0x1.4e35d7fbf4617p-48
 	f64.mul 	$push905=, $0, $pop904
 	f64.const	$push906=, 0x1.1421f0df0657fp-40
@@ -636,16 +629,15 @@ foo:                                    # @foo
 	f64.mul 	$push917=, $0, $pop916
 	f64.const	$push918=, 0x1.14fb39c7a1eaap-10
 	f64.add 	$push919=, $pop917, $pop918
-	f64.mul 	$push920=, $pop1383, $pop919
+	f64.mul 	$push920=, $0, $pop919
 	f64.const	$push921=, 0x1.05db76b3bb83dp-5
-	f64.add 	$push1326=, $pop920, $pop921
-	return  	$pop1326
-.LBB0_21:                               # %sw.bb282
-	end_block                       # label45:
+	f64.add 	$push1329=, $pop920, $pop921
+	return  	$pop1329
+.LBB0_24:                               # %sw.bb282
+	end_block                       # label47:
 	f64.add 	$push882=, $0, $0
 	f64.const	$push883=, -0x1.38p5
-	f64.add 	$push1386=, $pop882, $pop883
-	tee_local	$push1385=, $0=, $pop1386
+	f64.add 	$0=, $pop882, $pop883
 	f64.const	$push884=, 0x1.633e72c2b33b3p-48
 	f64.mul 	$push885=, $0, $pop884
 	f64.const	$push886=, 0x1.24489b0bcfd4cp-40
@@ -662,16 +654,15 @@ foo:                                    # @foo
 	f64.mul 	$push897=, $0, $pop896
 	f64.const	$push898=, 0x1.1bb7ec6af7c5ap-10
 	f64.add 	$push899=, $pop897, $pop898
-	f64.mul 	$push900=, $pop1385, $pop899
+	f64.mul 	$push900=, $0, $pop899
 	f64.const	$push901=, 0x1.176145953586dp-5
-	f64.add 	$push1325=, $pop900, $pop901
-	return  	$pop1325
-.LBB0_22:                               # %sw.bb297
-	end_block                       # label44:
+	f64.add 	$push1328=, $pop900, $pop901
+	return  	$pop1328
+.LBB0_25:                               # %sw.bb297
+	end_block                       # label46:
 	f64.add 	$push862=, $0, $0
 	f64.const	$push863=, -0x1.48p5
-	f64.add 	$push1388=, $pop862, $pop863
-	tee_local	$push1387=, $0=, $pop1388
+	f64.add 	$0=, $pop862, $pop863
 	f64.const	$push864=, 0x1.79a58a8004affp-48
 	f64.mul 	$push865=, $0, $pop864
 	f64.const	$push866=, 0x1.35741e6f4452cp-40
@@ -688,16 +679,15 @@ foo:                                    # @foo
 	f64.mul 	$push877=, $0, $pop876
 	f64.const	$push878=, 0x1.22b104f029c92p-10
 	f64.add 	$push879=, $pop877, $pop878
-	f64.mul 	$push880=, $pop1387, $pop879
+	f64.mul 	$push880=, $0, $pop879
 	f64.const	$push881=, 0x1.295421c044285p-5
-	f64.add 	$push1324=, $pop880, $pop881
-	return  	$pop1324
-.LBB0_23:                               # %sw.bb312
-	end_block                       # label43:
+	f64.add 	$push1327=, $pop880, $pop881
+	return  	$pop1327
+.LBB0_26:                               # %sw.bb312
+	end_block                       # label45:
 	f64.add 	$push842=, $0, $0
 	f64.const	$push843=, -0x1.58p5
-	f64.add 	$push1390=, $pop842, $pop843
-	tee_local	$push1389=, $0=, $pop1390
+	f64.add 	$0=, $pop842, $pop843
 	f64.const	$push844=, 0x1.91831a4779845p-48
 	f64.mul 	$push845=, $0, $pop844
 	f64.const	$push846=, 0x1.47b173735b59fp-40
@@ -714,16 +704,15 @@ foo:                                    # @foo
 	f64.mul 	$push857=, $0, $pop856
 	f64.const	$push858=, 0x1.29e6835737f54p-10
 	f64.add 	$push859=, $pop857, $pop858
-	f64.mul 	$push860=, $pop1389, $pop859
+	f64.mul 	$push860=, $0, $pop859
 	f64.const	$push861=, 0x1.3bb83cf2cf95dp-5
-	f64.add 	$push1323=, $pop860, $pop861
-	return  	$pop1323
-.LBB0_24:                               # %sw.bb327
-	end_block                       # label42:
+	f64.add 	$push1326=, $pop860, $pop861
+	return  	$pop1326
+.LBB0_27:                               # %sw.bb327
+	end_block                       # label44:
 	f64.add 	$push822=, $0, $0
 	f64.const	$push823=, -0x1.68p5
-	f64.add 	$push1392=, $pop822, $pop823
-	tee_local	$push1391=, $0=, $pop1392
+	f64.add 	$0=, $pop822, $pop823
 	f64.const	$push824=, 0x1.aae99476e38a8p-48
 	f64.mul 	$push825=, $0, $pop824
 	f64.const	$push826=, 0x1.5b1d6ccaacc2cp-40
@@ -740,16 +729,15 @@ foo:                                    # @foo
 	f64.mul 	$push837=, $0, $pop836
 	f64.const	$push838=, 0x1.3165d3996fa83p-10
 	f64.add 	$push839=, $pop837, $pop838
-	f64.mul 	$push840=, $pop1391, $pop839
+	f64.mul 	$push840=, $0, $pop839
 	f64.const	$push841=, 0x1.4e93e1c9b413ap-5
-	f64.add 	$push1322=, $pop840, $pop841
-	return  	$pop1322
-.LBB0_25:                               # %sw.bb342
-	end_block                       # label41:
+	f64.add 	$push1325=, $pop840, $pop841
+	return  	$pop1325
+.LBB0_28:                               # %sw.bb342
+	end_block                       # label43:
 	f64.add 	$push802=, $0, $0
 	f64.const	$push803=, -0x1.78p5
-	f64.add 	$push1394=, $pop802, $pop803
-	tee_local	$push1393=, $0=, $pop1394
+	f64.add 	$0=, $pop802, $pop803
 	f64.const	$push804=, 0x1.c5f67cd792795p-48
 	f64.mul 	$push805=, $0, $pop804
 	f64.const	$push806=, 0x1.6fbf3f21de835p-40
@@ -766,16 +754,15 @@ foo:                                    # @foo
 	f64.mul 	$push817=, $0, $pop816
 	f64.const	$push818=, 0x1.392189bd8383bp-10
 	f64.add 	$push819=, $pop817, $pop818
-	f64.mul 	$push820=, $pop1393, $pop819
+	f64.mul 	$push820=, $0, $pop819
 	f64.const	$push821=, 0x1.61e71044f1a1ap-5
-	f64.add 	$push1321=, $pop820, $pop821
-	return  	$pop1321
-.LBB0_26:                               # %sw.bb357
-	end_block                       # label40:
+	f64.add 	$push1324=, $pop820, $pop821
+	return  	$pop1324
+.LBB0_29:                               # %sw.bb357
+	end_block                       # label42:
 	f64.add 	$push782=, $0, $0
 	f64.const	$push783=, -0x1.88p5
-	f64.add 	$push1396=, $pop782, $pop783
-	tee_local	$push1395=, $0=, $pop1396
+	f64.add 	$0=, $pop782, $pop783
 	f64.const	$push784=, 0x1.e2c1ce7d17156p-48
 	f64.mul 	$push785=, $0, $pop784
 	f64.const	$push786=, 0x1.85b3bd2b88744p-40
@@ -792,16 +779,15 @@ foo:                                    # @foo
 	f64.mul 	$push797=, $0, $pop796
 	f64.const	$push798=, 0x1.412711bcc0e61p-10
 	f64.add 	$push799=, $pop797, $pop798
-	f64.mul 	$push800=, $pop1395, $pop799
+	f64.mul 	$push800=, $0, $pop799
 	f64.const	$push801=, 0x1.75ba2be0589adp-5
-	f64.add 	$push1320=, $pop800, $pop801
-	return  	$pop1320
-.LBB0_27:                               # %sw.bb372
-	end_block                       # label39:
+	f64.add 	$push1323=, $pop800, $pop801
+	return  	$pop1323
+.LBB0_30:                               # %sw.bb372
+	end_block                       # label41:
 	f64.add 	$push762=, $0, $0
 	f64.const	$push763=, -0x1.98p5
-	f64.add 	$push1398=, $pop762, $pop763
-	tee_local	$push1397=, $0=, $pop1398
+	f64.add 	$0=, $pop762, $pop763
 	f64.const	$push764=, 0x1.00b39a7a160dp-47
 	f64.mul 	$push765=, $0, $pop764
 	f64.const	$push766=, 0x1.9d095040f681cp-40
@@ -818,16 +804,15 @@ foo:                                    # @foo
 	f64.mul 	$push777=, $0, $pop776
 	f64.const	$push778=, 0x1.497d2193ce7e8p-10
 	f64.add 	$push779=, $pop777, $pop778
-	f64.mul 	$push780=, $pop1397, $pop779
+	f64.mul 	$push780=, $0, $pop779
 	f64.const	$push781=, 0x1.8a0f4d7add15fp-5
-	f64.add 	$push1319=, $pop780, $pop781
-	return  	$pop1319
-.LBB0_28:                               # %sw.bb387
-	end_block                       # label38:
+	f64.add 	$push1322=, $pop780, $pop781
+	return  	$pop1322
+.LBB0_31:                               # %sw.bb387
+	end_block                       # label40:
 	f64.add 	$push742=, $0, $0
 	f64.const	$push743=, -0x1.d8p5
-	f64.add 	$push1400=, $pop742, $pop743
-	tee_local	$push1399=, $0=, $pop1400
+	f64.add 	$0=, $pop742, $pop743
 	f64.const	$push744=, 0x1.4870426dcdb0ep-47
 	f64.mul 	$push745=, $0, $pop744
 	f64.const	$push746=, 0x1.05189fcd8287bp-39
@@ -844,16 +829,15 @@ foo:                                    # @foo
 	f64.mul 	$push757=, $0, $pop756
 	f64.const	$push758=, 0x1.6e01655acdabfp-10
 	f64.add 	$push759=, $pop757, $pop758
-	f64.mul 	$push760=, $pop1399, $pop759
+	f64.mul 	$push760=, $0, $pop759
 	f64.const	$push761=, 0x1.e0e30446b69dbp-5
-	f64.add 	$push1318=, $pop760, $pop761
-	return  	$pop1318
-.LBB0_29:                               # %sw.bb402
-	end_block                       # label37:
+	f64.add 	$push1321=, $pop760, $pop761
+	return  	$pop1321
+.LBB0_32:                               # %sw.bb402
+	end_block                       # label39:
 	f64.add 	$push722=, $0, $0
 	f64.const	$push723=, -0x1.3cp6
-	f64.add 	$push1402=, $pop722, $pop723
-	tee_local	$push1401=, $0=, $pop1402
+	f64.add 	$0=, $pop722, $pop723
 	f64.const	$push724=, 0x1.2ee9801a347abp-46
 	f64.mul 	$push725=, $0, $pop724
 	f64.const	$push726=, 0x1.d9aa84ed5f7f8p-39
@@ -870,16 +854,15 @@ foo:                                    # @foo
 	f64.mul 	$push737=, $0, $pop736
 	f64.const	$push738=, 0x1.e61ead6a30f64p-10
 	f64.add 	$push739=, $pop737, $pop738
-	f64.mul 	$push740=, $pop1401, $pop739
+	f64.mul 	$push740=, $0, $pop739
 	f64.const	$push741=, 0x1.745bf26f1dc51p-4
-	f64.add 	$push1317=, $pop740, $pop741
-	return  	$pop1317
-.LBB0_30:                               # %sw.bb417
-	end_block                       # label36:
+	f64.add 	$push1320=, $pop740, $pop741
+	return  	$pop1320
+.LBB0_33:                               # %sw.bb417
+	end_block                       # label38:
 	f64.add 	$push702=, $0, $0
 	f64.const	$push703=, -0x1.8cp6
-	f64.add 	$push1404=, $pop702, $pop703
-	tee_local	$push1403=, $0=, $pop1404
+	f64.add 	$0=, $pop702, $pop703
 	f64.const	$push704=, 0x1.11ed4c2f43d7ep-45
 	f64.mul 	$push705=, $0, $pop704
 	f64.const	$push706=, 0x1.af109a3630d2ep-38
@@ -896,16 +879,15 @@ foo:                                    # @foo
 	f64.mul 	$push717=, $0, $pop716
 	f64.const	$push718=, 0x1.4de48f6131734p-9
 	f64.add 	$push719=, $pop717, $pop718
-	f64.mul 	$push720=, $pop1403, $pop719
+	f64.mul 	$push720=, $0, $pop719
 	f64.const	$push721=, 0x1.1350092ccf6bep-3
-	f64.add 	$push1316=, $pop720, $pop721
-	return  	$pop1316
-.LBB0_31:                               # %sw.bb432
-	end_block                       # label35:
+	f64.add 	$push1319=, $pop720, $pop721
+	return  	$pop1319
+.LBB0_34:                               # %sw.bb432
+	end_block                       # label37:
 	f64.add 	$push682=, $0, $0
 	f64.const	$push683=, -0x1.dcp6
-	f64.add 	$push1406=, $pop682, $pop683
-	tee_local	$push1405=, $0=, $pop1406
+	f64.add 	$0=, $pop682, $pop683
 	f64.const	$push684=, 0x1.dcc29389c0b3bp-45
 	f64.mul 	$push685=, $0, $pop684
 	f64.const	$push686=, 0x1.83c457cdf69a8p-37
@@ -922,16 +904,15 @@ foo:                                    # @foo
 	f64.mul 	$push697=, $0, $pop696
 	f64.const	$push698=, 0x1.dc57844b53bb7p-9
 	f64.add 	$push699=, $pop697, $pop698
-	f64.mul 	$push700=, $pop1405, $pop699
+	f64.mul 	$push700=, $0, $pop699
 	f64.const	$push701=, 0x1.902de00d1b717p-3
-	f64.add 	$push1315=, $pop700, $pop701
-	return  	$pop1315
-.LBB0_32:                               # %sw.bb447
-	end_block                       # label34:
+	f64.add 	$push1318=, $pop700, $pop701
+	return  	$pop1318
+.LBB0_35:                               # %sw.bb447
+	end_block                       # label36:
 	f64.add 	$push662=, $0, $0
 	f64.const	$push663=, -0x1.e4p6
-	f64.add 	$push1408=, $pop662, $pop663
-	tee_local	$push1407=, $0=, $pop1408
+	f64.add 	$0=, $pop662, $pop663
 	f64.const	$push664=, 0x1.f682fb42899afp-45
 	f64.mul 	$push665=, $0, $pop664
 	f64.const	$push666=, 0x1.9ab5097251322p-37
@@ -948,16 +929,15 @@ foo:                                    # @foo
 	f64.mul 	$push677=, $0, $pop676
 	f64.const	$push678=, 0x1.eea7122820b08p-9
 	f64.add 	$push679=, $pop677, $pop678
-	f64.mul 	$push680=, $pop1407, $pop679
+	f64.mul 	$push680=, $0, $pop679
 	f64.const	$push681=, 0x1.9f5ad96a6a012p-3
-	f64.add 	$push1314=, $pop680, $pop681
-	return  	$pop1314
-.LBB0_33:                               # %sw.bb462
-	end_block                       # label33:
+	f64.add 	$push1317=, $pop680, $pop681
+	return  	$pop1317
+.LBB0_36:                               # %sw.bb462
+	end_block                       # label35:
 	f64.add 	$push642=, $0, $0
 	f64.const	$push643=, -0x1.ecp6
-	f64.add 	$push1410=, $pop642, $pop643
-	tee_local	$push1409=, $0=, $pop1410
+	f64.add 	$0=, $pop642, $pop643
 	f64.const	$push644=, 0x1.08ad32632c073p-44
 	f64.mul 	$push645=, $0, $pop644
 	f64.const	$push646=, 0x1.b2e9fd6fd80ddp-37
@@ -974,16 +954,15 @@ foo:                                    # @foo
 	f64.mul 	$push657=, $0, $pop656
 	f64.const	$push658=, 0x1.00f0c0c7dbcc4p-8
 	f64.add 	$push659=, $pop657, $pop658
-	f64.mul 	$push660=, $pop1409, $pop659
+	f64.mul 	$push660=, $0, $pop659
 	f64.const	$push661=, 0x1.af1a9fbe76c8bp-3
-	f64.add 	$push1313=, $pop660, $pop661
-	return  	$pop1313
-.LBB0_34:                               # %sw.bb477
-	end_block                       # label32:
+	f64.add 	$push1316=, $pop660, $pop661
+	return  	$pop1316
+.LBB0_37:                               # %sw.bb477
+	end_block                       # label34:
 	f64.add 	$push622=, $0, $0
 	f64.const	$push623=, -0x1.f4p6
-	f64.add 	$push1412=, $pop622, $pop623
-	tee_local	$push1411=, $0=, $pop1412
+	f64.add 	$0=, $pop622, $pop623
 	f64.const	$push624=, 0x1.16a6b65650415p-44
 	f64.mul 	$push625=, $0, $pop624
 	f64.const	$push626=, 0x1.cc5a31eebbb9ep-37
@@ -1000,16 +979,15 @@ foo:                                    # @foo
 	f64.mul 	$push637=, $0, $pop636
 	f64.const	$push638=, 0x1.0b0a1f3db2e8fp-8
 	f64.add 	$push639=, $pop637, $pop638
-	f64.mul 	$push640=, $pop1411, $pop639
+	f64.mul 	$push640=, $0, $pop639
 	f64.const	$push641=, 0x1.bf77af640639dp-3
-	f64.add 	$push1312=, $pop640, $pop641
-	return  	$pop1312
-.LBB0_35:                               # %sw.bb492
-	end_block                       # label31:
+	f64.add 	$push1315=, $pop640, $pop641
+	return  	$pop1315
+.LBB0_38:                               # %sw.bb492
+	end_block                       # label33:
 	f64.add 	$push602=, $0, $0
 	f64.const	$push603=, -0x1.fcp6
-	f64.add 	$push1414=, $pop602, $pop603
-	tee_local	$push1413=, $0=, $pop1414
+	f64.add 	$0=, $pop602, $pop603
 	f64.const	$push604=, 0x1.252f30a08e99p-44
 	f64.mul 	$push605=, $0, $pop604
 	f64.const	$push606=, 0x1.e729ae4e3a05p-37
@@ -1026,16 +1004,15 @@ foo:                                    # @foo
 	f64.mul 	$push617=, $0, $pop616
 	f64.const	$push618=, 0x1.15a65a723c5d8p-8
 	f64.add 	$push619=, $pop617, $pop618
-	f64.mul 	$push620=, $pop1413, $pop619
+	f64.mul 	$push620=, $0, $pop619
 	f64.const	$push621=, 0x1.d07c84b5dcc64p-3
-	f64.add 	$push1311=, $pop620, $pop621
-	return  	$pop1311
-.LBB0_36:                               # %sw.bb507
-	end_block                       # label30:
+	f64.add 	$push1314=, $pop620, $pop621
+	return  	$pop1314
+.LBB0_39:                               # %sw.bb507
+	end_block                       # label32:
 	f64.add 	$push582=, $0, $0
 	f64.const	$push583=, -0x1.02p7
-	f64.add 	$push1416=, $pop582, $pop583
-	tee_local	$push1415=, $0=, $pop1416
+	f64.add 	$0=, $pop582, $pop583
 	f64.const	$push584=, 0x1.3448ef8da1489p-44
 	f64.mul 	$push585=, $0, $pop584
 	f64.const	$push586=, 0x1.01ac394729779p-36
@@ -1052,16 +1029,15 @@ foo:                                    # @foo
 	f64.mul 	$push597=, $0, $pop596
 	f64.const	$push598=, 0x1.20cc28621ed91p-8
 	f64.add 	$push599=, $pop597, $pop598
-	f64.mul 	$push600=, $pop1415, $pop599
+	f64.mul 	$push600=, $0, $pop599
 	f64.const	$push601=, 0x1.e2339c0ebedfap-3
-	f64.add 	$push1310=, $pop600, $pop601
-	return  	$pop1310
-.LBB0_37:                               # %sw.bb522
-	end_block                       # label29:
+	f64.add 	$push1313=, $pop600, $pop601
+	return  	$pop1313
+.LBB0_40:                               # %sw.bb522
+	end_block                       # label31:
 	f64.add 	$push562=, $0, $0
 	f64.const	$push563=, -0x1.06p7
-	f64.add 	$push1418=, $pop562, $pop563
-	tee_local	$push1417=, $0=, $pop1418
+	f64.add 	$0=, $pop562, $pop563
 	f64.const	$push564=, 0x1.43f51a43656d1p-44
 	f64.mul 	$push565=, $0, $pop564
 	f64.const	$push566=, 0x1.107c412f52afep-36
@@ -1078,16 +1054,15 @@ foo:                                    # @foo
 	f64.mul 	$push577=, $0, $pop576
 	f64.const	$push578=, 0x1.2c83ec892ab69p-8
 	f64.add 	$push579=, $pop577, $pop578
-	f64.mul 	$push580=, $pop1417, $pop579
+	f64.mul 	$push580=, $0, $pop579
 	f64.const	$push581=, 0x1.f49cf56eac86p-3
-	f64.add 	$push1309=, $pop580, $pop581
-	return  	$pop1309
-.LBB0_38:                               # %sw.bb537
-	end_block                       # label28:
+	f64.add 	$push1312=, $pop580, $pop581
+	return  	$pop1312
+.LBB0_41:                               # %sw.bb537
+	end_block                       # label30:
 	f64.add 	$push542=, $0, $0
 	f64.const	$push543=, -0x1.0ap7
-	f64.add 	$push1420=, $pop542, $pop543
-	tee_local	$push1419=, $0=, $pop1420
+	f64.add 	$0=, $pop542, $pop543
 	f64.const	$push544=, 0x1.5434d7e7b823ap-44
 	f64.mul 	$push545=, $0, $pop544
 	f64.const	$push546=, 0x1.200df0b7681fp-36
@@ -1104,16 +1079,15 @@ foo:                                    # @foo
 	f64.mul 	$push557=, $0, $pop556
 	f64.const	$push558=, 0x1.38d60a633051p-8
 	f64.add 	$push559=, $pop557, $pop558
-	f64.mul 	$push560=, $pop1419, $pop559
+	f64.mul 	$push560=, $0, $pop559
 	f64.const	$push561=, 0x1.03e1869835159p-2
-	f64.add 	$push1308=, $pop560, $pop561
-	return  	$pop1308
-.LBB0_39:                               # %sw.bb552
-	end_block                       # label27:
+	f64.add 	$push1311=, $pop560, $pop561
+	return  	$pop1311
+.LBB0_42:                               # %sw.bb552
+	end_block                       # label29:
 	f64.add 	$push522=, $0, $0
 	f64.const	$push523=, -0x1.0ep7
-	f64.add 	$push1422=, $pop522, $pop523
-	tee_local	$push1421=, $0=, $pop1422
+	f64.add 	$0=, $pop522, $pop523
 	f64.const	$push524=, 0x1.65094fa076898p-44
 	f64.mul 	$push525=, $0, $pop524
 	f64.const	$push526=, 0x1.3065c8cb517eep-36
@@ -1130,16 +1104,15 @@ foo:                                    # @foo
 	f64.mul 	$push537=, $0, $pop536
 	f64.const	$push538=, 0x1.45cc92eb29af2p-8
 	f64.add 	$push539=, $pop537, $pop538
-	f64.mul 	$push540=, $pop1421, $pop539
+	f64.mul 	$push540=, $0, $pop539
 	f64.const	$push541=, 0x1.0ddd6e04c0592p-2
-	f64.add 	$push1307=, $pop540, $pop541
-	return  	$pop1307
-.LBB0_40:                               # %sw.bb567
-	end_block                       # label26:
+	f64.add 	$push1310=, $pop540, $pop541
+	return  	$pop1310
+.LBB0_43:                               # %sw.bb567
+	end_block                       # label28:
 	f64.add 	$push502=, $0, $0
 	f64.const	$push503=, -0x1.12p7
-	f64.add 	$push1424=, $pop502, $pop503
-	tee_local	$push1423=, $0=, $pop1424
+	f64.add 	$0=, $pop502, $pop503
 	f64.const	$push504=, 0x1.7672816da09eap-44
 	f64.mul 	$push505=, $0, $pop504
 	f64.const	$push506=, 0x1.41884a56f6894p-36
@@ -1156,16 +1129,15 @@ foo:                                    # @foo
 	f64.mul 	$push517=, $0, $pop516
 	f64.const	$push518=, 0x1.536e3c1dbd803p-8
 	f64.add 	$push519=, $pop517, $pop518
-	f64.mul 	$push520=, $pop1423, $pop519
+	f64.mul 	$push520=, $0, $pop519
 	f64.const	$push521=, 0x1.184230fcf80dcp-2
-	f64.add 	$push1306=, $pop520, $pop521
-	return  	$pop1306
-.LBB0_41:                               # %sw.bb582
-	end_block                       # label25:
+	f64.add 	$push1309=, $pop520, $pop521
+	return  	$pop1309
+.LBB0_44:                               # %sw.bb582
+	end_block                       # label27:
 	f64.add 	$push482=, $0, $0
 	f64.const	$push483=, -0x1.16p7
-	f64.add 	$push1426=, $pop482, $pop483
-	tee_local	$push1425=, $0=, $pop1426
+	f64.add 	$0=, $pop482, $pop483
 	f64.const	$push484=, 0x1.88706d4f3663p-44
 	f64.mul 	$push485=, $0, $pop484
 	f64.const	$push486=, 0x1.5382f81e0e6bap-36
@@ -1182,16 +1154,15 @@ foo:                                    # @foo
 	f64.mul 	$push497=, $0, $pop496
 	f64.const	$push498=, 0x1.61c871f439226p-8
 	f64.add 	$push499=, $pop497, $pop498
-	f64.mul 	$push500=, $pop1425, $pop499
+	f64.mul 	$push500=, $0, $pop499
 	f64.const	$push501=, 0x1.23150dae3e6c5p-2
-	f64.add 	$push1305=, $pop500, $pop501
-	return  	$pop1305
-.LBB0_42:                               # %sw.bb597
-	end_block                       # label24:
+	f64.add 	$push1308=, $pop500, $pop501
+	return  	$pop1308
+.LBB0_45:                               # %sw.bb597
+	end_block                       # label26:
 	f64.add 	$push462=, $0, $0
 	f64.const	$push463=, -0x1.1ap7
-	f64.add 	$push1428=, $pop462, $pop463
-	tee_local	$push1427=, $0=, $pop1428
+	f64.add 	$0=, $pop462, $pop463
 	f64.const	$push464=, 0x1.9b01ec1f5ab98p-44
 	f64.mul 	$push465=, $0, $pop464
 	f64.const	$push466=, 0x1.6655d22099262p-36
@@ -1208,16 +1179,15 @@ foo:                                    # @foo
 	f64.mul 	$push477=, $0, $pop476
 	f64.const	$push478=, 0x1.70e397ea6cf0cp-8
 	f64.add 	$push479=, $pop477, $pop478
-	f64.mul 	$push480=, $pop1427, $pop479
+	f64.mul 	$push480=, $0, $pop479
 	f64.const	$push481=, 0x1.2e60807357e67p-2
-	f64.add 	$push1304=, $pop480, $pop481
-	return  	$pop1304
-.LBB0_43:                               # %sw.bb612
-	end_block                       # label23:
+	f64.add 	$push1307=, $pop480, $pop481
+	return  	$pop1307
+.LBB0_46:                               # %sw.bb612
+	end_block                       # label25:
 	f64.add 	$push442=, $0, $0
 	f64.const	$push443=, -0x1.1ep7
-	f64.add 	$push1430=, $pop442, $pop443
-	tee_local	$push1429=, $0=, $pop1430
+	f64.add 	$0=, $pop442, $pop443
 	f64.const	$push444=, 0x1.ae26fdde0da22p-44
 	f64.mul 	$push445=, $0, $pop444
 	f64.const	$push446=, 0x1.7a0e5b224de62p-36
@@ -1234,16 +1204,15 @@ foo:                                    # @foo
 	f64.mul 	$push457=, $0, $pop456
 	f64.const	$push458=, 0x1.80c9befb52f21p-8
 	f64.add 	$push459=, $pop457, $pop458
-	f64.mul 	$push460=, $pop1429, $pop459
+	f64.mul 	$push460=, $0, $pop459
 	f64.const	$push461=, 0x1.3a272862f598ap-2
-	f64.add 	$push1303=, $pop460, $pop461
-	return  	$pop1303
-.LBB0_44:                               # %sw.bb627
-	end_block                       # label22:
+	f64.add 	$push1306=, $pop460, $pop461
+	return  	$pop1306
+.LBB0_47:                               # %sw.bb627
+	end_block                       # label24:
 	f64.add 	$push422=, $0, $0
 	f64.const	$push423=, -0x1.22p7
-	f64.add 	$push1432=, $pop422, $pop423
-	tee_local	$push1431=, $0=, $pop1432
+	f64.add 	$0=, $pop422, $pop423
 	f64.const	$push424=, 0x1.c1de7b6571ffbp-44
 	f64.mul 	$push425=, $0, $pop424
 	f64.const	$push426=, 0x1.8eac93232cabap-36
@@ -1260,16 +1229,15 @@ foo:                                    # @foo
 	f64.mul 	$push437=, $0, $pop436
 	f64.const	$push438=, 0x1.918a009f62307p-8
 	f64.add 	$push439=, $pop437, $pop438
-	f64.mul 	$push440=, $pop1431, $pop439
+	f64.mul 	$push440=, $0, $pop439
 	f64.const	$push441=, 0x1.466e43aa79bbbp-2
-	f64.add 	$push1302=, $pop440, $pop441
-	return  	$pop1302
-.LBB0_45:                               # %sw.bb642
-	end_block                       # label21:
+	f64.add 	$push1305=, $pop440, $pop441
+	return  	$pop1305
+.LBB0_48:                               # %sw.bb642
+	end_block                       # label23:
 	f64.add 	$push402=, $0, $0
 	f64.const	$push403=, -0x1.26p7
-	f64.add 	$push1434=, $pop402, $pop403
-	tee_local	$push1433=, $0=, $pop1434
+	f64.add 	$0=, $pop402, $pop403
 	f64.const	$push404=, 0x1.d62179d259236p-44
 	f64.mul 	$push405=, $0, $pop404
 	f64.const	$push406=, 0x1.a43dfce6eca43p-36
@@ -1286,16 +1254,15 @@ foo:                                    # @foo
 	f64.mul 	$push417=, $0, $pop416
 	f64.const	$push418=, 0x1.a32e6dd194b2bp-8
 	f64.add 	$push419=, $pop417, $pop418
-	f64.mul 	$push420=, $pop1433, $pop419
+	f64.mul 	$push420=, $0, $pop419
 	f64.const	$push421=, 0x1.53404ea4a8c15p-2
-	f64.add 	$push1301=, $pop420, $pop421
-	return  	$pop1301
-.LBB0_46:                               # %sw.bb657
-	end_block                       # label20:
+	f64.add 	$push1304=, $pop420, $pop421
+	return  	$pop1304
+.LBB0_49:                               # %sw.bb657
+	end_block                       # label22:
 	f64.add 	$push382=, $0, $0
 	f64.const	$push383=, -0x1.2ap7
-	f64.add 	$push1436=, $pop382, $pop383
-	tee_local	$push1435=, $0=, $pop1436
+	f64.add 	$0=, $pop382, $pop383
 	f64.const	$push384=, 0x1.eaeff924c30d3p-44
 	f64.mul 	$push385=, $0, $pop384
 	f64.const	$push386=, 0x1.bac2986d8dcfdp-36
@@ -1312,16 +1279,15 @@ foo:                                    # @foo
 	f64.mul 	$push397=, $0, $pop396
 	f64.const	$push398=, 0x1.b5c4728b37d7p-8
 	f64.add 	$push399=, $pop397, $pop398
-	f64.mul 	$push400=, $pop1435, $pop399
+	f64.mul 	$push400=, $0, $pop399
 	f64.const	$push401=, 0x1.60a5269595feep-2
-	f64.add 	$push1300=, $pop400, $pop401
-	return  	$pop1300
-.LBB0_47:                               # %sw.bb672
-	end_block                       # label19:
+	f64.add 	$push1303=, $pop400, $pop401
+	return  	$pop1303
+.LBB0_50:                               # %sw.bb672
+	end_block                       # label21:
 	f64.add 	$push362=, $0, $0
 	f64.const	$push363=, -0x1.2ep7
-	f64.add 	$push1438=, $pop362, $pop363
-	tee_local	$push1437=, $0=, $pop1438
+	f64.add 	$0=, $pop362, $pop363
 	f64.const	$push364=, 0x1.002a2cd8bae1cp-43
 	f64.mul 	$push365=, $0, $pop364
 	f64.const	$push366=, 0x1.d247e87ac75bfp-36
@@ -1338,16 +1304,15 @@ foo:                                    # @foo
 	f64.mul 	$push377=, $0, $pop376
 	f64.const	$push378=, 0x1.c95b2844c2a7bp-8
 	f64.add 	$push379=, $pop377, $pop378
-	f64.mul 	$push380=, $pop1437, $pop379
+	f64.mul 	$push380=, $0, $pop379
 	f64.const	$push381=, 0x1.6e9f6a93f290bp-2
-	f64.add 	$push1299=, $pop380, $pop381
-	return  	$pop1299
-.LBB0_48:                               # %sw.bb687
-	end_block                       # label18:
+	f64.add 	$push1302=, $pop380, $pop381
+	return  	$pop1302
+.LBB0_51:                               # %sw.bb687
+	end_block                       # label20:
 	f64.add 	$push342=, $0, $0
 	f64.const	$push343=, -0x1.32p7
-	f64.add 	$push1440=, $pop342, $pop343
-	tee_local	$push1439=, $0=, $pop1440
+	f64.add 	$0=, $pop342, $pop343
 	f64.const	$push344=, 0x1.0b1bc641957fap-43
 	f64.mul 	$push345=, $0, $pop344
 	f64.const	$push346=, 0x1.eacded0e9948ap-36
@@ -1364,16 +1329,15 @@ foo:                                    # @foo
 	f64.mul 	$push357=, $0, $pop356
 	f64.const	$push358=, 0x1.de01a876ac2ecp-8
 	f64.add 	$push359=, $pop357, $pop358
-	f64.mul 	$push360=, $pop1439, $pop359
+	f64.mul 	$push360=, $0, $pop359
 	f64.const	$push361=, 0x1.7d3c36113404fp-2
-	f64.add 	$push1298=, $pop360, $pop361
-	return  	$pop1298
-.LBB0_49:                               # %sw.bb702
-	end_block                       # label17:
+	f64.add 	$push1301=, $pop360, $pop361
+	return  	$pop1301
+.LBB0_52:                               # %sw.bb702
+	end_block                       # label19:
 	f64.add 	$push322=, $0, $0
 	f64.const	$push323=, -0x1.36p7
-	f64.add 	$push1442=, $pop322, $pop323
-	tee_local	$push1441=, $0=, $pop1442
+	f64.add 	$0=, $pop322, $pop323
 	f64.const	$push324=, 0x1.16528c8a42f2p-43
 	f64.mul 	$push325=, $0, $pop324
 	f64.const	$push326=, 0x1.022ed4006984cp-35
@@ -1390,16 +1354,15 @@ foo:                                    # @foo
 	f64.mul 	$push337=, $0, $pop336
 	f64.const	$push338=, 0x1.f3c70c996b767p-8
 	f64.add 	$push339=, $pop337, $pop338
-	f64.mul 	$push340=, $pop1441, $pop339
+	f64.mul 	$push340=, $0, $pop339
 	f64.const	$push341=, 0x1.8c8366516db0ep-2
-	f64.add 	$push1297=, $pop340, $pop341
-	return  	$pop1297
-.LBB0_50:                               # %sw.bb717
-	end_block                       # label16:
+	f64.add 	$push1300=, $pop340, $pop341
+	return  	$pop1300
+.LBB0_53:                               # %sw.bb717
+	end_block                       # label18:
 	f64.add 	$push302=, $0, $0
 	f64.const	$push303=, -0x1.3ap7
-	f64.add 	$push1444=, $pop302, $pop303
-	tee_local	$push1443=, $0=, $pop1444
+	f64.add 	$0=, $pop302, $pop303
 	f64.const	$push304=, 0x1.21c2f83820157p-43
 	f64.mul 	$push305=, $0, $pop304
 	f64.const	$push306=, 0x1.0f800d94a2092p-35
@@ -1416,16 +1379,15 @@ foo:                                    # @foo
 	f64.mul 	$push317=, $0, $pop316
 	f64.const	$push318=, 0x1.055d3712bbc46p-7
 	f64.add 	$push319=, $pop317, $pop318
-	f64.mul 	$push320=, $pop1443, $pop319
+	f64.mul 	$push320=, $0, $pop319
 	f64.const	$push321=, 0x1.9c7cd898b2e9dp-2
-	f64.add 	$push1296=, $pop320, $pop321
-	return  	$pop1296
-.LBB0_51:                               # %sw.bb732
-	end_block                       # label15:
+	f64.add 	$push1299=, $pop320, $pop321
+	return  	$pop1299
+.LBB0_54:                               # %sw.bb732
+	end_block                       # label17:
 	f64.add 	$push282=, $0, $0
 	f64.const	$push283=, -0x1.3ep7
-	f64.add 	$push1446=, $pop282, $pop283
-	tee_local	$push1445=, $0=, $pop1446
+	f64.add 	$0=, $pop282, $pop283
 	f64.const	$push284=, 0x1.2d72cd087e7bbp-43
 	f64.mul 	$push285=, $0, $pop284
 	f64.const	$push286=, 0x1.1d5aa343f6318p-35
@@ -1442,16 +1404,15 @@ foo:                                    # @foo
 	f64.mul 	$push297=, $0, $pop296
 	f64.const	$push298=, 0x1.1177f7886239bp-7
 	f64.add 	$push299=, $pop297, $pop298
-	f64.mul 	$push300=, $pop1445, $pop299
+	f64.mul 	$push300=, $0, $pop299
 	f64.const	$push301=, 0x1.ad330941c8217p-2
-	f64.add 	$push1295=, $pop300, $pop301
-	return  	$pop1295
-.LBB0_52:                               # %sw.bb747
-	end_block                       # label14:
+	f64.add 	$push1298=, $pop300, $pop301
+	return  	$pop1298
+.LBB0_55:                               # %sw.bb747
+	end_block                       # label16:
 	f64.add 	$push262=, $0, $0
 	f64.const	$push263=, -0x1.42p7
-	f64.add 	$push1448=, $pop262, $pop263
-	tee_local	$push1447=, $0=, $pop1448
+	f64.add 	$0=, $pop262, $pop263
 	f64.const	$push264=, 0x1.39620afb5e24cp-43
 	f64.mul 	$push265=, $0, $pop264
 	f64.const	$push266=, 0x1.2bc315fa4db79p-35
@@ -1468,16 +1429,15 @@ foo:                                    # @foo
 	f64.mul 	$push277=, $0, $pop276
 	f64.const	$push278=, 0x1.1e3c2b2979761p-7
 	f64.add 	$push279=, $pop277, $pop278
-	f64.mul 	$push280=, $pop1447, $pop279
+	f64.mul 	$push280=, $0, $pop279
 	f64.const	$push281=, 0x1.beadd590c0adp-2
-	f64.add 	$push1294=, $pop280, $pop281
-	return  	$pop1294
-.LBB0_53:                               # %sw.bb762
-	end_block                       # label13:
+	f64.add 	$push1297=, $pop280, $pop281
+	return  	$pop1297
+.LBB0_56:                               # %sw.bb762
+	end_block                       # label15:
 	f64.add 	$push242=, $0, $0
 	f64.const	$push243=, -0x1.46p7
-	f64.add 	$push1450=, $pop242, $pop243
-	tee_local	$push1449=, $0=, $pop1450
+	f64.add 	$0=, $pop242, $pop243
 	f64.const	$push244=, 0x1.457f66d8ca5b7p-43
 	f64.mul 	$push245=, $0, $pop244
 	f64.const	$push246=, 0x1.3abde6a390555p-35
@@ -1494,16 +1454,15 @@ foo:                                    # @foo
 	f64.mul 	$push257=, $0, $pop256
 	f64.const	$push258=, 0x1.2bb4b9b090562p-7
 	f64.add 	$push259=, $pop257, $pop258
-	f64.mul 	$push260=, $pop1449, $pop259
+	f64.mul 	$push260=, $0, $pop259
 	f64.const	$push261=, 0x1.d0fcf80dc3372p-2
-	f64.add 	$push1293=, $pop260, $pop261
-	return  	$pop1293
-.LBB0_54:                               # %sw.bb777
-	end_block                       # label12:
+	f64.add 	$push1296=, $pop260, $pop261
+	return  	$pop1296
+.LBB0_57:                               # %sw.bb777
+	end_block                       # label14:
 	f64.add 	$push222=, $0, $0
 	f64.const	$push223=, -0x1.4ap7
-	f64.add 	$push1452=, $pop222, $pop223
-	tee_local	$push1451=, $0=, $pop1452
+	f64.add 	$0=, $pop222, $pop223
 	f64.const	$push224=, 0x1.51d6681b66433p-43
 	f64.mul 	$push225=, $0, $pop224
 	f64.const	$push226=, 0x1.4a48d4c9ca2dbp-35
@@ -1520,16 +1479,15 @@ foo:                                    # @foo
 	f64.mul 	$push237=, $0, $pop236
 	f64.const	$push238=, 0x1.39ea06997734fp-7
 	f64.add 	$push239=, $pop237, $pop238
-	f64.mul 	$push240=, $pop1451, $pop239
+	f64.mul 	$push240=, $0, $pop239
 	f64.const	$push241=, 0x1.e42aed1394318p-2
-	f64.add 	$push1292=, $pop240, $pop241
-	return  	$pop1292
-.LBB0_55:                               # %sw.bb792
-	end_block                       # label11:
+	f64.add 	$push1295=, $pop240, $pop241
+	return  	$pop1295
+.LBB0_58:                               # %sw.bb792
+	end_block                       # label13:
 	f64.add 	$push202=, $0, $0
 	f64.const	$push203=, -0x1.4ep7
-	f64.add 	$push1454=, $pop202, $pop203
-	tee_local	$push1453=, $0=, $pop1454
+	f64.add 	$0=, $pop202, $pop203
 	f64.const	$push204=, 0x1.5e5b87488eb8ap-43
 	f64.mul 	$push205=, $0, $pop204
 	f64.const	$push206=, 0x1.5a6aa1ced6d78p-35
@@ -1546,16 +1504,15 @@ foo:                                    # @foo
 	f64.mul 	$push217=, $0, $pop216
 	f64.const	$push218=, 0x1.48e4755ffe6d6p-7
 	f64.add 	$push219=, $pop217, $pop218
-	f64.mul 	$push220=, $pop1453, $pop219
+	f64.mul 	$push220=, $0, $pop219
 	f64.const	$push221=, 0x1.f83f91e646f15p-2
-	f64.add 	$push1291=, $pop220, $pop221
-	return  	$pop1291
-.LBB0_56:                               # %sw.bb807
-	end_block                       # label10:
+	f64.add 	$push1294=, $pop220, $pop221
+	return  	$pop1294
+.LBB0_59:                               # %sw.bb807
+	end_block                       # label12:
 	f64.add 	$push182=, $0, $0
 	f64.const	$push183=, -0x1.52p7
-	f64.add 	$push1456=, $pop182, $pop183
-	tee_local	$push1455=, $0=, $pop1456
+	f64.add 	$0=, $pop182, $pop183
 	f64.const	$push184=, 0x1.6b0900a2f22ap-43
 	f64.mul 	$push185=, $0, $pop184
 	f64.const	$push186=, 0x1.6b210d3cc275ep-35
@@ -1572,16 +1529,15 @@ foo:                                    # @foo
 	f64.mul 	$push197=, $0, $pop196
 	f64.const	$push198=, 0x1.58b827fa1a0cfp-7
 	f64.add 	$push199=, $pop197, $pop198
-	f64.mul 	$push200=, $pop1455, $pop199
+	f64.mul 	$push200=, $0, $pop199
 	f64.const	$push201=, 0x1.06a550870110ap-1
-	f64.add 	$push1290=, $pop200, $pop201
-	return  	$pop1290
-.LBB0_57:                               # %sw.bb822
-	end_block                       # label9:
+	f64.add 	$push1293=, $pop200, $pop201
+	return  	$pop1293
+.LBB0_60:                               # %sw.bb822
+	end_block                       # label11:
 	f64.add 	$push162=, $0, $0
 	f64.const	$push163=, -0x1.56p7
-	f64.add 	$push1458=, $pop162, $pop163
-	tee_local	$push1457=, $0=, $pop1458
+	f64.add 	$0=, $pop162, $pop163
 	f64.const	$push164=, 0x1.77ded42a90976p-43
 	f64.mul 	$push165=, $0, $pop164
 	f64.const	$push166=, 0x1.7c72d875689f8p-35
@@ -1598,16 +1554,15 @@ foo:                                    # @foo
 	f64.mul 	$push177=, $0, $pop176
 	f64.const	$push178=, 0x1.696e58a32f449p-7
 	f64.add 	$push179=, $pop177, $pop178
-	f64.mul 	$push180=, $pop1457, $pop179
+	f64.mul 	$push180=, $0, $pop179
 	f64.const	$push181=, 0x1.11adea897635ep-1
-	f64.add 	$push1289=, $pop180, $pop181
-	return  	$pop1289
-.LBB0_58:                               # %sw.bb837
-	end_block                       # label8:
+	f64.add 	$push1292=, $pop180, $pop181
+	return  	$pop1292
+.LBB0_61:                               # %sw.bb837
+	end_block                       # label10:
 	f64.add 	$push142=, $0, $0
 	f64.const	$push143=, -0x1.5ap7
-	f64.add 	$push1460=, $pop142, $pop143
-	tee_local	$push1459=, $0=, $pop1460
+	f64.add 	$0=, $pop142, $pop143
 	f64.const	$push144=, 0x1.84d73e22186efp-43
 	f64.mul 	$push145=, $0, $pop144
 	f64.const	$push146=, 0x1.8e600378c9547p-35
@@ -1624,16 +1579,15 @@ foo:                                    # @foo
 	f64.mul 	$push157=, $0, $pop156
 	f64.const	$push158=, 0x1.7b0f6ad70e6f3p-7
 	f64.add 	$push159=, $pop157, $pop158
-	f64.mul 	$push160=, $pop1459, $pop159
+	f64.mul 	$push160=, $0, $pop159
 	f64.const	$push161=, 0x1.1d3ed527e5215p-1
-	f64.add 	$push1288=, $pop160, $pop161
-	return  	$pop1288
-.LBB0_59:                               # %sw.bb852
-	end_block                       # label7:
+	f64.add 	$push1291=, $pop160, $pop161
+	return  	$pop1291
+.LBB0_62:                               # %sw.bb852
+	end_block                       # label9:
 	f64.add 	$push122=, $0, $0
 	f64.const	$push123=, -0x1.5ep7
-	f64.add 	$push1462=, $pop122, $pop123
-	tee_local	$push1461=, $0=, $pop1462
+	f64.add 	$0=, $pop122, $pop123
 	f64.const	$push124=, 0x1.91f23e8989b0cp-43
 	f64.mul 	$push125=, $0, $pop124
 	f64.const	$push126=, 0x1.a0e88e46e494ap-35
@@ -1650,16 +1604,15 @@ foo:                                    # @foo
 	f64.mul 	$push137=, $0, $pop136
 	f64.const	$push138=, 0x1.8da3c21187e7cp-7
 	f64.add 	$push139=, $pop137, $pop138
-	f64.mul 	$push140=, $pop1461, $pop139
+	f64.mul 	$push140=, $0, $pop139
 	f64.const	$push141=, 0x1.29613d31b9b67p-1
-	f64.add 	$push1287=, $pop140, $pop141
-	return  	$pop1287
-.LBB0_60:                               # %sw.bb867
-	end_block                       # label6:
+	f64.add 	$push1290=, $pop140, $pop141
+	return  	$pop1290
+.LBB0_63:                               # %sw.bb867
+	end_block                       # label8:
 	f64.add 	$push102=, $0, $0
 	f64.const	$push103=, -0x1.62p7
-	f64.add 	$push1464=, $pop102, $pop103
-	tee_local	$push1463=, $0=, $pop1464
+	f64.add 	$0=, $pop102, $pop103
 	f64.const	$push104=, 0x1.9f1e8a28efa7bp-43
 	f64.mul 	$push105=, $0, $pop104
 	f64.const	$push106=, 0x1.b40eb955ae3dp-35
@@ -1676,16 +1629,15 @@ foo:                                    # @foo
 	f64.mul 	$push117=, $0, $pop116
 	f64.const	$push118=, 0x1.a14cec41dd1a2p-7
 	f64.add 	$push119=, $pop117, $pop118
-	f64.mul 	$push120=, $pop1463, $pop119
+	f64.mul 	$push120=, $0, $pop119
 	f64.const	$push121=, 0x1.361cffeb074a7p-1
-	f64.add 	$push1286=, $pop120, $pop121
-	return  	$pop1286
-.LBB0_61:                               # %sw.bb882
-	end_block                       # label5:
+	f64.add 	$push1289=, $pop120, $pop121
+	return  	$pop1289
+.LBB0_64:                               # %sw.bb882
+	end_block                       # label7:
 	f64.add 	$push82=, $0, $0
 	f64.const	$push83=, -0x1.66p7
-	f64.add 	$push1466=, $pop82, $pop83
-	tee_local	$push1465=, $0=, $pop1466
+	f64.add 	$0=, $pop82, $pop83
 	f64.const	$push84=, 0x1.ac67a87aed773p-43
 	f64.mul 	$push85=, $0, $pop84
 	f64.const	$push86=, 0x1.c7d4c51b1a2a8p-35
@@ -1702,16 +1654,15 @@ foo:                                    # @foo
 	f64.mul 	$push97=, $0, $pop96
 	f64.const	$push98=, 0x1.b60ae9680e065p-7
 	f64.add 	$push99=, $pop97, $pop98
-	f64.mul 	$push100=, $pop1465, $pop99
+	f64.mul 	$push100=, $0, $pop99
 	f64.const	$push101=, 0x1.4378ab0c88a48p-1
-	f64.add 	$push1285=, $pop100, $pop101
-	return  	$pop1285
-.LBB0_62:                               # %sw.bb897
-	end_block                       # label4:
+	f64.add 	$push1288=, $pop100, $pop101
+	return  	$pop1288
+.LBB0_65:                               # %sw.bb897
+	end_block                       # label6:
 	f64.add 	$push62=, $0, $0
 	f64.const	$push63=, -0x1.6ap7
-	f64.add 	$push1468=, $pop62, $pop63
-	tee_local	$push1467=, $0=, $pop1468
+	f64.add 	$0=, $pop62, $pop63
 	f64.const	$push64=, 0x1.b9b68a8a3cd86p-43
 	f64.mul 	$push65=, $0, $pop64
 	f64.const	$push66=, 0x1.dc38712134803p-35
@@ -1728,16 +1679,15 @@ foo:                                    # @foo
 	f64.mul 	$push77=, $0, $pop76
 	f64.const	$push78=, 0x1.cbee807bbb624p-7
 	f64.add 	$push79=, $pop77, $pop78
-	f64.mul 	$push80=, $pop1467, $pop79
+	f64.mul 	$push80=, $0, $pop79
 	f64.const	$push81=, 0x1.51800a7c5ac47p-1
-	f64.add 	$push1284=, $pop80, $pop81
-	return  	$pop1284
-.LBB0_63:                               # %sw.bb912
-	end_block                       # label3:
+	f64.add 	$push1287=, $pop80, $pop81
+	return  	$pop1287
+.LBB0_66:                               # %sw.bb912
+	end_block                       # label5:
 	f64.add 	$push42=, $0, $0
 	f64.const	$push43=, -0x1.6ep7
-	f64.add 	$push1470=, $pop42, $pop43
-	tee_local	$push1469=, $0=, $pop1470
+	f64.add 	$0=, $pop42, $pop43
 	f64.const	$push44=, 0x1.c710f4142f5dp-43
 	f64.mul 	$push45=, $0, $pop44
 	f64.const	$push46=, 0x1.f13e3e53e4f7ep-35
@@ -1754,16 +1704,15 @@ foo:                                    # @foo
 	f64.mul 	$push57=, $0, $pop56
 	f64.const	$push58=, 0x1.e308787485e3ep-7
 	f64.add 	$push59=, $pop57, $pop58
-	f64.mul 	$push60=, $pop1469, $pop59
+	f64.mul 	$push60=, $0, $pop59
 	f64.const	$push61=, 0x1.603afb7e90ff9p-1
-	f64.add 	$push1283=, $pop60, $pop61
-	return  	$pop1283
-.LBB0_64:                               # %sw.bb927
-	end_block                       # label2:
+	f64.add 	$push1286=, $pop60, $pop61
+	return  	$pop1286
+.LBB0_67:                               # %sw.bb927
+	end_block                       # label4:
 	f64.add 	$push22=, $0, $0
 	f64.const	$push23=, -0x1.72p7
-	f64.add 	$push1472=, $pop22, $pop23
-	tee_local	$push1471=, $0=, $pop1472
+	f64.add 	$0=, $pop22, $pop23
 	f64.const	$push24=, 0x1.d471215b73735p-43
 	f64.mul 	$push25=, $0, $pop24
 	f64.const	$push26=, 0x1.0371f61e9bda6p-34
@@ -1780,16 +1729,15 @@ foo:                                    # @foo
 	f64.mul 	$push37=, $0, $pop36
 	f64.const	$push38=, 0x1.fb71fbc5de9cp-7
 	f64.add 	$push39=, $pop37, $pop38
-	f64.mul 	$push40=, $pop1471, $pop39
+	f64.mul 	$push40=, $0, $pop39
 	f64.const	$push41=, 0x1.6fb549f94855ep-1
-	f64.add 	$push1282=, $pop40, $pop41
-	return  	$pop1282
-.LBB0_65:                               # %sw.bb942
-	end_block                       # label1:
+	f64.add 	$push1285=, $pop40, $pop41
+	return  	$pop1285
+.LBB0_68:                               # %sw.bb942
+	end_block                       # label3:
 	f64.add 	$push2=, $0, $0
 	f64.const	$push3=, -0x1.76p7
-	f64.add 	$push1474=, $pop2, $pop3
-	tee_local	$push1473=, $0=, $pop1474
+	f64.add 	$0=, $pop2, $pop3
 	f64.const	$push4=, 0x1.e1c5c72814664p-43
 	f64.mul 	$push5=, $0, $pop4
 	f64.const	$push6=, 0x1.0e94bd6e965b5p-34
@@ -1806,13 +1754,13 @@ foo:                                    # @foo
 	f64.mul 	$push17=, $0, $pop16
 	f64.const	$push18=, 0x1.0a99b6f5caf2dp-6
 	f64.add 	$push19=, $pop17, $pop18
-	f64.mul 	$push20=, $pop1473, $pop19
+	f64.mul 	$push20=, $0, $pop19
 	f64.const	$push21=, 0x1.7ff6d330941c8p-1
 	f64.add 	$2=, $pop20, $pop21
-.LBB0_66:                               # %cleanup
-	end_block                       # label0:
-	copy_local	$push1475=, $2
-                                        # fallthrough-return: $pop1475
+.LBB0_69:                               # %cleanup
+	end_block                       # label2:
+	copy_local	$push1348=, $2
+                                        # fallthrough-return: $pop1348
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -1824,26 +1772,25 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	f64
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	f64.const	$push0=, 0x1.399999999999ap6
-	f64.call	$push9=, foo@FUNCTION, $pop0
-	tee_local	$push8=, $0=, $pop9
+	f64.call	$0=, foo@FUNCTION, $pop0
+	block   	
 	f64.const	$push1=, 0x1.851eb851eb852p-2
-	f64.lt  	$push2=, $pop8, $pop1
-	br_if   	0, $pop2        # 0: down to label65
-# BB#1:                                 # %entry
+	f64.lt  	$push2=, $0, $pop1
+	br_if   	0, $pop2        # 0: down to label67
+# %bb.1:                                # %entry
 	f64.const	$push3=, 0x1.ae147ae147ae1p-2
 	f64.le  	$push4=, $0, $pop3
 	f64.ne  	$push5=, $0, $0
 	i32.or  	$push6=, $pop4, $pop5
-	i32.eqz 	$push10=, $pop6
-	br_if   	0, $pop10       # 0: down to label65
-# BB#2:                                 # %if.end
+	i32.eqz 	$push8=, $pop6
+	br_if   	0, $pop8        # 0: down to label67
+# %bb.2:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB1_3:                                # %if.then
-	end_block                       # label65:
+	end_block                       # label67:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -1851,5 +1798,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58640-2.c.s b/test/torture-s/pr58640-2.c.s
index 456e0f265..a4850c449 100644
--- a/test/torture-s/pr58640-2.c.s
+++ b/test/torture-s/pr58640-2.c.s
@@ -7,21 +7,20 @@
 fn1:                                    # @fn1
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %for.body3.split
+# %bb.0:                                # %for.body3.split
 	i32.const	$push1=, 0
 	i64.const	$push0=, 4294967297
 	i64.store	a($pop1), $pop0
-	i32.const	$push11=, 0
+	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.store	a+48($pop9), $pop2
 	i32.const	$push8=, 0
-	i32.const	$push7=, 0
-	i32.load	$push6=, a+60($pop7)
-	tee_local	$push5=, $0=, $pop6
-	i32.store	a($pop8), $pop5
+	i32.const	$push7=, 1
+	i32.store	c($pop8), $pop7
+	i32.const	$push6=, 0
+	i32.load	$0=, a+60($pop6)
+	i32.const	$push5=, 0
+	i32.store	a($pop5), $0
 	i32.const	$push4=, 0
 	i32.store	a+4($pop4), $0
 	i32.const	$push3=, 0
@@ -37,25 +36,24 @@ fn1:                                    # @fn1
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
+	i32.const	$push6=, 0
 	i32.const	$push0=, 1
-	i32.store	a+48($pop8), $pop0
-	i32.const	$push7=, 0
-	i32.const	$push6=, 1
-	i32.store	c($pop7), $pop6
+	i32.store	a+48($pop6), $pop0
 	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, a+60($pop4)
-	tee_local	$push2=, $0=, $pop3
-	i32.store	a($pop5), $pop2
+	i32.const	$push4=, 1
+	i32.store	c($pop5), $pop4
+	i32.const	$push3=, 0
+	i32.load	$0=, a+60($pop3)
+	i32.const	$push2=, 0
+	i32.store	a($pop2), $0
 	i32.const	$push1=, 0
 	i32.store	a+4($pop1), $0
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push9=, 0
-	return  	$pop9
+# %bb.1:                                # %if.end
+	i32.const	$push7=, 0
+	return  	$pop7
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -92,5 +90,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58640.c.s b/test/torture-s/pr58640.c.s
index 08b793e0c..e2d247aa5 100644
--- a/test/torture-s/pr58640.c.s
+++ b/test/torture-s/pr58640.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	foo@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -19,44 +19,42 @@ main:                                   # @main
 	.type	foo,@function           # -- Begin function foo
 foo:                                    # @foo
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$2=, b($pop7)
 	block   	
-	i32.const	$push9=, 0
-	i32.load	$push8=, b($pop9)
-	tee_local	$push7=, $2=, $pop8
 	i32.const	$push6=, 0
-	i32.le_s	$push0=, $pop7, $pop6
+	i32.le_s	$push0=, $2, $pop6
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %cleanup
+# %bb.1:                                # %cleanup
 	return
 .LBB1_2:                                # %for.body3.lr.ph
 	end_block                       # label0:
 	block   	
-	i32.const	$push10=, 0
-	i32.load	$push1=, d($pop10)
-	i32.eqz 	$push16=, $pop1
-	br_if   	0, $pop16       # 0: down to label1
-# BB#3:                                 # %if.then.split
+	i32.const	$push8=, 0
+	i32.load	$push1=, d($pop8)
+	i32.eqz 	$push12=, $pop1
+	br_if   	0, $pop12       # 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
+	i32.const	$push9=, 0
 	i32.const	$push4=, 1
-	i32.store	e($pop11), $pop4
+	i32.store	e($pop9), $pop4
 	return
 .LBB1_4:                                # %for.body3.preheader
 	end_block                       # label1:
 .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
+	i32.const	$push11=, 1
+	i32.add 	$0=, $2, $pop11
+	i32.const	$push10=, 0
+	i32.lt_s	$1=, $2, $pop10
+	copy_local	$2=, $0
 	br_if   	0, $1           # 0: up to label2
-# BB#6:                                 # %for.inc28
+# %bb.6:                                # %for.inc28
 	end_loop
 	i32.const	$push5=, 0
 	i32.store	b($pop5), $0
@@ -111,5 +109,5 @@ e:
 	.size	e, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr58662.c.s b/test/torture-s/pr58662.c.s
index 279307790..5cbf3170b 100644
--- a/test/torture-s/pr58662.c.s
+++ b/test/torture-s/pr58662.c.s
@@ -6,34 +6,20 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
-	i32.const	$push17=, 0
-	i32.load	$push0=, c($pop17)
-	i32.const	$push16=, 0
-	i32.ne  	$push1=, $pop0, $pop16
-	i32.const	$push15=, 0
-	i32.load	$push2=, a($pop15)
-	i32.eqz 	$push3=, $pop2
-	i32.const	$push4=, -30000
-	i32.div_s	$push14=, $pop3, $pop4
-	tee_local	$push13=, $0=, $pop14
-	i32.const	$push5=, 14
-	i32.rem_s	$push6=, $pop13, $pop5
-	i32.const	$push12=, 0
-	i32.ne  	$push7=, $pop6, $pop12
-	i32.and 	$push8=, $pop1, $pop7
-	i32.store	b($pop18), $pop8
-	i32.const	$push11=, 0
-	i32.store	d($pop11), $0
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.const	$push4=, 0
+	i32.store	b($pop5), $pop4
+	i32.const	$push3=, 0
+	i32.const	$push2=, 0
+	i32.store	d($pop3), $pop2
 	block   	
-	i32.const	$push10=, 0
-	i32.load	$push9=, b($pop10)
-	br_if   	0, $pop9        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push19=, 0
-	return  	$pop19
+	i32.const	$push1=, 0
+	i32.load	$push0=, b($pop1)
+	br_if   	0, $pop0        # 0: down to label0
+# %bb.1:                                # %if.end
+	i32.const	$push6=, 0
+	return  	$pop6
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -79,5 +65,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58726.c.s b/test/torture-s/pr58726.c.s
index 098565213..bae72b87a 100644
--- a/test/torture-s/pr58726.c.s
+++ b/test/torture-s/pr58726.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push2=, a($pop0)
 	i32.const	$push8=, 0
@@ -28,7 +28,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, -9162
 	i32.store	c($pop1), $pop0
@@ -69,4 +69,4 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr58831.c.s b/test/torture-s/pr58831.c.s
index d758fce0c..dfbb3c124 100644
--- a/test/torture-s/pr58831.c.s
+++ b/test/torture-s/pr58831.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	fn2@FUNCTION
 	i32.const	$push1=, 0
 	i32.const	$push0=, r
@@ -23,7 +23,7 @@ main:                                   # @main
 	.section	.text.fn2,"ax",@progbits
 	.type	fn2,@function           # -- Begin function fn2
 fn2:                                    # @fn2
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 42
 	i32.store	f($pop1), $pop0
@@ -40,35 +40,34 @@ fn2:                                    # @fn2
 fn1:                                    # @fn1
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, p($pop3)
-	i32.eqz 	$push13=, $pop0
-	br_if   	0, $pop13       # 0: down to label0
-# BB#1:                                 # %for.body.preheader
+	i32.eqz 	$push11=, $pop0
+	br_if   	0, $pop11       # 0: down to label0
+# %bb.1:                                # %for.body.preheader
 .LBB2_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push9=, 1
-	i32.store	0($0), $pop9
-	i32.const	$push8=, 0
-	i32.const	$push7=, 0
-	i32.load	$push1=, p($pop7)
-	i32.const	$push6=, 1
-	i32.add 	$push5=, $pop1, $pop6
-	tee_local	$push4=, $1=, $pop5
-	i32.store	p($pop8), $pop4
+	i32.const	$push7=, 1
+	i32.store	0($0), $pop7
+	i32.const	$push6=, 0
+	i32.load	$push1=, p($pop6)
+	i32.const	$push5=, 1
+	i32.add 	$1=, $pop1, $pop5
+	i32.const	$push4=, 0
+	i32.store	p($pop4), $1
 	br_if   	0, $1           # 0: up to label1
 .LBB2_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
-	i32.const	$push12=, 0
+	i32.const	$push10=, 0
 	i32.const	$push2=, d
-	i32.store	b($pop12), $pop2
-	i32.const	$push11=, 0
-	i32.const	$push10=, d
-	i32.store	r($pop11), $pop10
+	i32.store	b($pop10), $pop2
+	i32.const	$push9=, 0
+	i32.const	$push8=, d
+	i32.store	r($pop9), $pop8
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -174,4 +173,4 @@ j:
 	.size	j, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr58943.c.s b/test/torture-s/pr58943.c.s
index 35d84248e..17ffb1144 100644
--- a/test/torture-s/pr58943.c.s
+++ b/test/torture-s/pr58943.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push5=, 0
 	i32.load	$push1=, x($pop5)
@@ -26,21 +26,20 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.const	$push6=, 0
-	i32.load	$push0=, x($pop6)
+# %bb.0:                                # %entry
+	i32.const	$push5=, 0
+	i32.load	$push0=, x($pop5)
 	i32.const	$push1=, 129
-	i32.or  	$push5=, $pop0, $pop1
-	tee_local	$push4=, $0=, $pop5
-	i32.store	x($pop7), $pop4
+	i32.or  	$0=, $pop0, $pop1
+	i32.const	$push4=, 0
+	i32.store	x($pop4), $0
 	block   	
 	i32.const	$push2=, 131
 	i32.ne  	$push3=, $0, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push8=, 0
-	return  	$pop8
+# %bb.1:                                # %if.end
+	i32.const	$push6=, 0
+	return  	$pop6
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -59,5 +58,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr58984.c.s b/test/torture-s/pr58984.c.s
index 9b77fd680..83a35321a 100644
--- a/test/torture-s/pr58984.c.s
+++ b/test/torture-s/pr58984.c.s
@@ -7,55 +7,53 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push13=, 0
 	i32.load	$push0=, e($pop13)
 	i32.const	$push12=, 1
 	i32.gt_s	$push1=, $pop0, $pop12
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.i
-	i32.const	$push17=, 0
-	i32.load	$push16=, c($pop17)
-	tee_local	$push15=, $0=, $pop16
+# %bb.1:                                # %for.body.i
+	i32.const	$push15=, 0
+	i32.load	$0=, c($pop15)
 	i32.load	$push2=, 0($0)
 	i32.const	$push14=, 1
 	i32.xor 	$push3=, $pop2, $pop14
-	i32.store	0($pop15), $pop3
+	i32.store	0($0), $pop3
 .LBB0_2:                                # %foo.exit
 	end_block                       # label0:
-	i32.const	$push21=, 0
-	i32.const	$push20=, 1
-	i32.store	m($pop21), $pop20
-	block   	
 	i32.const	$push19=, 0
-	i32.load	$push4=, a($pop19)
 	i32.const	$push18=, 1
-	i32.ne  	$push5=, $pop4, $pop18
+	i32.store	m($pop19), $pop18
+	block   	
+	i32.const	$push17=, 0
+	i32.load	$push4=, a($pop17)
+	i32.const	$push16=, 1
+	i32.ne  	$push5=, $pop4, $pop16
 	br_if   	0, $pop5        # 0: down to label1
-# BB#3:                                 # %bar.exit
-	i32.const	$push30=, 0
-	i32.const	$push29=, 0
-	i32.store	e($pop30), $pop29
-	i32.const	$push28=, 0
-	i32.load	$push27=, c($pop28)
-	tee_local	$push26=, $0=, $pop27
+# %bb.3:                                # %bar.exit
+	i32.const	$push26=, 0
+	i32.const	$push25=, 0
+	i32.store	e($pop26), $pop25
+	i32.const	$push24=, 0
+	i32.load	$0=, c($pop24)
 	i32.load	$push6=, 0($0)
 	i32.const	$push7=, 1
 	i32.xor 	$push8=, $pop6, $pop7
-	i32.store	0($pop26), $pop8
-	i32.const	$push25=, 0
-	i32.const	$push24=, 0
-	i32.load	$push9=, m($pop24)
-	i32.const	$push23=, 1
-	i32.or  	$push10=, $pop9, $pop23
-	i32.store	m($pop25), $pop10
+	i32.store	0($0), $pop8
+	i32.const	$push23=, 0
 	i32.const	$push22=, 0
-	i32.load	$push11=, a($pop22)
+	i32.load	$push9=, m($pop22)
+	i32.const	$push21=, 1
+	i32.or  	$push10=, $pop9, $pop21
+	i32.store	m($pop23), $pop10
+	i32.const	$push20=, 0
+	i32.load	$push11=, a($pop20)
 	br_if   	0, $pop11       # 0: down to label1
-# BB#4:                                 # %if.end11
-	i32.const	$push31=, 0
-	return  	$pop31
+# %bb.4:                                # %if.end11
+	i32.const	$push27=, 0
+	return  	$pop27
 .LBB0_5:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -119,5 +117,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59014-2.c.s b/test/torture-s/pr59014-2.c.s
index 79767665a..87d385e0a 100644
--- a/test/torture-s/pr59014-2.c.s
+++ b/test/torture-s/pr59014-2.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push3=, 6
 	i64.add 	$push0=, $1, $0
 	i64.or  	$push1=, $1, $0
@@ -24,7 +24,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push1=, 12884901888
 	i64.const	$push0=, 21474836480
@@ -32,7 +32,7 @@ main:                                   # @main
 	i64.const	$push3=, 34359738368
 	i64.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB1_2:                                # %if.then
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59014.c.s b/test/torture-s/pr59014.c.s
index d44ce0c26..8f605bd0b 100644
--- a/test/torture-s/pr59014.c.s
+++ b/test/torture-s/pr59014.c.s
@@ -7,20 +7,19 @@
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push7=, 0
+	i32.load	$0=, a($pop7)
 	block   	
-	i32.const	$push9=, 0
-	i32.load	$push8=, a($pop9)
-	tee_local	$push7=, $0=, $pop8
 	i32.const	$push2=, 1
-	i32.and 	$push3=, $pop7, $pop2
+	i32.and 	$push3=, $0, $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
+	i32.eqz 	$push10=, $pop4
+	br_if   	0, $pop10       # 0: down to label0
 .LBB0_1:                                # %for.inc
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
@@ -28,10 +27,10 @@ foo:                                    # @foo
 .LBB0_2:                                # %if.else
 	end_loop
 	end_block                       # label0:
-	i32.const	$push11=, 0
-	i32.store	d($pop11), $0
-	i32.const	$push10=, 0
-                                        # fallthrough-return: $pop10
+	i32.const	$push9=, 0
+	i32.store	d($pop9), $0
+	i32.const	$push8=, 0
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end0:
 	.size	foo, .Lfunc_end0-foo
@@ -43,20 +42,19 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push10=, 0
+	i32.load	$0=, a($pop10)
 	block   	
-	i32.const	$push12=, 0
-	i32.load	$push11=, a($pop12)
-	tee_local	$push10=, $0=, $pop11
 	i32.const	$push2=, 1
-	i32.and 	$push3=, $pop10, $pop2
+	i32.and 	$push3=, $0, $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
+	i32.eqz 	$push12=, $pop4
+	br_if   	0, $pop12       # 0: down to label2
 .LBB1_1:                                # %for.inc.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
@@ -64,13 +62,13 @@ main:                                   # @main
 .LBB1_2:                                # %foo.exit
 	end_loop
 	end_block                       # label2:
-	i32.const	$push13=, 0
-	i32.store	d($pop13), $0
+	i32.const	$push11=, 0
+	i32.store	d($pop11), $0
 	block   	
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $0, $pop5
 	br_if   	0, $pop6        # 0: down to label4
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push7=, 0
 	return  	$pop7
 .LBB1_4:                                # %if.then
@@ -118,5 +116,5 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59101.c.s b/test/torture-s/pr59101.c.s
index 0ce20014a..fd125e76a 100644
--- a/test/torture-s/pr59101.c.s
+++ b/test/torture-s/pr59101.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -192176872
 	i32.and 	$push1=, $0, $pop0
 	i32.const	$push5=, -192176872
@@ -25,14 +25,14 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.call	$push0=, foo@FUNCTION, $pop3
 	i32.const	$push1=, 7
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -44,5 +44,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59221.c.s b/test/torture-s/pr59221.c.s
index 3c87ff028..43e2e63aa 100644
--- a/test/torture-s/pr59221.c.s
+++ b/test/torture-s/pr59221.c.s
@@ -7,41 +7,41 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.const	$push10=, 0
-	i32.load	$push0=, b($pop10)
-	i32.eqz 	$push21=, $pop0
-	br_if   	0, $pop21       # 0: down to label0
-# BB#1:                                 # %for.inc.lr.ph
-	i32.const	$push12=, 0
 	i32.const	$push11=, 0
-	i32.store	b($pop12), $pop11
+	i32.load	$push0=, b($pop11)
+	i32.eqz 	$push19=, $pop0
+	br_if   	0, $pop19       # 0: down to label0
+# %bb.1:                                # %for.inc.lr.ph
+	i32.const	$push13=, 0
+	i32.const	$push12=, 0
+	i32.store	b($pop13), $pop12
 .LBB0_2:                                # %for.end
 	end_block                       # label0:
-	i32.const	$push20=, 0
-	i32.const	$push19=, 0
-	i32.load	$push18=, a($pop19)
-	tee_local	$push17=, $0=, $pop18
-	i32.const	$push3=, 16
-	i32.shl 	$push4=, $pop17, $pop3
-	i32.const	$push16=, 16
-	i32.shr_s	$push5=, $pop4, $pop16
-	i32.const	$push6=, -32768
+	i32.const	$push18=, 0
+	i32.load	$0=, a($pop18)
+	i32.const	$push3=, -32768
 	i32.const	$push1=, 65535
 	i32.and 	$push2=, $0, $pop1
-	i32.select	$push15=, $pop5, $pop6, $pop2
-	tee_local	$push14=, $0=, $pop15
-	i32.store16	e($pop20), $pop14
-	i32.const	$push13=, 0
-	i32.store	d($pop13), $0
+	i32.select	$0=, $0, $pop3, $pop2
+	i32.const	$push17=, 0
+	i32.store16	e($pop17), $0
+	i32.const	$push16=, 0
+	i32.const	$push4=, 16
+	i32.shl 	$push5=, $0, $pop4
+	i32.const	$push15=, 16
+	i32.shr_s	$push6=, $pop5, $pop15
+	i32.store	d($pop16), $pop6
 	block   	
-	i32.const	$push7=, 1
-	i32.ne  	$push8=, $0, $pop7
-	br_if   	0, $pop8        # 0: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push9=, 0
-	return  	$pop9
+	i32.const	$push14=, 65535
+	i32.and 	$push7=, $0, $pop14
+	i32.const	$push8=, 1
+	i32.ne  	$push9=, $pop7, $pop8
+	br_if   	0, $pop9        # 0: down to label1
+# %bb.3:                                # %if.end
+	i32.const	$push10=, 0
+	return  	$pop10
 .LBB0_4:                                # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -87,5 +87,5 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59229.c.s b/test/torture-s/pr59229.c.s
index fbcb78dce..c7fd52a90 100644
--- a/test/torture-s/pr59229.c.s
+++ b/test/torture-s/pr59229.c.s
@@ -7,23 +7,22 @@
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$push17=, i($pop0)
-	tee_local	$push16=, $1=, $pop17
+	i32.load	$1=, i($pop0)
+	block   	
 	i32.const	$push1=, -1
-	i32.add 	$push2=, $pop16, $pop1
+	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, 6
 	i32.ge_u	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, .L.str
 	i32.const	$push5=, 1
 	i32.add 	$push6=, $1, $pop5
 	i32.call	$push8=, memcmp@FUNCTION, $0, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push9=, 538976288
 	i32.store	0($0):p2align=0, $pop9
 	i32.const	$push10=, 6
@@ -50,21 +49,20 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop6, $pop8
-	tee_local	$push17=, $2=, $pop18
-	i32.store	__stack_pointer($pop9), $pop17
+	i32.sub 	$2=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $2
 	block   	
 	i32.const	$push0=, -1
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, 5
 	i32.gt_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push13=, 9
 	i32.add 	$push14=, $2, $pop13
 	i32.const	$push4=, 1
@@ -91,7 +89,7 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.const	$push2=, 0
 	i32.store	i($pop3), $pop2
@@ -99,20 +97,18 @@ main:                                   # @main
 .LBB2_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push12=, .L.str.1
-	call    	foo@FUNCTION, $pop12, $1
-	i32.const	$push11=, 0
-	i32.const	$push10=, 0
-	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	$push8=, .L.str.1
+	call    	foo@FUNCTION, $pop8, $1
+	i32.const	$push7=, 0
+	i32.load	$0=, i($pop7)
+	i32.const	$push6=, 1
+	i32.add 	$1=, $0, $pop6
+	i32.const	$push5=, 0
+	i32.store	i($pop5), $1
 	i32.const	$push4=, 15
 	i32.lt_s	$push0=, $0, $pop4
 	br_if   	0, $pop0        # 0: up to label2
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push1=, 0
                                         # fallthrough-return: $pop1
@@ -141,6 +137,6 @@ i:
 	.size	.L.str.1, 17
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8bf0c5a91..219dba8ef 100644
--- a/test/torture-s/pr59358.c.s
+++ b/test/torture-s/pr59358.c.s
@@ -8,36 +8,35 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.load	$0=, 0($0)
+# %bb.0:                                # %entry
+	i32.load	$2=, 0($0)
 	block   	
 	block   	
 	i32.const	$push0=, 16
 	i32.gt_s	$push1=, $1, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
-	i32.ge_s	$push2=, $0, $1
+# %bb.1:                                # %entry
+	i32.ge_s	$push2=, $2, $1
 	br_if   	1, $pop2        # 1: down to label0
-# BB#2:                                 # %while.cond.preheader
+# %bb.2:                                # %while.cond.preheader
 .LBB0_3:                                # %while.cond
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	copy_local	$push8=, $0
-	tee_local	$push7=, $2=, $pop8
+	copy_local	$0=, $2
 	i32.const	$push6=, 1
-	i32.shl 	$0=, $pop7, $pop6
-	i32.lt_s	$push3=, $2, $1
+	i32.shl 	$2=, $0, $pop6
+	i32.lt_s	$push3=, $0, $1
 	br_if   	0, $pop3        # 0: up to label2
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	end_loop
-	return  	$2
+	return  	$0
 .LBB0_5:
 	end_block                       # label1:
-	copy_local	$push5=, $0
+	copy_local	$push5=, $2
 	return  	$pop5
 .LBB0_6:
 	end_block                       # label0:
-	copy_local	$push4=, $0
+	copy_local	$push4=, $2
                                         # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
@@ -50,61 +49,59 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 16
+	i32.sub 	$6=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $6
+	i32.const	$push27=, 1
+	i32.store	12($6), $pop27
 	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	$push24=, 12
-	i32.add 	$push25=, $6, $pop24
-	i32.const	$push36=, 16
-	i32.call	$3=, foo@FUNCTION, $pop25, $pop36
-	copy_local	$4=, $0
+	i32.const	$push31=, -1
+	i32.add 	$5=, $0, $pop31
+	i32.const	$push23=, 12
+	i32.add 	$push24=, $6, $pop23
+	i32.const	$push30=, 16
+	i32.call	$3=, foo@FUNCTION, $pop24, $pop30
+	copy_local	$4=, $1
 	block   	
 	block   	
-	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
+	i32.const	$push29=, 2147483640
+	i32.and 	$push1=, $5, $pop29
+	i32.const	$push28=, 8
+	i32.eq  	$push2=, $pop1, $pop28
 	br_if   	0, $pop2        # 0: down to label6
-# BB#2:                                 # %if.else
+# %bb.2:                                # %if.else
                                         #   in Loop: Header=BB1_1 Depth=1
 	block   	
-	i32.const	$push38=, -4
-	i32.and 	$push3=, $5, $pop38
-	i32.const	$push37=, 4
-	i32.ne  	$push4=, $pop3, $pop37
+	i32.const	$push33=, 2147483644
+	i32.and 	$push3=, $5, $pop33
+	i32.const	$push32=, 4
+	i32.ne  	$push4=, $pop3, $pop32
 	br_if   	0, $pop4        # 0: down to label7
-# BB#3:                                 # %if.then6
+# %bb.3:                                # %if.then6
                                         #   in Loop: Header=BB1_1 Depth=1
-	i32.const	$push39=, 2
-	i32.shl 	$push15=, $2, $pop39
-	i32.eq  	$push6=, $3, $pop15
+	i32.const	$push34=, 2
+	i32.shl 	$push14=, $2, $pop34
+	i32.eq  	$push6=, $3, $pop14
 	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	$push42=, 24
-	i32.const	$push41=, 16
-	i32.const	$push40=, 2
-	i32.eq  	$push5=, $1, $pop40
-	i32.select	$4=, $pop42, $pop41, $pop5
+	i32.const	$push37=, 24
+	i32.const	$push36=, 16
+	i32.const	$push35=, 6
+	i32.eq  	$push5=, $1, $pop35
+	i32.select	$4=, $pop37, $pop36, $pop5
 .LBB1_5:                                # %if.end15
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label6:
@@ -113,36 +110,36 @@ main:                                   # @main
 .LBB1_6:                                # %if.end18
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label5:
-	i32.const	$push26=, 12
-	i32.add 	$push27=, $6, $pop26
-	i32.const	$push44=, 7
-	i32.call	$3=, foo@FUNCTION, $pop27, $pop44
+	i32.const	$push25=, 12
+	i32.add 	$push26=, $6, $pop25
+	i32.const	$push39=, 7
+	i32.call	$3=, foo@FUNCTION, $pop26, $pop39
 	block   	
 	block   	
-	i32.const	$push43=, 6
-	i32.gt_u	$push8=, $5, $pop43
+	i32.const	$push38=, 6
+	i32.gt_u	$push8=, $5, $pop38
 	br_if   	0, $pop8        # 0: down to label9
-# BB#7:                                 # %if.else22
+# %bb.7:                                # %if.else22
                                         #   in Loop: Header=BB1_1 Depth=1
 	block   	
-	i32.const	$push45=, 4
-	i32.lt_u	$push9=, $5, $pop45
+	i32.const	$push40=, 4
+	i32.lt_u	$push9=, $5, $pop40
 	br_if   	0, $pop9        # 0: down to label10
-# BB#8:                                 # %if.then24
+# %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
+	i32.const	$push41=, 1
+	i32.shl 	$push15=, $2, $pop41
+	i32.eq  	$push11=, $3, $pop15
 	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
 	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
+	i32.const	$push44=, 12
+	i32.const	$push43=, 8
+	i32.const	$push42=, 6
+	i32.eq  	$push10=, $1, $pop42
+	i32.select	$5=, $pop44, $pop43, $pop10
 .LBB1_10:                               # %if.end34
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label9:
@@ -151,27 +148,26 @@ main:                                   # @main
 .LBB1_11:                               # %for.cond
                                         #   in Loop: Header=BB1_1 Depth=1
 	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
+	i32.const	$push48=, 1
+	i32.add 	$2=, $2, $pop48
+	i32.const	$push47=, 2
+	i32.add 	$1=, $1, $pop47
+	i32.store	12($6), $0
+	i32.const	$push46=, 16
+	i32.gt_u	$5=, $0, $pop46
+	i32.const	$push45=, 1
+	i32.add 	$push0=, $0, $pop45
+	copy_local	$0=, $pop0
+	i32.eqz 	$push49=, $5
+	br_if   	0, $pop49       # 0: up to label4
+# %bb.12:                               # %for.end
 	end_loop
-	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
+	i32.const	$push22=, 0
+	i32.const	$push20=, 16
+	i32.add 	$push21=, $6, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
+	i32.const	$push13=, 0
+	return  	$pop13
 .LBB1_13:                               # %if.then17
 	end_block                       # label3:
 	call    	abort@FUNCTION
@@ -181,5 +177,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59387.c.s b/test/torture-s/pr59387.c.s
index 29e16dd92..557c96cf5 100644
--- a/test/torture-s/pr59387.c.s
+++ b/test/torture-s/pr59387.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, -19
 	i32.const	$push6=, 0
 	i32.const	$push5=, -19
@@ -26,15 +26,14 @@ main:                                   # @main
 	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.cond
+	i32.eqz 	$push15=, $pop1
+	br_if   	1, $pop15       # 1: down to label0
+# %bb.2:                                # %for.cond
                                         #   in Loop: Header=BB0_1 Depth=1
-	i32.const	$push14=, 0
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.store	a($pop14), $pop11
+	i32.const	$push12=, 1
+	i32.add 	$1=, $1, $pop12
+	i32.const	$push11=, 0
+	i32.store	a($pop11), $1
 	br_if   	0, $1           # 0: up to label1
 .LBB0_3:                                # %return
 	end_loop
@@ -42,10 +41,10 @@ main:                                   # @main
 	i32.const	$push3=, 0
 	i32.const	$push2=, 24
 	i32.store	b($pop3), $pop2
-	i32.const	$push16=, 0
-	i32.store8	c($pop16), $0
-	i32.const	$push15=, 0
-                                        # fallthrough-return: $pop15
+	i32.const	$push14=, 0
+	i32.store8	c($pop14), $0
+	i32.const	$push13=, 0
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -104,4 +103,4 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr59388.c.s b/test/torture-s/pr59388.c.s
index 77b1c4094..71511cf0e 100644
--- a/test/torture-s/pr59388.c.s
+++ b/test/torture-s/pr59388.c.s
@@ -7,16 +7,15 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push5=, 0
-	i32.load8_u	$push1=, b($pop5)
+	i32.load8_u	$push1=, b($pop0)
 	i32.const	$push2=, 1
-	i32.and 	$push4=, $pop1, $pop2
-	tee_local	$push3=, $0=, $pop4
-	i32.store	a($pop0), $pop3
-	copy_local	$push6=, $0
-                                        # fallthrough-return: $pop6
+	i32.and 	$0=, $pop1, $pop2
+	i32.const	$push3=, 0
+	i32.store	a($pop3), $0
+	copy_local	$push4=, $0
+                                        # fallthrough-return: $pop4
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -40,4 +39,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr59413.c.s b/test/torture-s/pr59413.c.s
index 812d50784..850a4f01a 100644
--- a/test/torture-s/pr59413.c.s
+++ b/test/torture-s/pr59413.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %if.end
 	i32.const	$push1=, 0
 	i32.const	$push0=, 7
 	i32.store	a($pop1), $pop0
@@ -35,4 +35,4 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr59643.c.s b/test/torture-s/pr59643.c.s
index 67e31ae17..a1c816355 100644
--- a/test/torture-s/pr59643.c.s
+++ b/test/torture-s/pr59643.c.s
@@ -6,50 +6,47 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, f64, f64, i32
-	.local  	i32, i32, f64, f64
-# BB#0:                                 # %entry
+	.local  	f64, i32, f64, f64
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 3
 	i32.lt_s	$push1=, $5, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %for.body.lr.ph
+# %bb.1:                                # %for.body.lr.ph
 	i32.const	$push2=, 16
-	i32.add 	$6=, $0, $pop2
+	i32.add 	$7=, $0, $pop2
 	i32.const	$push3=, -2
-	i32.add 	$7=, $5, $pop3
-	i32.const	$push13=, 8
-	i32.add 	$5=, $2, $pop13
+	i32.add 	$5=, $5, $pop3
 	i32.const	$push12=, 8
-	i32.add 	$1=, $1, $pop12
+	i32.add 	$2=, $2, $pop12
+	i32.const	$push11=, 8
+	i32.add 	$1=, $1, $pop11
 	f64.load	$8=, 8($0)
 	f64.load	$9=, 0($0)
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	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 	$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
+	f64.mul 	$6=, $8, $4
+	f64.load	$8=, 0($7)
+	f64.load	$push5=, 0($1)
+	f64.load	$push4=, 0($2)
+	f64.add 	$push6=, $pop5, $pop4
+	f64.add 	$push7=, $pop6, $9
+	f64.add 	$push8=, $pop7, $8
+	f64.mul 	$push9=, $pop8, $3
+	f64.add 	$9=, $6, $pop9
+	i32.const	$push17=, -8
+	i32.add 	$push10=, $7, $pop17
+	f64.store	0($pop10), $9
+	i32.const	$push16=, 8
+	i32.add 	$7=, $7, $pop16
+	i32.const	$push15=, -1
+	i32.add 	$5=, $5, $pop15
+	i32.const	$push14=, 8
+	i32.add 	$2=, $2, $pop14
+	i32.const	$push13=, 8
+	i32.add 	$1=, $1, $pop13
+	br_if   	0, $5           # 0: up to label1
 .LBB0_3:                                # %for.end
 	end_loop
 	end_block                       # label0:
@@ -65,14 +62,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, f64, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 768
-	i32.sub 	$push34=, $pop16, $pop18
-	tee_local	$push33=, $6=, $pop34
-	i32.store	__stack_pointer($pop19), $pop33
+	i32.sub 	$6=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $6
 	i32.const	$5=, 0
 	i32.const	$push23=, 512
 	i32.add 	$push24=, $6, $pop23
@@ -84,34 +80,31 @@ main:                                   # @main
 .LBB1_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label2:
-	i32.const	$push48=, 7
-	i32.and 	$push47=, $5, $pop48
-	tee_local	$push46=, $0=, $pop47
-	f64.convert_s/i32	$push0=, $pop46
+	i32.const	$push40=, 7
+	i32.and 	$0=, $5, $pop40
+	f64.convert_s/i32	$push0=, $0
 	f64.store	0($2), $pop0
-	i32.const	$push45=, -4
-	i32.add 	$push1=, $0, $pop45
+	i32.const	$push39=, -4
+	i32.add 	$push1=, $0, $pop39
 	f64.convert_s/i32	$push2=, $pop1
 	f64.store	0($3), $pop2
-	i32.const	$push44=, 3
-	i32.and 	$push3=, $5, $pop44
-	f64.convert_s/i32	$push43=, $pop3
-	tee_local	$push42=, $1=, $pop43
-	f64.add 	$push4=, $pop42, $1
+	i32.const	$push38=, 3
+	i32.and 	$push3=, $5, $pop38
+	f64.convert_s/i32	$1=, $pop3
+	f64.add 	$push4=, $1, $1
 	f64.store	0($4), $pop4
-	i32.const	$push41=, 8
-	i32.add 	$2=, $2, $pop41
-	i32.const	$push40=, 8
-	i32.add 	$3=, $3, $pop40
-	i32.const	$push39=, 8
-	i32.add 	$4=, $4, $pop39
-	i32.const	$push38=, 1
-	i32.add 	$push37=, $5, $pop38
-	tee_local	$push36=, $5=, $pop37
-	i32.const	$push35=, 32
-	i32.ne  	$push5=, $pop36, $pop35
+	i32.const	$push37=, 8
+	i32.add 	$2=, $2, $pop37
+	i32.const	$push36=, 8
+	i32.add 	$3=, $3, $pop36
+	i32.const	$push35=, 8
+	i32.add 	$4=, $4, $pop35
+	i32.const	$push34=, 1
+	i32.add 	$5=, $5, $pop34
+	i32.const	$push33=, 32
+	i32.ne  	$push5=, $5, $pop33
 	br_if   	0, $pop5        # 0: up to label2
-# BB#2:                                 # %for.end
+# %bb.2:                                # %for.end
 	end_loop
 	i32.const	$push27=, 512
 	i32.add 	$push28=, $6, $pop27
@@ -121,8 +114,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   	
@@ -131,22 +124,21 @@ main:                                   # @main
 	i32.add 	$push32=, $6, $pop31
 	i32.add 	$push11=, $pop32, $5
 	f64.load	$push12=, 0($pop11)
-	i32.const	$push49=, expected
-	i32.add 	$push9=, $5, $pop49
+	i32.const	$push41=, expected
+	i32.add 	$push9=, $5, $pop41
 	f64.load	$push10=, 0($pop9)
 	f64.ne  	$push13=, $pop12, $pop10
 	br_if   	1, $pop13       # 1: down to label3
-# BB#4:                                 # %for.cond9
+# %bb.4:                                # %for.cond9
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push54=, 8
-	i32.add 	$5=, $5, $pop54
-	i32.const	$push53=, 1
-	i32.add 	$push52=, $4, $pop53
-	tee_local	$push51=, $4=, $pop52
-	i32.const	$push50=, 30
-	i32.le_u	$push14=, $pop51, $pop50
+	i32.const	$push44=, 1
+	i32.add 	$4=, $4, $pop44
+	i32.const	$push43=, 8
+	i32.add 	$5=, $5, $pop43
+	i32.const	$push42=, 31
+	i32.le_u	$push14=, $4, $pop42
 	br_if   	0, $pop14       # 0: up to label4
-# BB#5:                                 # %for.end19
+# %bb.5:                                # %for.end19
 	end_loop
 	i32.const	$push22=, 0
 	i32.const	$push20=, 768
@@ -203,5 +195,5 @@ expected:
 	.size	expected, 256
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr59747.c.s b/test/torture-s/pr59747.c.s
index 4d6894d19..1df3a1d96 100644
--- a/test/torture-s/pr59747.c.s
+++ b/test/torture-s/pr59747.c.s
@@ -7,7 +7,7 @@
 fn1:                                    # @fn1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 2
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, a
@@ -25,7 +25,7 @@ fn1:                                    # @fn1
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.const	$push0=, 1
 	i32.store	a($pop16), $pop0
@@ -34,22 +34,21 @@ main:                                   # @main
 	block   	
 	i32.const	$push14=, 0
 	i32.load	$push1=, c($pop14)
-	i32.eqz 	$push22=, $pop1
-	br_if   	0, $pop22       # 0: down to label0
-# BB#1:                                 # %if.then
-	i32.const	$push19=, 0
+	i32.eqz 	$push20=, $pop1
+	br_if   	0, $pop20       # 0: down to label0
+# %bb.1:                                # %if.then
 	i32.const	$push2=, -1
-	i32.add 	$push18=, $0, $pop2
-	tee_local	$push17=, $0=, $pop18
-	i32.store16	e($pop19), $pop17
+	i32.add 	$0=, $0, $pop2
+	i32.const	$push17=, 0
+	i32.store16	e($pop17), $0
 .LBB1_2:                                # %if.end
 	end_block                       # label0:
-	i32.const	$push21=, 0
+	i32.const	$push19=, 0
 	i32.const	$push3=, 16
 	i32.shl 	$push4=, $0, $pop3
-	i32.const	$push20=, 16
-	i32.shr_s	$push5=, $pop4, $pop20
-	i32.store	d($pop21), $pop5
+	i32.const	$push18=, 16
+	i32.shr_s	$push5=, $pop4, $pop18
+	i32.store	d($pop19), $pop5
 	block   	
 	i64.extend_u/i32	$push6=, $0
 	i64.const	$push7=, 48
@@ -59,7 +58,7 @@ main:                                   # @main
 	i32.wrap/i64	$push11=, $pop10
 	i32.call	$push12=, fn1@FUNCTION, $pop11
 	br_if   	0, $pop12       # 0: down to label1
-# BB#3:                                 # %if.end5
+# %bb.3:                                # %if.end5
 	i32.const	$push13=, 0
 	call    	exit@FUNCTION, $pop13
 	unreachable
@@ -108,6 +107,6 @@ d:
 	.size	d, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/pr60017.c.s b/test/torture-s/pr60017.c.s
index 8b55f0bd1..18ebc09c7 100644
--- a/test/torture-s/pr60017.c.s
+++ b/test/torture-s/pr60017.c.s
@@ -6,7 +6,7 @@
 	.type	func,@function
 func:                                   # @func
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 8
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 0
@@ -26,14 +26,14 @@ func:                                   # @func
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load16_u	$push0=, x+12($pop3)
 	i32.const	$push1=, 9
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -62,5 +62,5 @@ x:
 	.size	x, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr60062.c.s b/test/torture-s/pr60062.c.s
index 34ac83d65..b4709ef20 100644
--- a/test/torture-s/pr60062.c.s
+++ b/test/torture-s/pr60062.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -23,4 +23,4 @@ a:
 	.size	a, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr60072.c.s b/test/torture-s/pr60072.c.s
index 2ccfaa45e..958954364 100644
--- a/test/torture-s/pr60072.c.s
+++ b/test/torture-s/pr60072.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 2
 	i32.store	c($pop1), $pop0
@@ -26,4 +26,4 @@ c:
 	.size	c, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr60454.c.s b/test/torture-s/pr60454.c.s
index ef2ba828a..4c5b1ff8c 100644
--- a/test/torture-s/pr60454.c.s
+++ b/test/torture-s/pr60454.c.s
@@ -8,13 +8,12 @@ fake_swap32:                            # @fake_swap32
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 65280
-	i32.and 	$push16=, $0, $pop2
-	tee_local	$push15=, $1=, $pop16
+	i32.and 	$1=, $0, $pop2
 	i32.const	$push0=, 24
 	i32.shl 	$push1=, $0, $pop0
-	i32.or  	$push3=, $pop15, $pop1
+	i32.or  	$push3=, $1, $pop1
 	i32.const	$push14=, 24
 	i32.shr_u	$push4=, $0, $pop14
 	i32.or  	$push5=, $pop3, $pop4
@@ -37,14 +36,14 @@ fake_swap32:                            # @fake_swap32
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 305419896
 	i32.call	$push1=, fake_swap32@FUNCTION, $pop0
 	i32.const	$push2=, 2018934290
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -56,5 +55,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr60960.c.s b/test/torture-s/pr60960.c.s
index 7d0d87b8f..74d8fa154 100644
--- a/test/torture-s/pr60960.c.s
+++ b/test/torture-s/pr60960.c.s
@@ -6,7 +6,7 @@
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 254
@@ -14,25 +14,21 @@ f1:                                     # @f1
 	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=, 254
-	i32.and 	$push8=, $3, $pop21
-	i32.const	$push20=, 1
-	i32.shr_u	$push9=, $pop8, $pop20
-	i32.store8	0($pop7), $pop9
-	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	$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
+	i32.const	$push17=, 254
+	i32.and 	$push6=, $3, $pop17
+	i32.const	$push16=, 1
+	i32.shr_u	$push7=, $pop6, $pop16
+	i32.store8	2($0), $pop7
+	i32.const	$push15=, 254
+	i32.and 	$push8=, $2, $pop15
+	i32.const	$push14=, 1
+	i32.shr_u	$push9=, $pop8, $pop14
+	i32.store8	1($0), $pop9
+	i32.const	$push13=, 254
+	i32.and 	$push10=, $1, $pop13
+	i32.const	$push12=, 1
+	i32.shr_u	$push11=, $pop10, $pop12
+	i32.store8	0($0), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -44,7 +40,7 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 3
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 254
@@ -52,25 +48,21 @@ f2:                                     # @f2
 	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=, 254
-	i32.and 	$push8=, $3, $pop21
-	i32.const	$push20=, 1
-	i32.shr_u	$push9=, $pop8, $pop20
-	i32.store8	0($pop7), $pop9
-	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	$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
+	i32.const	$push17=, 254
+	i32.and 	$push6=, $3, $pop17
+	i32.const	$push16=, 1
+	i32.shr_u	$push7=, $pop6, $pop16
+	i32.store8	2($0), $pop7
+	i32.const	$push15=, 254
+	i32.and 	$push8=, $2, $pop15
+	i32.const	$push14=, 1
+	i32.shr_u	$push9=, $pop8, $pop14
+	i32.store8	1($0), $pop9
+	i32.const	$push13=, 254
+	i32.and 	$push10=, $1, $pop13
+	i32.const	$push12=, 1
+	i32.shr_u	$push11=, $pop10, $pop12
+	i32.store8	0($0), $pop11
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -82,37 +74,33 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 3
 	i32.add 	$push5=, $0, $pop4
 	i32.const	$push0=, 255
 	i32.and 	$push2=, $4, $pop0
-	i32.const	$push25=, 255
-	i32.and 	$push1=, $8, $pop25
+	i32.const	$push21=, 255
+	i32.and 	$push1=, $8, $pop21
 	i32.div_u	$push3=, $pop2, $pop1
 	i32.store8	0($pop5), $pop3
-	i32.const	$push9=, 2
-	i32.add 	$push10=, $0, $pop9
-	i32.const	$push24=, 255
-	i32.and 	$push7=, $3, $pop24
-	i32.const	$push23=, 255
-	i32.and 	$push6=, $7, $pop23
-	i32.div_u	$push8=, $pop7, $pop6
-	i32.store8	0($pop10), $pop8
-	i32.const	$push14=, 1
-	i32.add 	$push15=, $0, $pop14
-	i32.const	$push22=, 255
-	i32.and 	$push12=, $2, $pop22
-	i32.const	$push21=, 255
-	i32.and 	$push11=, $6, $pop21
-	i32.div_u	$push13=, $pop12, $pop11
-	i32.store8	0($pop15), $pop13
 	i32.const	$push20=, 255
-	i32.and 	$push17=, $1, $pop20
+	i32.and 	$push7=, $3, $pop20
 	i32.const	$push19=, 255
-	i32.and 	$push16=, $5, $pop19
-	i32.div_u	$push18=, $pop17, $pop16
-	i32.store8	0($0), $pop18
+	i32.and 	$push6=, $7, $pop19
+	i32.div_u	$push8=, $pop7, $pop6
+	i32.store8	2($0), $pop8
+	i32.const	$push18=, 255
+	i32.and 	$push10=, $2, $pop18
+	i32.const	$push17=, 255
+	i32.and 	$push9=, $6, $pop17
+	i32.div_u	$push11=, $pop10, $pop9
+	i32.store8	1($0), $pop11
+	i32.const	$push16=, 255
+	i32.and 	$push13=, $1, $pop16
+	i32.const	$push15=, 255
+	i32.and 	$push12=, $5, $pop15
+	i32.div_u	$push14=, $pop13, $pop12
+	i32.store8	0($0), $pop14
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -125,14 +113,13 @@ f3:                                     # @f3
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push13=, 0
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push29=, $pop10, $pop12
-	tee_local	$push28=, $0=, $pop29
-	i32.store	__stack_pointer($pop13), $pop28
+	i32.sub 	$0=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $0
 	i32.const	$push17=, 12
 	i32.add 	$push18=, $0, $pop17
 	i32.const	$push27=, 5
@@ -145,35 +132,35 @@ main:                                   # @main
 	i32.const	$push23=, 33686018
 	i32.ne  	$push1=, $pop0, $pop23
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push19=, 8
 	i32.add 	$push20=, $0, $pop19
-	i32.const	$push34=, 5
-	i32.const	$push33=, 5
 	i32.const	$push32=, 5
 	i32.const	$push31=, 5
-	call    	f2@FUNCTION, $pop20, $pop34, $pop33, $pop32, $pop31
+	i32.const	$push30=, 5
+	i32.const	$push29=, 5
+	call    	f2@FUNCTION, $pop20, $pop32, $pop31, $pop30, $pop29
 	i32.load	$push2=, 8($0)
-	i32.const	$push30=, 33686018
-	i32.ne  	$push3=, $pop2, $pop30
+	i32.const	$push28=, 33686018
+	i32.ne  	$push3=, $pop2, $pop28
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push21=, 4
 	i32.add 	$push22=, $0, $pop21
 	i32.const	$push5=, 5
-	i32.const	$push40=, 5
-	i32.const	$push39=, 5
 	i32.const	$push38=, 5
+	i32.const	$push37=, 5
+	i32.const	$push36=, 5
 	i32.const	$push4=, 2
-	i32.const	$push37=, 2
-	i32.const	$push36=, 2
 	i32.const	$push35=, 2
-	call    	f3@FUNCTION, $pop22, $pop5, $pop40, $pop39, $pop38, $pop4, $pop37, $pop36, $pop35
+	i32.const	$push34=, 2
+	i32.const	$push33=, 2
+	call    	f3@FUNCTION, $pop22, $pop5, $pop38, $pop37, $pop36, $pop4, $pop35, $pop34, $pop33
 	i32.load	$push7=, 4($0)
 	i32.const	$push6=, 33686018
 	i32.ne  	$push8=, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push16=, 0
 	i32.const	$push14=, 16
 	i32.add 	$push15=, $0, $pop14
@@ -189,5 +176,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end3-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61306-1.c.s b/test/torture-s/pr61306-1.c.s
index c1e01adb0..a390223f5 100644
--- a/test/torture-s/pr61306-1.c.s
+++ b/test/torture-s/pr61306-1.c.s
@@ -7,7 +7,7 @@
 fake_bswap32:                           # @fake_bswap32
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shr_s	$push2=, $0, $pop0
 	i32.const	$push14=, 24
@@ -34,14 +34,14 @@ fake_bswap32:                           # @fake_bswap32
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -2023406815
 	i32.call	$push1=, fake_bswap32@FUNCTION, $pop0
 	i32.const	$push2=, -121
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -53,5 +53,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61306-2.c.s b/test/torture-s/pr61306-2.c.s
index 38f468dec..6312c5632 100644
--- a/test/torture-s/pr61306-2.c.s
+++ b/test/torture-s/pr61306-2.c.s
@@ -7,7 +7,7 @@
 fake_bswap32:                           # @fake_bswap32
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shr_u	$push2=, $0, $pop0
 	i32.const	$push16=, 24
@@ -36,14 +36,14 @@ fake_bswap32:                           # @fake_bswap32
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -2122153084
 	i32.call	$push1=, fake_bswap32@FUNCTION, $pop0
 	i32.const	$push2=, -8158591
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	return  	$pop4
 .LBB1_2:                                # %if.then
@@ -55,5 +55,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61306-3.c.s b/test/torture-s/pr61306-3.c.s
index ca57db8a5..3f5fa3c0c 100644
--- a/test/torture-s/pr61306-3.c.s
+++ b/test/torture-s/pr61306-3.c.s
@@ -7,27 +7,25 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
-	i32.const	$push11=, 0
-	i32.load16_s	$push10=, a($pop11)
-	tee_local	$push9=, $0=, $pop10
-	i32.store8	c($pop12), $pop9
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
+	i32.load16_s	$0=, a($pop8)
+	i32.const	$push7=, 0
+	i32.store8	c($pop7), $0
 	i32.const	$push0=, 24
 	i32.shl 	$push1=, $0, $pop0
-	i32.const	$push7=, 24
-	i32.shr_s	$push2=, $pop1, $pop7
-	i32.or  	$push6=, $0, $pop2
-	tee_local	$push5=, $0=, $pop6
-	i32.store	b($pop8), $pop5
+	i32.const	$push6=, 24
+	i32.shr_s	$push2=, $pop1, $pop6
+	i32.or  	$0=, $0, $pop2
+	i32.const	$push5=, 0
+	i32.store	b($pop5), $0
 	block   	
 	i32.const	$push3=, -1
 	i32.ne  	$push4=, $0, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push13=, 0
-	return  	$pop13
+# %bb.1:                                # %if.end
+	i32.const	$push9=, 0
+	return  	$pop9
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -63,5 +61,5 @@ b:
 	.size	b, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61375.c.s b/test/torture-s/pr61375.c.s
index c9bb9a0f3..1ba59f0fe 100644
--- a/test/torture-s/pr61375.c.s
+++ b/test/torture-s/pr61375.c.s
@@ -7,7 +7,7 @@
 uint128_central_bitsi_ior:              # @uint128_central_bitsi_ior
 	.param  	i64, i64, i64
 	.result 	i64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push2=, 56
 	i64.shr_u	$push3=, $0, $pop2
 	i64.const	$push0=, 8
@@ -28,7 +28,7 @@ uint128_central_bitsi_ior:              # @uint128_central_bitsi_ior
 main:                                   # @main
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push2=, 0
 	i64.const	$push1=, 1
@@ -37,7 +37,7 @@ main:                                   # @main
 	i64.const	$push4=, 258
 	i64.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_2:                                # %if.then
@@ -49,5 +49,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61673.c.s b/test/torture-s/pr61673.c.s
index 36fdb5218..a043b1ff2 100644
--- a/test/torture-s/pr61673.c.s
+++ b/test/torture-s/pr61673.c.s
@@ -6,13 +6,13 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, -121
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 84
 	i32.ne  	$push3=, $0, $pop2
 	br_if   	1, $pop3        # 1: down to label0
@@ -33,14 +33,13 @@ bar:                                    # @bar
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load8_s	$0=, 0($0)
 	block   	
-	i32.load8_s	$push4=, 0($0)
-	tee_local	$push3=, $0=, $pop4
 	i32.const	$push0=, -1
-	i32.le_s	$push1=, $pop3, $pop0
+	i32.le_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	call    	bar@FUNCTION, $0
 	return
 .LBB1_2:                                # %if.then
@@ -59,14 +58,13 @@ foo:                                    # @foo
 	.type	baz,@function
 baz:                                    # @baz
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.load8_s	$0=, 0($0)
 	block   	
-	i32.load8_s	$push4=, 0($0)
-	tee_local	$push3=, $0=, $pop4
 	i32.const	$push0=, -1
-	i32.le_s	$push1=, $pop3, $pop0
+	i32.le_s	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label3
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB2_2:                                # %if.then
 	end_block                       # label3:
@@ -83,7 +81,7 @@ baz:                                    # @baz
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push19=, 0
 	i32.const	$push0=, 33
 	i32.store8	e($pop19), $pop0
@@ -95,7 +93,7 @@ main:                                   # @main
 	i32.const	$push17=, 33
 	i32.ne  	$push3=, $pop2, $pop17
 	br_if   	0, $pop3        # 0: down to label4
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, main.c+1
 	call    	foo@FUNCTION, $pop4
 	i32.const	$push20=, 0
@@ -103,7 +101,7 @@ main:                                   # @main
 	i32.const	$push6=, 135
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label4
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push23=, 0
 	i32.const	$push8=, 33
 	i32.store8	e($pop23), $pop8
@@ -114,7 +112,7 @@ main:                                   # @main
 	i32.const	$push21=, 33
 	i32.ne  	$push11=, $pop10, $pop21
 	br_if   	0, $pop11       # 0: down to label4
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push12=, main.c+1
 	call    	baz@FUNCTION, $pop12
 	i32.const	$push24=, 0
@@ -122,7 +120,7 @@ main:                                   # @main
 	i32.const	$push14=, 135
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label4
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push16=, 0
 	return  	$pop16
 .LBB3_5:                                # %if.then
@@ -148,5 +146,5 @@ main.c:
 	.size	main.c, 2
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr61725.c.s b/test/torture-s/pr61725.c.s
index a627fd53f..07614e287 100644
--- a/test/torture-s/pr61725.c.s
+++ b/test/torture-s/pr61725.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr63209.c.s b/test/torture-s/pr63209.c.s
index 7df5f4370..b38269158 100644
--- a/test/torture-s/pr63209.c.s
+++ b/test/torture-s/pr63209.c.s
@@ -7,9 +7,8 @@
 Predictor:                              # @Predictor
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
-	i32.load	$push17=, 4($1)
-	tee_local	$push16=, $1=, $pop17
+# %bb.0:                                # %entry
+	i32.load	$1=, 4($1)
 	i32.const	$push2=, 8
 	i32.shr_u	$push3=, $0, $pop2
 	i32.const	$push0=, 255
@@ -25,7 +24,7 @@ Predictor:                              # @Predictor
 	i32.const	$push12=, 255
 	i32.and 	$push9=, $pop8, $pop12
 	i32.gt_s	$push10=, $pop7, $pop9
-	i32.select	$push11=, $0, $pop16, $pop10
+	i32.select	$push11=, $0, $1, $pop10
                                         # fallthrough-return: $pop11
 	.endfunc
 .Lfunc_end0:
@@ -37,7 +36,7 @@ Predictor:                              # @Predictor
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, -8684677
 	i32.const	$push0=, main.top
 	i32.call	$push2=, Predictor@FUNCTION, $pop1, $pop0
@@ -57,4 +56,4 @@ main.top:
 	.size	main.top, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pr63302.c.s b/test/torture-s/pr63302.c.s
index ed8ee998d..a49969693 100644
--- a/test/torture-s/pr63302.c.s
+++ b/test/torture-s/pr63302.c.s
@@ -7,11 +7,10 @@
 foo:                                    # @foo
 	.param  	i64, i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push2=, -9223372036854773761
-	i64.and 	$push11=, $0, $pop2
-	tee_local	$push10=, $0=, $pop11
-	i64.or  	$push7=, $pop10, $1
+	i64.and 	$0=, $0, $pop2
+	i64.or  	$push7=, $0, $1
 	i64.eqz 	$push8=, $pop7
 	i64.const	$push3=, -9223372036854775808
 	i64.xor 	$push4=, $0, $pop3
@@ -32,11 +31,10 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.const	$push0=, -2147481601
-	i64.and 	$push6=, $0, $pop0
-	tee_local	$push5=, $0=, $pop6
-	i64.eqz 	$push3=, $pop5
+	i64.and 	$0=, $0, $pop0
+	i64.eqz 	$push3=, $0
 	i64.const	$push1=, -2147483648
 	i64.eq  	$push2=, $0, $pop1
 	i32.or  	$push4=, $pop3, $pop2
@@ -51,7 +49,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i64.const	$push52=, 0
 	i64.const	$push51=, 0
@@ -59,97 +57,97 @@ main:                                   # @main
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i64.const	$push3=, 1
 	i64.const	$push53=, 0
 	i32.call	$push4=, foo@FUNCTION, $pop3, $pop53
 	br_if   	0, $pop4        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false3
+# %bb.2:                                # %lor.lhs.false3
 	i64.const	$push5=, 2048
 	i64.const	$push54=, 0
 	i32.call	$push6=, foo@FUNCTION, $pop5, $pop54
 	i32.const	$push7=, 1
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %lor.lhs.false6
+# %bb.3:                                # %lor.lhs.false6
 	i64.const	$push9=, 2049
 	i64.const	$push55=, 0
 	i32.call	$push10=, foo@FUNCTION, $pop9, $pop55
 	br_if   	0, $pop10       # 0: down to label0
-# BB#4:                                 # %lor.lhs.false9
+# %bb.4:                                # %lor.lhs.false9
 	i64.const	$push56=, -9223372036854775808
 	i64.const	$push11=, 0
 	i32.call	$push12=, foo@FUNCTION, $pop56, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false12
+# %bb.5:                                # %lor.lhs.false12
 	i64.const	$push58=, -9223372036854775808
 	i64.const	$push57=, -1
 	i32.call	$push13=, foo@FUNCTION, $pop58, $pop57
 	i32.const	$push14=, 1
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#6:                                 # %lor.lhs.false15
+# %bb.6:                                # %lor.lhs.false15
 	i64.const	$push16=, -9223372036854775807
 	i64.const	$push59=, -1
 	i32.call	$push17=, foo@FUNCTION, $pop16, $pop59
 	br_if   	0, $pop17       # 0: down to label0
-# BB#7:                                 # %lor.lhs.false18
+# %bb.7:                                # %lor.lhs.false18
 	i64.const	$push18=, -9223372036854773760
 	i64.const	$push60=, -1
 	i32.call	$push19=, foo@FUNCTION, $pop18, $pop60
 	i32.const	$push20=, 1
 	i32.ne  	$push21=, $pop19, $pop20
 	br_if   	0, $pop21       # 0: down to label0
-# BB#8:                                 # %lor.lhs.false21
+# %bb.8:                                # %lor.lhs.false21
 	i64.const	$push22=, -9223372036854773759
 	i64.const	$push61=, -1
 	i32.call	$push23=, foo@FUNCTION, $pop22, $pop61
 	br_if   	0, $pop23       # 0: down to label0
-# BB#9:                                 # %if.end
+# %bb.9:                                # %if.end
 	i64.const	$push24=, 0
 	i32.call	$push25=, bar@FUNCTION, $pop24
 	i32.const	$push26=, 1
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#10:                                # %lor.lhs.false26
+# %bb.10:                               # %lor.lhs.false26
 	i64.const	$push28=, 1
 	i32.call	$push29=, bar@FUNCTION, $pop28
 	br_if   	0, $pop29       # 0: down to label0
-# BB#11:                                # %lor.lhs.false29
+# %bb.11:                               # %lor.lhs.false29
 	i64.const	$push30=, 2048
 	i32.call	$push31=, bar@FUNCTION, $pop30
 	i32.const	$push32=, 1
 	i32.ne  	$push33=, $pop31, $pop32
 	br_if   	0, $pop33       # 0: down to label0
-# BB#12:                                # %lor.lhs.false32
+# %bb.12:                               # %lor.lhs.false32
 	i64.const	$push34=, 2049
 	i32.call	$push35=, bar@FUNCTION, $pop34
 	br_if   	0, $pop35       # 0: down to label0
-# BB#13:                                # %lor.lhs.false35
+# %bb.13:                               # %lor.lhs.false35
 	i64.const	$push36=, 2147483648
 	i32.call	$push37=, bar@FUNCTION, $pop36
 	br_if   	0, $pop37       # 0: down to label0
-# BB#14:                                # %lor.lhs.false38
+# %bb.14:                               # %lor.lhs.false38
 	i64.const	$push38=, -2147483648
 	i32.call	$push39=, bar@FUNCTION, $pop38
 	i32.const	$push40=, 1
 	i32.ne  	$push41=, $pop39, $pop40
 	br_if   	0, $pop41       # 0: down to label0
-# BB#15:                                # %lor.lhs.false41
+# %bb.15:                               # %lor.lhs.false41
 	i64.const	$push42=, -2147483647
 	i32.call	$push43=, bar@FUNCTION, $pop42
 	br_if   	0, $pop43       # 0: down to label0
-# BB#16:                                # %lor.lhs.false44
+# %bb.16:                               # %lor.lhs.false44
 	i64.const	$push44=, -2147481600
 	i32.call	$push45=, bar@FUNCTION, $pop44
 	i32.const	$push46=, 1
 	i32.ne  	$push47=, $pop45, $pop46
 	br_if   	0, $pop47       # 0: down to label0
-# BB#17:                                # %lor.lhs.false47
+# %bb.17:                               # %lor.lhs.false47
 	i64.const	$push48=, -2147481599
 	i32.call	$push49=, bar@FUNCTION, $pop48
 	br_if   	0, $pop49       # 0: down to label0
-# BB#18:                                # %if.end51
+# %bb.18:                               # %if.end51
 	i32.const	$push50=, 0
 	return  	$pop50
 .LBB2_19:                               # %if.then
@@ -161,5 +159,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr63659.c.s b/test/torture-s/pr63659.c.s
index e46c5e538..c948a6e08 100644
--- a/test/torture-s/pr63659.c.s
+++ b/test/torture-s/pr63659.c.s
@@ -7,53 +7,52 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push8=, 0
 	i32.load	$push0=, a($pop8)
-	i32.eqz 	$push23=, $pop0
-	br_if   	0, $pop23       # 0: down to label0
-# BB#1:                                 # %for.cond
+	i32.eqz 	$push21=, $pop0
+	br_if   	0, $pop21       # 0: down to label0
+# %bb.1:                                # %while.body.lr.ph
 	i32.const	$push10=, 0
 	i32.const	$push9=, 0
 	i32.store	a($pop10), $pop9
 .LBB0_2:                                # %while.end
 	end_block                       # label0:
-	i32.const	$push15=, 0
-	i32.const	$push14=, 0
-	i32.load8_s	$push2=, c($pop14)
 	i32.const	$push13=, 0
-	i32.load	$push1=, h($pop13)
-	i32.shr_s	$push12=, $pop2, $pop1
-	tee_local	$push11=, $0=, $pop12
-	i32.store	g($pop15), $pop11
+	i32.load8_s	$push2=, c($pop13)
+	i32.const	$push12=, 0
+	i32.load	$push1=, h($pop12)
+	i32.shr_s	$0=, $pop2, $pop1
+	i32.const	$push11=, 0
+	i32.store	g($pop11), $0
 	i32.const	$1=, 255
 	block   	
-	i32.eqz 	$push24=, $0
-	br_if   	0, $pop24       # 0: down to label1
-# BB#3:                                 # %cond.false
+	i32.eqz 	$push22=, $0
+	br_if   	0, $pop22       # 0: down to label1
+# %bb.3:                                # %cond.false
 	i32.const	$push3=, -1
 	i32.rem_s	$1=, $pop3, $0
 .LBB0_4:                                # %cond.end
 	end_block                       # label1:
-	i32.const	$push21=, 0
-	i32.load	$push5=, d($pop21)
-	i32.const	$push20=, 255
-	i32.and 	$push4=, $1, $pop20
-	i32.store	0($pop5), $pop4
 	i32.const	$push19=, 0
-	i32.store8	e($pop19), $1
-	i32.const	$push18=, 0
-	i32.store8	f($pop18), $1
-	block   	
+	i32.load	$push5=, d($pop19)
+	i32.const	$push18=, 255
+	i32.and 	$push4=, $1, $pop18
+	i32.store	0($pop5), $pop4
 	i32.const	$push17=, 0
-	i32.load	$push6=, b($pop17)
-	i32.const	$push16=, 255
-	i32.ne  	$push7=, $pop6, $pop16
+	i32.store8	e($pop17), $1
+	i32.const	$push16=, 0
+	i32.store8	f($pop16), $1
+	block   	
+	i32.const	$push15=, 0
+	i32.load	$push6=, b($pop15)
+	i32.const	$push14=, 255
+	i32.ne  	$push7=, $pop6, $pop14
 	br_if   	0, $pop7        # 0: down to label2
-# BB#5:                                 # %if.end23
-	i32.const	$push22=, 0
-	return  	$pop22
+# %bb.5:                                # %if.end23
+	i32.const	$push20=, 0
+	return  	$pop20
 .LBB0_6:                                # %if.then22
 	end_block                       # label2:
 	call    	abort@FUNCTION
@@ -142,5 +141,5 @@ e:
 	.size	e, 1
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pr7284-1.c.s b/test/torture-s/pr7284-1.c.s
index 706108cba..529b3734d 100644
--- a/test/torture-s/pr7284-1.c.s
+++ b/test/torture-s/pr7284-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 24
 	i32.shl 	$push1=, $0, $pop0
 	i32.const	$push2=, 8388608
@@ -23,7 +23,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 0
 	i32.load	$push0=, x($pop5)
@@ -32,7 +32,7 @@ main:                                   # @main
 	i32.const	$push3=, 128
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 0
 	call    	exit@FUNCTION, $pop6
 	unreachable
@@ -54,6 +54,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0683bc567..6ade154f1 100644
--- a/test/torture-s/printf-1.c.s
+++ b/test/torture-s/printf-1.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push45=, 0
+# %bb.0:                                # %entry
 	i32.const	$push43=, 0
 	i32.load	$push42=, __stack_pointer($pop43)
 	i32.const	$push44=, 176
-	i32.sub 	$push74=, $pop42, $pop44
-	tee_local	$push73=, $0=, $pop74
-	i32.store	__stack_pointer($pop45), $pop73
+	i32.sub 	$0=, $pop42, $pop44
+	i32.const	$push45=, 0
+	i32.store	__stack_pointer($pop45), $0
 	i32.const	$push72=, .Lstr
 	i32.const	$push71=, 0
 	i32.call	$drop=, printf@FUNCTION, $pop72, $pop71
@@ -25,16 +24,16 @@ main:                                   # @main
 	i32.const	$push1=, 5
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push76=, .Lstr
-	i32.call	$drop=, puts@FUNCTION, $pop76
+# %bb.1:                                # %if.end
+	i32.const	$push74=, .Lstr
+	i32.call	$drop=, puts@FUNCTION, $pop74
 	i32.const	$push3=, .L.str.1
-	i32.const	$push75=, 0
-	i32.call	$push4=, printf@FUNCTION, $pop3, $pop75
+	i32.const	$push73=, 0
+	i32.call	$push4=, printf@FUNCTION, $pop3, $pop73
 	i32.const	$push5=, 6
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push7=, 97
 	i32.call	$drop=, putchar@FUNCTION, $pop7
 	i32.const	$push9=, .L.str.2
@@ -43,69 +42,69 @@ main:                                   # @main
 	i32.const	$push11=, 1
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#3:                                 # %if.end16
+# %bb.3:                                # %if.end16
 	i32.const	$push13=, .Lstr
 	i32.store	160($0), $pop13
-	i32.const	$push79=, .L.str.4
+	i32.const	$push77=, .L.str.4
 	i32.const	$push49=, 160
 	i32.add 	$push50=, $0, $pop49
-	i32.call	$drop=, printf@FUNCTION, $pop79, $pop50
-	i32.const	$push78=, .Lstr
-	i32.store	144($0), $pop78
-	i32.const	$push77=, .L.str.4
+	i32.call	$drop=, printf@FUNCTION, $pop77, $pop50
+	i32.const	$push76=, .Lstr
+	i32.store	144($0), $pop76
+	i32.const	$push75=, .L.str.4
 	i32.const	$push51=, 144
 	i32.add 	$push52=, $0, $pop51
-	i32.call	$push14=, printf@FUNCTION, $pop77, $pop52
+	i32.call	$push14=, printf@FUNCTION, $pop75, $pop52
 	i32.const	$push15=, 5
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#4:                                 # %if.end21
+# %bb.4:                                # %if.end21
 	i32.const	$push17=, .L.str.1
 	i32.store	128($0), $pop17
-	i32.const	$push82=, .L.str.4
+	i32.const	$push80=, .L.str.4
 	i32.const	$push53=, 128
 	i32.add 	$push54=, $0, $pop53
-	i32.call	$drop=, printf@FUNCTION, $pop82, $pop54
-	i32.const	$push81=, .L.str.1
-	i32.store	112($0), $pop81
-	i32.const	$push80=, .L.str.4
+	i32.call	$drop=, printf@FUNCTION, $pop80, $pop54
+	i32.const	$push79=, .L.str.1
+	i32.store	112($0), $pop79
+	i32.const	$push78=, .L.str.4
 	i32.const	$push55=, 112
 	i32.add 	$push56=, $0, $pop55
-	i32.call	$push18=, printf@FUNCTION, $pop80, $pop56
+	i32.call	$push18=, printf@FUNCTION, $pop78, $pop56
 	i32.const	$push19=, 6
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#5:                                 # %if.end26
+# %bb.5:                                # %if.end26
 	i32.const	$push21=, 97
 	i32.call	$drop=, putchar@FUNCTION, $pop21
 	i32.const	$push22=, .L.str.2
 	i32.store	96($0), $pop22
-	i32.const	$push83=, .L.str.4
+	i32.const	$push81=, .L.str.4
 	i32.const	$push57=, 96
 	i32.add 	$push58=, $0, $pop57
-	i32.call	$push23=, printf@FUNCTION, $pop83, $pop58
+	i32.call	$push23=, printf@FUNCTION, $pop81, $pop58
 	i32.const	$push24=, 1
 	i32.ne  	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label0
-# BB#6:                                 # %if.end31
+# %bb.6:                                # %if.end31
 	i32.const	$push26=, .L.str.3
 	i32.store	80($0), $pop26
-	i32.const	$push86=, .L.str.4
+	i32.const	$push84=, .L.str.4
 	i32.const	$push59=, 80
 	i32.add 	$push60=, $0, $pop59
-	i32.call	$drop=, printf@FUNCTION, $pop86, $pop60
-	i32.const	$push85=, .L.str.3
-	i32.store	64($0), $pop85
-	i32.const	$push84=, .L.str.4
+	i32.call	$drop=, printf@FUNCTION, $pop84, $pop60
+	i32.const	$push83=, .L.str.3
+	i32.store	64($0), $pop83
+	i32.const	$push82=, .L.str.4
 	i32.const	$push61=, 64
 	i32.add 	$push62=, $0, $pop61
-	i32.call	$push27=, printf@FUNCTION, $pop84, $pop62
+	i32.call	$push27=, printf@FUNCTION, $pop82, $pop62
 	br_if   	0, $pop27       # 0: down to label0
-# BB#7:                                 # %if.end36
+# %bb.7:                                # %if.end36
 	i32.const	$push28=, 120
 	i32.call	$drop=, putchar@FUNCTION, $pop28
-	i32.const	$push87=, 120
-	i32.store	48($0), $pop87
+	i32.const	$push85=, 120
+	i32.store	48($0), $pop85
 	i32.const	$push29=, .L.str.5
 	i32.const	$push63=, 48
 	i32.add 	$push64=, $0, $pop63
@@ -113,11 +112,11 @@ main:                                   # @main
 	i32.const	$push31=, 1
 	i32.ne  	$push32=, $pop30, $pop31
 	br_if   	0, $pop32       # 0: down to label0
-# BB#8:                                 # %if.end41
+# %bb.8:                                # %if.end41
 	i32.const	$push33=, .L.str.1
 	i32.call	$drop=, puts@FUNCTION, $pop33
-	i32.const	$push88=, .L.str.1
-	i32.store	32($0), $pop88
+	i32.const	$push86=, .L.str.1
+	i32.store	32($0), $pop86
 	i32.const	$push34=, .L.str.6
 	i32.const	$push65=, 32
 	i32.add 	$push66=, $0, $pop65
@@ -125,27 +124,27 @@ main:                                   # @main
 	i32.const	$push36=, 7
 	i32.ne  	$push37=, $pop35, $pop36
 	br_if   	0, $pop37       # 0: down to label0
-# BB#9:                                 # %if.end46
-	i32.const	$push91=, 0
-	i32.store	16($0), $pop91
+# %bb.9:                                # %if.end46
+	i32.const	$push89=, 0
+	i32.store	16($0), $pop89
 	i32.const	$push38=, .L.str.7
 	i32.const	$push67=, 16
 	i32.add 	$push68=, $0, $pop67
 	i32.call	$drop=, printf@FUNCTION, $pop38, $pop68
-	i32.const	$push90=, 0
-	i32.store	0($0), $pop90
-	i32.const	$push89=, .L.str.7
-	i32.call	$push39=, printf@FUNCTION, $pop89, $0
+	i32.const	$push88=, 0
+	i32.store	0($0), $pop88
+	i32.const	$push87=, .L.str.7
+	i32.call	$push39=, printf@FUNCTION, $pop87, $0
 	i32.const	$push40=, 2
 	i32.ne  	$push41=, $pop39, $pop40
 	br_if   	0, $pop41       # 0: down to label0
-# BB#10:                                # %if.end51
+# %bb.10:                               # %if.end51
 	i32.const	$push48=, 0
 	i32.const	$push46=, 176
 	i32.add 	$push47=, $0, $pop46
 	i32.store	__stack_pointer($pop48), $pop47
-	i32.const	$push92=, 0
-	return  	$pop92
+	i32.const	$push90=, 0
+	return  	$pop90
 .LBB0_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -196,7 +195,7 @@ main:                                   # @main
 	.size	.Lstr, 6
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2c98a2882..5f8182f8c 100644
--- a/test/torture-s/printf-chk-1.c.s
+++ b/test/torture-s/printf-chk-1.c.s
@@ -8,22 +8,21 @@ __printf_chk:                           # @__printf_chk
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push11=, $pop2, $pop4
-	tee_local	$push10=, $3=, $pop11
-	i32.store	__stack_pointer($pop5), $pop10
+	i32.sub 	$3=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $3
 	block   	
 	i32.const	$push9=, 0
 	i32.load	$push0=, should_optimize($pop9)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push12=, 0
+# %bb.1:                                # %if.end
+	i32.const	$push10=, 0
 	i32.const	$push1=, 1
-	i32.store	should_optimize($pop12), $pop1
+	i32.store	should_optimize($pop10), $pop1
 	i32.store	12($3), $2
 	i32.call	$2=, vprintf@FUNCTION, $1, $2
 	i32.const	$push8=, 0
@@ -46,14 +45,13 @@ __printf_chk:                           # @__printf_chk
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push56=, 0
+# %bb.0:                                # %entry
 	i32.const	$push54=, 0
 	i32.load	$push53=, __stack_pointer($pop54)
 	i32.const	$push55=, 224
-	i32.sub 	$push92=, $pop53, $pop55
-	tee_local	$push91=, $0=, $pop92
-	i32.store	__stack_pointer($pop56), $pop91
+	i32.sub 	$0=, $pop53, $pop55
+	i32.const	$push56=, 0
+	i32.store	__stack_pointer($pop56), $0
 	i32.const	$push90=, 0
 	i32.const	$push89=, 0
 	i32.store	should_optimize($pop90), $pop89
@@ -63,326 +61,326 @@ main:                                   # @main
 	block   	
 	i32.const	$push86=, 0
 	i32.load	$push0=, should_optimize($pop86)
-	i32.eqz 	$push197=, $pop0
-	br_if   	0, $pop197      # 0: down to label1
-# BB#1:                                 # %if.end
-	i32.const	$push96=, 0
-	i32.const	$push95=, 0
-	i32.store	should_optimize($pop96), $pop95
-	i32.const	$push94=, .L.str
+	i32.eqz 	$push195=, $pop0
+	br_if   	0, $pop195      # 0: down to label1
+# %bb.1:                                # %if.end
+	i32.const	$push94=, 0
 	i32.const	$push93=, 0
-	i32.call	$push1=, __printf_chk@FUNCTION, $0, $pop94, $pop93
+	i32.store	should_optimize($pop94), $pop93
+	i32.const	$push92=, .L.str
+	i32.const	$push91=, 0
+	i32.call	$push1=, __printf_chk@FUNCTION, $0, $pop92, $pop91
 	i32.const	$push2=, 5
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label1
-# BB#2:                                 # %if.end3
-	i32.const	$push97=, 0
-	i32.load	$push4=, should_optimize($pop97)
-	i32.eqz 	$push198=, $pop4
-	br_if   	0, $pop198      # 0: down to label1
-# BB#3:                                 # %if.end6
-	i32.const	$push101=, 0
-	i32.const	$push5=, 1
-	i32.store	should_optimize($pop101), $pop5
-	i32.const	$push100=, .L.str.1
+# %bb.2:                                # %if.end3
+	i32.const	$push95=, 0
+	i32.load	$push4=, should_optimize($pop95)
+	i32.eqz 	$push196=, $pop4
+	br_if   	0, $pop196      # 0: down to label1
+# %bb.3:                                # %if.end6
 	i32.const	$push99=, 0
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop100, $pop99
-	i32.const	$push98=, 0
-	i32.load	$push6=, should_optimize($pop98)
-	i32.eqz 	$push199=, $pop6
-	br_if   	0, $pop199      # 0: down to label1
-# BB#4:                                 # %if.end10
-	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.store	should_optimize($pop105), $pop104
-	i32.const	$push103=, .L.str.1
+	i32.const	$push5=, 1
+	i32.store	should_optimize($pop99), $pop5
+	i32.const	$push98=, .L.str.1
+	i32.const	$push97=, 0
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop98, $pop97
+	i32.const	$push96=, 0
+	i32.load	$push6=, should_optimize($pop96)
+	i32.eqz 	$push197=, $pop6
+	br_if   	0, $pop197      # 0: down to label1
+# %bb.4:                                # %if.end10
+	i32.const	$push103=, 0
 	i32.const	$push102=, 0
-	i32.call	$push7=, __printf_chk@FUNCTION, $0, $pop103, $pop102
+	i32.store	should_optimize($pop103), $pop102
+	i32.const	$push101=, .L.str.1
+	i32.const	$push100=, 0
+	i32.call	$push7=, __printf_chk@FUNCTION, $0, $pop101, $pop100
 	i32.const	$push8=, 6
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label1
-# BB#5:                                 # %if.end14
+# %bb.5:                                # %if.end14
+	i32.const	$push104=, 0
+	i32.load	$push10=, should_optimize($pop104)
+	i32.eqz 	$push198=, $pop10
+	br_if   	0, $pop198      # 0: down to label1
+# %bb.6:                                # %if.end17
+	i32.const	$push109=, 0
+	i32.const	$push108=, 1
+	i32.store	should_optimize($pop109), $pop108
+	i32.const	$push107=, .L.str.2
 	i32.const	$push106=, 0
-	i32.load	$push10=, should_optimize($pop106)
-	i32.eqz 	$push200=, $pop10
-	br_if   	0, $pop200      # 0: down to label1
-# BB#6:                                 # %if.end17
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop107, $pop106
+	i32.const	$push105=, 0
+	i32.load	$push11=, should_optimize($pop105)
+	i32.eqz 	$push199=, $pop11
+	br_if   	0, $pop199      # 0: down to label1
+# %bb.7:                                # %if.end21
+	i32.const	$push114=, 0
+	i32.const	$push113=, 0
+	i32.store	should_optimize($pop114), $pop113
+	i32.const	$push112=, .L.str.2
 	i32.const	$push111=, 0
+	i32.call	$push12=, __printf_chk@FUNCTION, $0, $pop112, $pop111
 	i32.const	$push110=, 1
-	i32.store	should_optimize($pop111), $pop110
-	i32.const	$push109=, .L.str.2
-	i32.const	$push108=, 0
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop109, $pop108
-	i32.const	$push107=, 0
-	i32.load	$push11=, should_optimize($pop107)
-	i32.eqz 	$push201=, $pop11
-	br_if   	0, $pop201      # 0: down to label1
-# BB#7:                                 # %if.end21
-	i32.const	$push116=, 0
-	i32.const	$push115=, 0
-	i32.store	should_optimize($pop116), $pop115
-	i32.const	$push114=, .L.str.2
-	i32.const	$push113=, 0
-	i32.call	$push12=, __printf_chk@FUNCTION, $0, $pop114, $pop113
-	i32.const	$push112=, 1
-	i32.ne  	$push13=, $pop12, $pop112
+	i32.ne  	$push13=, $pop12, $pop110
 	br_if   	0, $pop13       # 0: down to label1
-# BB#8:                                 # %if.end25
-	i32.const	$push117=, 0
-	i32.load	$push14=, should_optimize($pop117)
-	i32.eqz 	$push202=, $pop14
-	br_if   	0, $pop202      # 0: down to label1
-# BB#9:                                 # %if.end28
-	i32.const	$push121=, 0
-	i32.const	$push15=, 1
-	i32.store	should_optimize($pop121), $pop15
-	i32.const	$push120=, .L.str.3
+# %bb.8:                                # %if.end25
+	i32.const	$push115=, 0
+	i32.load	$push14=, should_optimize($pop115)
+	i32.eqz 	$push200=, $pop14
+	br_if   	0, $pop200      # 0: down to label1
+# %bb.9:                                # %if.end28
 	i32.const	$push119=, 0
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop120, $pop119
-	i32.const	$push118=, 0
-	i32.load	$push16=, should_optimize($pop118)
-	i32.eqz 	$push203=, $pop16
-	br_if   	0, $pop203      # 0: down to label1
-# BB#10:                                # %if.end32
-	i32.const	$push125=, 0
-	i32.const	$push124=, 0
-	i32.store	should_optimize($pop125), $pop124
-	i32.const	$push123=, .L.str.3
+	i32.const	$push15=, 1
+	i32.store	should_optimize($pop119), $pop15
+	i32.const	$push118=, .L.str.3
+	i32.const	$push117=, 0
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop118, $pop117
+	i32.const	$push116=, 0
+	i32.load	$push16=, should_optimize($pop116)
+	i32.eqz 	$push201=, $pop16
+	br_if   	0, $pop201      # 0: down to label1
+# %bb.10:                               # %if.end32
+	i32.const	$push123=, 0
 	i32.const	$push122=, 0
-	i32.call	$push17=, __printf_chk@FUNCTION, $0, $pop123, $pop122
+	i32.store	should_optimize($pop123), $pop122
+	i32.const	$push121=, .L.str.3
+	i32.const	$push120=, 0
+	i32.call	$push17=, __printf_chk@FUNCTION, $0, $pop121, $pop120
 	br_if   	0, $pop17       # 0: down to label1
-# BB#11:                                # %if.end36
-	i32.const	$push126=, 0
-	i32.load	$push18=, should_optimize($pop126)
-	i32.eqz 	$push204=, $pop18
-	br_if   	0, $pop204      # 0: down to label1
-# BB#12:                                # %if.end39
-	i32.const	$push131=, .L.str
-	i32.store	208($0), $pop131
-	i32.const	$push130=, 0
-	i32.const	$push129=, 0
-	i32.store	should_optimize($pop130), $pop129
-	i32.const	$push128=, .L.str.4
+# %bb.11:                               # %if.end36
+	i32.const	$push124=, 0
+	i32.load	$push18=, should_optimize($pop124)
+	i32.eqz 	$push202=, $pop18
+	br_if   	0, $pop202      # 0: down to label1
+# %bb.12:                               # %if.end39
+	i32.const	$push129=, .L.str
+	i32.store	208($0), $pop129
+	i32.const	$push128=, 0
+	i32.const	$push127=, 0
+	i32.store	should_optimize($pop128), $pop127
+	i32.const	$push126=, .L.str.4
 	i32.const	$push60=, 208
 	i32.add 	$push61=, $0, $pop60
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop128, $pop61
-	i32.const	$push127=, 0
-	i32.load	$push19=, should_optimize($pop127)
-	i32.eqz 	$push205=, $pop19
-	br_if   	0, $pop205      # 0: down to label1
-# BB#13:                                # %if.end43
-	i32.const	$push135=, .L.str
-	i32.store	192($0), $pop135
-	i32.const	$push134=, 0
-	i32.const	$push133=, 0
-	i32.store	should_optimize($pop134), $pop133
-	i32.const	$push132=, .L.str.4
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop126, $pop61
+	i32.const	$push125=, 0
+	i32.load	$push19=, should_optimize($pop125)
+	i32.eqz 	$push203=, $pop19
+	br_if   	0, $pop203      # 0: down to label1
+# %bb.13:                               # %if.end43
+	i32.const	$push133=, .L.str
+	i32.store	192($0), $pop133
+	i32.const	$push132=, 0
+	i32.const	$push131=, 0
+	i32.store	should_optimize($pop132), $pop131
+	i32.const	$push130=, .L.str.4
 	i32.const	$push62=, 192
 	i32.add 	$push63=, $0, $pop62
-	i32.call	$push20=, __printf_chk@FUNCTION, $0, $pop132, $pop63
+	i32.call	$push20=, __printf_chk@FUNCTION, $0, $pop130, $pop63
 	i32.const	$push21=, 5
 	i32.ne  	$push22=, $pop20, $pop21
 	br_if   	0, $pop22       # 0: down to label1
-# BB#14:                                # %if.end47
-	i32.const	$push136=, 0
-	i32.load	$push23=, should_optimize($pop136)
-	i32.eqz 	$push206=, $pop23
-	br_if   	0, $pop206      # 0: down to label1
-# BB#15:                                # %if.end50
-	i32.const	$push140=, 0
+# %bb.14:                               # %if.end47
+	i32.const	$push134=, 0
+	i32.load	$push23=, should_optimize($pop134)
+	i32.eqz 	$push204=, $pop23
+	br_if   	0, $pop204      # 0: down to label1
+# %bb.15:                               # %if.end50
+	i32.const	$push138=, 0
 	i32.const	$push24=, 1
-	i32.store	should_optimize($pop140), $pop24
-	i32.const	$push139=, .L.str.1
-	i32.store	176($0), $pop139
-	i32.const	$push138=, .L.str.4
+	i32.store	should_optimize($pop138), $pop24
+	i32.const	$push137=, .L.str.1
+	i32.store	176($0), $pop137
+	i32.const	$push136=, .L.str.4
 	i32.const	$push64=, 176
 	i32.add 	$push65=, $0, $pop64
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop138, $pop65
-	i32.const	$push137=, 0
-	i32.load	$push25=, should_optimize($pop137)
-	i32.eqz 	$push207=, $pop25
-	br_if   	0, $pop207      # 0: down to label1
-# BB#16:                                # %if.end54
-	i32.const	$push144=, .L.str.1
-	i32.store	160($0), $pop144
-	i32.const	$push143=, 0
-	i32.const	$push142=, 0
-	i32.store	should_optimize($pop143), $pop142
-	i32.const	$push141=, .L.str.4
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop136, $pop65
+	i32.const	$push135=, 0
+	i32.load	$push25=, should_optimize($pop135)
+	i32.eqz 	$push205=, $pop25
+	br_if   	0, $pop205      # 0: down to label1
+# %bb.16:                               # %if.end54
+	i32.const	$push142=, .L.str.1
+	i32.store	160($0), $pop142
+	i32.const	$push141=, 0
+	i32.const	$push140=, 0
+	i32.store	should_optimize($pop141), $pop140
+	i32.const	$push139=, .L.str.4
 	i32.const	$push66=, 160
 	i32.add 	$push67=, $0, $pop66
-	i32.call	$push26=, __printf_chk@FUNCTION, $0, $pop141, $pop67
+	i32.call	$push26=, __printf_chk@FUNCTION, $0, $pop139, $pop67
 	i32.const	$push27=, 6
 	i32.ne  	$push28=, $pop26, $pop27
 	br_if   	0, $pop28       # 0: down to label1
-# BB#17:                                # %if.end58
-	i32.const	$push145=, 0
-	i32.load	$push29=, should_optimize($pop145)
-	i32.eqz 	$push208=, $pop29
-	br_if   	0, $pop208      # 0: down to label1
-# BB#18:                                # %if.end61
-	i32.const	$push150=, 0
-	i32.const	$push149=, 1
-	i32.store	should_optimize($pop150), $pop149
-	i32.const	$push148=, .L.str.2
-	i32.store	144($0), $pop148
-	i32.const	$push147=, .L.str.4
+# %bb.17:                               # %if.end58
+	i32.const	$push143=, 0
+	i32.load	$push29=, should_optimize($pop143)
+	i32.eqz 	$push206=, $pop29
+	br_if   	0, $pop206      # 0: down to label1
+# %bb.18:                               # %if.end61
+	i32.const	$push148=, 0
+	i32.const	$push147=, 1
+	i32.store	should_optimize($pop148), $pop147
+	i32.const	$push146=, .L.str.2
+	i32.store	144($0), $pop146
+	i32.const	$push145=, .L.str.4
 	i32.const	$push68=, 144
 	i32.add 	$push69=, $0, $pop68
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop147, $pop69
-	i32.const	$push146=, 0
-	i32.load	$push30=, should_optimize($pop146)
-	i32.eqz 	$push209=, $pop30
-	br_if   	0, $pop209      # 0: down to label1
-# BB#19:                                # %if.end65
-	i32.const	$push155=, .L.str.2
-	i32.store	128($0), $pop155
-	i32.const	$push154=, 0
-	i32.const	$push153=, 0
-	i32.store	should_optimize($pop154), $pop153
-	i32.const	$push152=, .L.str.4
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop145, $pop69
+	i32.const	$push144=, 0
+	i32.load	$push30=, should_optimize($pop144)
+	i32.eqz 	$push207=, $pop30
+	br_if   	0, $pop207      # 0: down to label1
+# %bb.19:                               # %if.end65
+	i32.const	$push153=, .L.str.2
+	i32.store	128($0), $pop153
+	i32.const	$push152=, 0
+	i32.const	$push151=, 0
+	i32.store	should_optimize($pop152), $pop151
+	i32.const	$push150=, .L.str.4
 	i32.const	$push70=, 128
 	i32.add 	$push71=, $0, $pop70
-	i32.call	$push31=, __printf_chk@FUNCTION, $0, $pop152, $pop71
-	i32.const	$push151=, 1
-	i32.ne  	$push32=, $pop31, $pop151
+	i32.call	$push31=, __printf_chk@FUNCTION, $0, $pop150, $pop71
+	i32.const	$push149=, 1
+	i32.ne  	$push32=, $pop31, $pop149
 	br_if   	0, $pop32       # 0: down to label1
-# BB#20:                                # %if.end69
-	i32.const	$push156=, 0
-	i32.load	$push33=, should_optimize($pop156)
-	i32.eqz 	$push210=, $pop33
-	br_if   	0, $pop210      # 0: down to label1
-# BB#21:                                # %if.end72
-	i32.const	$push160=, 0
+# %bb.20:                               # %if.end69
+	i32.const	$push154=, 0
+	i32.load	$push33=, should_optimize($pop154)
+	i32.eqz 	$push208=, $pop33
+	br_if   	0, $pop208      # 0: down to label1
+# %bb.21:                               # %if.end72
+	i32.const	$push158=, 0
 	i32.const	$push34=, 1
-	i32.store	should_optimize($pop160), $pop34
-	i32.const	$push159=, .L.str.3
-	i32.store	112($0), $pop159
-	i32.const	$push158=, .L.str.4
+	i32.store	should_optimize($pop158), $pop34
+	i32.const	$push157=, .L.str.3
+	i32.store	112($0), $pop157
+	i32.const	$push156=, .L.str.4
 	i32.const	$push72=, 112
 	i32.add 	$push73=, $0, $pop72
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop158, $pop73
-	i32.const	$push157=, 0
-	i32.load	$push35=, should_optimize($pop157)
-	i32.eqz 	$push211=, $pop35
-	br_if   	0, $pop211      # 0: down to label1
-# BB#22:                                # %if.end76
-	i32.const	$push164=, .L.str.3
-	i32.store	96($0), $pop164
-	i32.const	$push163=, 0
-	i32.const	$push162=, 0
-	i32.store	should_optimize($pop163), $pop162
-	i32.const	$push161=, .L.str.4
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop156, $pop73
+	i32.const	$push155=, 0
+	i32.load	$push35=, should_optimize($pop155)
+	i32.eqz 	$push209=, $pop35
+	br_if   	0, $pop209      # 0: down to label1
+# %bb.22:                               # %if.end76
+	i32.const	$push162=, .L.str.3
+	i32.store	96($0), $pop162
+	i32.const	$push161=, 0
+	i32.const	$push160=, 0
+	i32.store	should_optimize($pop161), $pop160
+	i32.const	$push159=, .L.str.4
 	i32.const	$push74=, 96
 	i32.add 	$push75=, $0, $pop74
-	i32.call	$push36=, __printf_chk@FUNCTION, $0, $pop161, $pop75
+	i32.call	$push36=, __printf_chk@FUNCTION, $0, $pop159, $pop75
 	br_if   	0, $pop36       # 0: down to label1
-# BB#23:                                # %if.end80
-	i32.const	$push165=, 0
-	i32.load	$push37=, should_optimize($pop165)
-	i32.eqz 	$push212=, $pop37
-	br_if   	0, $pop212      # 0: down to label1
-# BB#24:                                # %if.end83
-	i32.const	$push170=, 0
-	i32.const	$push169=, 1
-	i32.store	should_optimize($pop170), $pop169
-	i32.const	$push168=, 120
-	i32.store	80($0), $pop168
-	i32.const	$push167=, .L.str.5
+# %bb.23:                               # %if.end80
+	i32.const	$push163=, 0
+	i32.load	$push37=, should_optimize($pop163)
+	i32.eqz 	$push210=, $pop37
+	br_if   	0, $pop210      # 0: down to label1
+# %bb.24:                               # %if.end83
+	i32.const	$push168=, 0
+	i32.const	$push167=, 1
+	i32.store	should_optimize($pop168), $pop167
+	i32.const	$push166=, 120
+	i32.store	80($0), $pop166
+	i32.const	$push165=, .L.str.5
 	i32.const	$push76=, 80
 	i32.add 	$push77=, $0, $pop76
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop167, $pop77
-	i32.const	$push166=, 0
-	i32.load	$push38=, should_optimize($pop166)
-	i32.eqz 	$push213=, $pop38
-	br_if   	0, $pop213      # 0: down to label1
-# BB#25:                                # %if.end87
-	i32.const	$push175=, 120
-	i32.store	64($0), $pop175
-	i32.const	$push174=, 0
-	i32.const	$push173=, 0
-	i32.store	should_optimize($pop174), $pop173
-	i32.const	$push172=, .L.str.5
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop165, $pop77
+	i32.const	$push164=, 0
+	i32.load	$push38=, should_optimize($pop164)
+	i32.eqz 	$push211=, $pop38
+	br_if   	0, $pop211      # 0: down to label1
+# %bb.25:                               # %if.end87
+	i32.const	$push173=, 120
+	i32.store	64($0), $pop173
+	i32.const	$push172=, 0
+	i32.const	$push171=, 0
+	i32.store	should_optimize($pop172), $pop171
+	i32.const	$push170=, .L.str.5
 	i32.const	$push78=, 64
 	i32.add 	$push79=, $0, $pop78
-	i32.call	$push39=, __printf_chk@FUNCTION, $0, $pop172, $pop79
-	i32.const	$push171=, 1
-	i32.ne  	$push40=, $pop39, $pop171
+	i32.call	$push39=, __printf_chk@FUNCTION, $0, $pop170, $pop79
+	i32.const	$push169=, 1
+	i32.ne  	$push40=, $pop39, $pop169
 	br_if   	0, $pop40       # 0: down to label1
-# BB#26:                                # %if.end91
-	i32.const	$push176=, 0
-	i32.load	$push41=, should_optimize($pop176)
-	i32.eqz 	$push214=, $pop41
-	br_if   	0, $pop214      # 0: down to label1
-# BB#27:                                # %if.end94
-	i32.const	$push180=, 0
+# %bb.26:                               # %if.end91
+	i32.const	$push174=, 0
+	i32.load	$push41=, should_optimize($pop174)
+	i32.eqz 	$push212=, $pop41
+	br_if   	0, $pop212      # 0: down to label1
+# %bb.27:                               # %if.end94
+	i32.const	$push178=, 0
 	i32.const	$push42=, 1
-	i32.store	should_optimize($pop180), $pop42
-	i32.const	$push179=, .L.str.1
-	i32.store	48($0), $pop179
-	i32.const	$push178=, .L.str.6
+	i32.store	should_optimize($pop178), $pop42
+	i32.const	$push177=, .L.str.1
+	i32.store	48($0), $pop177
+	i32.const	$push176=, .L.str.6
 	i32.const	$push80=, 48
 	i32.add 	$push81=, $0, $pop80
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop178, $pop81
-	i32.const	$push177=, 0
-	i32.load	$push43=, should_optimize($pop177)
-	i32.eqz 	$push215=, $pop43
-	br_if   	0, $pop215      # 0: down to label1
-# BB#28:                                # %if.end98
-	i32.const	$push184=, .L.str.1
-	i32.store	32($0), $pop184
-	i32.const	$push183=, 0
-	i32.const	$push182=, 0
-	i32.store	should_optimize($pop183), $pop182
-	i32.const	$push181=, .L.str.6
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop176, $pop81
+	i32.const	$push175=, 0
+	i32.load	$push43=, should_optimize($pop175)
+	i32.eqz 	$push213=, $pop43
+	br_if   	0, $pop213      # 0: down to label1
+# %bb.28:                               # %if.end98
+	i32.const	$push182=, .L.str.1
+	i32.store	32($0), $pop182
+	i32.const	$push181=, 0
+	i32.const	$push180=, 0
+	i32.store	should_optimize($pop181), $pop180
+	i32.const	$push179=, .L.str.6
 	i32.const	$push82=, 32
 	i32.add 	$push83=, $0, $pop82
-	i32.call	$push44=, __printf_chk@FUNCTION, $0, $pop181, $pop83
+	i32.call	$push44=, __printf_chk@FUNCTION, $0, $pop179, $pop83
 	i32.const	$push45=, 7
 	i32.ne  	$push46=, $pop44, $pop45
 	br_if   	0, $pop46       # 0: down to label1
-# BB#29:                                # %if.end102
-	i32.const	$push185=, 0
-	i32.load	$push47=, should_optimize($pop185)
-	i32.eqz 	$push216=, $pop47
-	br_if   	0, $pop216      # 0: down to label1
-# BB#30:                                # %if.end105
-	i32.const	$push190=, 0
-	i32.store	16($0), $pop190
-	i32.const	$push189=, 0
+# %bb.29:                               # %if.end102
+	i32.const	$push183=, 0
+	i32.load	$push47=, should_optimize($pop183)
+	i32.eqz 	$push214=, $pop47
+	br_if   	0, $pop214      # 0: down to label1
+# %bb.30:                               # %if.end105
 	i32.const	$push188=, 0
-	i32.store	should_optimize($pop189), $pop188
-	i32.const	$push187=, .L.str.7
+	i32.store	16($0), $pop188
+	i32.const	$push187=, 0
+	i32.const	$push186=, 0
+	i32.store	should_optimize($pop187), $pop186
+	i32.const	$push185=, .L.str.7
 	i32.const	$push84=, 16
 	i32.add 	$push85=, $0, $pop84
-	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop187, $pop85
-	i32.const	$push186=, 0
-	i32.load	$push48=, should_optimize($pop186)
-	i32.eqz 	$push217=, $pop48
-	br_if   	0, $pop217      # 0: down to label1
-# BB#31:                                # %if.end109
-	i32.const	$push194=, 0
-	i32.store	0($0), $pop194
-	i32.const	$push193=, 0
+	i32.call	$drop=, __printf_chk@FUNCTION, $0, $pop185, $pop85
+	i32.const	$push184=, 0
+	i32.load	$push48=, should_optimize($pop184)
+	i32.eqz 	$push215=, $pop48
+	br_if   	0, $pop215      # 0: down to label1
+# %bb.31:                               # %if.end109
 	i32.const	$push192=, 0
-	i32.store	should_optimize($pop193), $pop192
-	i32.const	$push191=, .L.str.7
-	i32.call	$push49=, __printf_chk@FUNCTION, $0, $pop191, $0
+	i32.store	0($0), $pop192
+	i32.const	$push191=, 0
+	i32.const	$push190=, 0
+	i32.store	should_optimize($pop191), $pop190
+	i32.const	$push189=, .L.str.7
+	i32.call	$push49=, __printf_chk@FUNCTION, $0, $pop189, $0
 	i32.const	$push50=, 2
 	i32.ne  	$push51=, $pop49, $pop50
 	br_if   	0, $pop51       # 0: down to label1
-# BB#32:                                # %if.end113
-	i32.const	$push195=, 0
-	i32.load	$push52=, should_optimize($pop195)
-	i32.eqz 	$push218=, $pop52
-	br_if   	0, $pop218      # 0: down to label1
-# BB#33:                                # %if.end116
+# %bb.32:                               # %if.end113
+	i32.const	$push193=, 0
+	i32.load	$push52=, should_optimize($pop193)
+	i32.eqz 	$push216=, $pop52
+	br_if   	0, $pop216      # 0: down to label1
+# %bb.33:                               # %if.end116
 	i32.const	$push59=, 0
 	i32.const	$push57=, 224
 	i32.add 	$push58=, $0, $pop57
 	i32.store	__stack_pointer($pop59), $pop58
-	i32.const	$push196=, 0
-	return  	$pop196
+	i32.const	$push194=, 0
+	return  	$pop194
 .LBB1_34:                               # %if.then
 	end_block                       # label1:
 	call    	abort@FUNCTION
@@ -442,6 +440,6 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 27d412cf2..74a867e18 100644
--- a/test/torture-s/pta-field-1.c.s
+++ b/test/torture-s/pta-field-1.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$push0=, 4($0)
 	i32.const	$push1=, 0
 	i32.store	0($pop0), $pop1
@@ -22,14 +22,13 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push14=, $pop2, $pop4
-	tee_local	$push13=, $1=, $pop14
-	i32.store	__stack_pointer($pop5), $pop13
+	i32.sub 	$1=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $1
 	i32.const	$push0=, 1
 	i32.store	4($1), $pop0
 	i32.const	$push1=, 2
@@ -46,8 +45,8 @@ foo:                                    # @foo
 	i32.const	$push6=, 16
 	i32.add 	$push7=, $1, $pop6
 	i32.store	__stack_pointer($pop8), $pop7
-	copy_local	$push15=, $0
-                                        # fallthrough-return: $pop15
+	copy_local	$push13=, $0
+                                        # fallthrough-return: $pop13
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -59,14 +58,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $0=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push0=, 1
 	i32.store	4($0), $pop0
 	i32.const	$push1=, 2
@@ -81,7 +79,7 @@ main:                                   # @main
 	block   	
 	i32.load	$push2=, 0($0)
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push10=, 0
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $0, $pop8
@@ -97,5 +95,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/pta-field-2.c.s b/test/torture-s/pta-field-2.c.s
index a38428518..925a2ec80 100644
--- a/test/torture-s/pta-field-2.c.s
+++ b/test/torture-s/pta-field-2.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -4
 	i32.add 	$push1=, $0, $pop0
 	i32.load	$push2=, 0($pop1)
@@ -24,14 +24,13 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push16=, $pop4, $pop6
-	tee_local	$push15=, $1=, $pop16
-	i32.store	__stack_pointer($pop7), $pop15
+	i32.sub 	$1=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $1
 	i32.const	$push0=, 1
 	i32.store	4($1), $pop0
 	i32.const	$push1=, 2
@@ -50,8 +49,8 @@ foo:                                    # @foo
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $1, $pop8
 	i32.store	__stack_pointer($pop10), $pop9
-	copy_local	$push17=, $0
-                                        # fallthrough-return: $pop17
+	copy_local	$push15=, $0
+                                        # fallthrough-return: $pop15
 	.endfunc
 .Lfunc_end1:
 	.size	foo, .Lfunc_end1-foo
@@ -63,14 +62,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push18=, $pop6, $pop8
-	tee_local	$push17=, $0=, $pop18
-	i32.store	__stack_pointer($pop9), $pop17
+	i32.sub 	$0=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $0
 	i32.const	$push0=, 1
 	i32.store	4($0), $pop0
 	i32.const	$push1=, 2
@@ -87,7 +85,7 @@ main:                                   # @main
 	block   	
 	i32.load	$push4=, 4($0)
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push12=, 0
 	i32.const	$push10=, 16
 	i32.add 	$push11=, $0, $pop10
@@ -103,5 +101,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/ptr-arith-1.c.s b/test/torture-s/ptr-arith-1.c.s
index a64d0d5d0..f3c6d8cd7 100644
--- a/test/torture-s/ptr-arith-1.c.s
+++ b/test/torture-s/ptr-arith-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $0, $1
 	i32.const	$push1=, 2
 	i32.add 	$push2=, $pop0, $pop1
@@ -22,7 +22,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/pure-1.c.s b/test/torture-s/pure-1.c.s
index cd8b00d2a..a1043d07e 100644
--- a/test/torture-s/pure-1.c.s
+++ b/test/torture-s/pure-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -20,7 +20,7 @@ main:                                   # @main
 func0:                                  # @func0
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.load	$push1=, i($pop0)
 	i32.sub 	$push2=, $0, $pop1
@@ -36,7 +36,7 @@ func0:                                  # @func0
 func1:                                  # @func1
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -53,4 +53,4 @@ i:
 	.size	i, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/pushpop_macro.c.s b/test/torture-s/pushpop_macro.c.s
index fe1341a8b..4487809a0 100644
--- a/test/torture-s/pushpop_macro.c.s
+++ b/test/torture-s/pushpop_macro.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/regstack-1.c.s b/test/torture-s/regstack-1.c.s
index 23061b767..9b43069ee 100644
--- a/test/torture-s/regstack-1.c.s
+++ b/test/torture-s/regstack-1.c.s
@@ -7,83 +7,68 @@
 main:                                   # @main
 	.result 	i32
 	.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
+# %bb.0:                                # %entry
 	i32.const	$push57=, 0
 	i32.load	$push56=, __stack_pointer($pop57)
 	i32.const	$push58=, 320
-	i32.sub 	$push243=, $pop56, $pop58
-	tee_local	$push242=, $16=, $pop243
-	i32.store	__stack_pointer($pop59), $pop242
+	i32.sub 	$16=, $pop56, $pop58
+	i32.const	$push59=, 0
+	i32.store	__stack_pointer($pop59), $16
+	i32.const	$push0=, 0
+	i64.load	$4=, U+8($pop0)
+	i32.const	$push177=, 0
+	i64.load	$5=, U($pop177)
+	i32.const	$push176=, 0
+	i64.load	$6=, C+8($pop176)
+	i32.const	$push175=, 0
+	i64.load	$7=, C($pop175)
 	i32.const	$push60=, 304
 	i32.add 	$push61=, $16, $pop60
-	i32.const	$push0=, 0
-	i64.load	$push241=, C($pop0)
-	tee_local	$push240=, $7=, $pop241
-	i32.const	$push239=, 0
-	i64.load	$push238=, C+8($pop239)
-	tee_local	$push237=, $6=, $pop238
-	i32.const	$push236=, 0
-	i64.load	$push235=, U($pop236)
-	tee_local	$push234=, $5=, $pop235
-	i32.const	$push233=, 0
-	i64.load	$push232=, U+8($pop233)
-	tee_local	$push231=, $4=, $pop232
-	call    	__addtf3@FUNCTION, $pop61, $pop240, $pop237, $pop234, $pop231
+	call    	__addtf3@FUNCTION, $pop61, $7, $6, $5, $4
 	i32.const	$push62=, 240
 	i32.add 	$push63=, $16, $pop62
 	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=, $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=, $14=, $pop228
-	call    	__addtf3@FUNCTION, $pop67, $5, $4, $pop229, $pop227
+	i64.load	$14=, 0($pop2)
+	i64.load	$15=, 304($16)
+	i32.const	$push66=, 288
+	i32.add 	$push67=, $16, $pop66
+	call    	__addtf3@FUNCTION, $pop67, $5, $4, $15, $14
+	i32.const	$push174=, 0
+	i64.load	$6=, Y2+8($pop174)
+	i32.const	$push173=, 0
+	i64.load	$7=, Y2($pop173)
 	i32.const	$push68=, 128
 	i32.add 	$push69=, $16, $pop68
-	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
-	i64.load	$push220=, 240($16)
-	tee_local	$push219=, $9=, $pop220
+	call    	__addtf3@FUNCTION, $pop69, $5, $4, $7, $6
 	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
-	i64.load	$push215=, 288($16)
-	tee_local	$push214=, $11=, $pop215
+	i32.const	$push172=, 8
+	i32.add 	$push3=, $pop71, $pop172
+	i64.load	$8=, 0($pop3)
+	i64.load	$9=, 240($16)
+	i32.const	$push72=, 224
+	i32.add 	$push73=, $16, $pop72
+	call    	__subtf3@FUNCTION, $pop73, $9, $8, $5, $4
 	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, $5, $4, $pop214, $pop211
+	i32.const	$push171=, 8
+	i32.add 	$push4=, $pop75, $pop171
+	i64.load	$10=, 0($pop4)
+	i64.load	$11=, 288($16)
+	i32.const	$push76=, 272
+	i32.add 	$push77=, $16, $pop76
+	call    	__addtf3@FUNCTION, $pop77, $5, $4, $11, $10
+	i32.const	$push170=, 0
+	i64.load	$12=, Y1+8($pop170)
+	i32.const	$push169=, 0
+	i64.load	$13=, Y1($pop169)
 	i32.const	$push78=, 16
 	i32.add 	$push79=, $16, $pop78
-	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, $pop79, $7, $6, $pop208, $pop205
+	call    	__multf3@FUNCTION, $pop79, $7, $6, $13, $12
 	i32.const	$push80=, 112
 	i32.add 	$push81=, $16, $pop80
 	call    	__multf3@FUNCTION, $pop81, $9, $8, $13, $12
@@ -92,57 +77,53 @@ main:                                   # @main
 	i64.load	$push7=, 128($16)
 	i32.const	$push82=, 128
 	i32.add 	$push83=, $16, $pop82
-	i32.const	$push204=, 8
-	i32.add 	$push5=, $pop83, $pop204
+	i32.const	$push168=, 8
+	i32.add 	$push5=, $pop83, $pop168
 	i64.load	$push6=, 0($pop5)
 	call    	__multf3@FUNCTION, $pop85, $pop7, $pop6, $13, $12
 	i32.const	$push86=, 192
 	i32.add 	$push87=, $16, $pop86
 	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
-	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	$push167=, 8
+	i32.add 	$push8=, $pop89, $pop167
+	i64.load	$14=, 0($pop8)
+	i64.load	$15=, 224($16)
+	i32.const	$push90=, 80
+	i32.add 	$push91=, $16, $pop90
+	call    	__multf3@FUNCTION, $pop91, $15, $14, $13, $12
 	i32.const	$push92=, 208
 	i32.add 	$push93=, $16, $pop92
 	call    	__subtf3@FUNCTION, $pop93, $5, $4, $15, $14
 	i32.const	$push94=, 160
 	i32.add 	$push95=, $16, $pop94
 	call    	__multf3@FUNCTION, $pop95, $7, $6, $11, $10
-	i32.const	$push98=, 256
-	i32.add 	$push99=, $16, $pop98
-	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
+	i32.const	$push166=, 8
+	i32.add 	$push9=, $pop97, $pop166
+	i64.load	$12=, 0($pop9)
+	i64.load	$13=, 272($16)
+	i32.const	$push98=, 256
+	i32.add 	$push99=, $16, $pop98
+	call    	__addtf3@FUNCTION, $pop99, $5, $4, $13, $12
 	i64.load	$push13=, 16($16)
 	i32.const	$push100=, 16
 	i32.add 	$push101=, $16, $pop100
-	i32.const	$push193=, 8
-	i32.add 	$push10=, $pop101, $pop193
+	i32.const	$push165=, 8
+	i32.add 	$push10=, $pop101, $pop165
 	i64.load	$push11=, 0($pop10)
-	i64.const	$push192=, 0
+	i64.const	$push164=, 0
 	i64.const	$push12=, -4612248968380809216
-	call    	__addtf3@FUNCTION, $16, $pop13, $pop11, $pop192, $pop12
+	call    	__addtf3@FUNCTION, $16, $pop13, $pop11, $pop164, $pop12
 	i32.const	$push104=, 96
 	i32.add 	$push105=, $16, $pop104
 	i64.load	$push16=, 112($16)
 	i32.const	$push102=, 112
 	i32.add 	$push103=, $16, $pop102
-	i32.const	$push191=, 8
-	i32.add 	$push14=, $pop103, $pop191
+	i32.const	$push163=, 8
+	i32.add 	$push14=, $pop103, $pop163
 	i64.load	$push15=, 0($pop14)
 	call    	__subtf3@FUNCTION, $pop105, $pop16, $pop15, $15, $14
 	i32.const	$push108=, 32
@@ -150,8 +131,8 @@ main:                                   # @main
 	i64.load	$push19=, 48($16)
 	i32.const	$push106=, 48
 	i32.add 	$push107=, $16, $pop106
-	i32.const	$push190=, 8
-	i32.add 	$push17=, $pop107, $pop190
+	i32.const	$push162=, 8
+	i32.add 	$push17=, $pop107, $pop162
 	i64.load	$push18=, 0($pop17)
 	call    	__subtf3@FUNCTION, $pop109, $pop19, $pop18, $7, $6
 	i32.const	$push112=, 176
@@ -159,8 +140,8 @@ main:                                   # @main
 	i64.load	$push22=, 192($16)
 	i32.const	$push110=, 192
 	i32.add 	$push111=, $16, $pop110
-	i32.const	$push189=, 8
-	i32.add 	$push20=, $pop111, $pop189
+	i32.const	$push161=, 8
+	i32.add 	$push20=, $pop111, $pop161
 	i64.load	$push21=, 0($pop20)
 	call    	__subtf3@FUNCTION, $pop113, $pop22, $pop21, $13, $12
 	i32.const	$push118=, 64
@@ -168,148 +149,134 @@ main:                                   # @main
 	i64.load	$push28=, 208($16)
 	i32.const	$push116=, 208
 	i32.add 	$push117=, $16, $pop116
-	i32.const	$push188=, 8
-	i32.add 	$push25=, $pop117, $pop188
+	i32.const	$push160=, 8
+	i32.add 	$push25=, $pop117, $pop160
 	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 	$push23=, $pop115, $pop187
+	i32.const	$push159=, 8
+	i32.add 	$push23=, $pop115, $pop159
 	i64.load	$push24=, 0($pop23)
 	call    	__addtf3@FUNCTION, $pop119, $pop28, $pop26, $pop27, $pop24
-	i32.const	$push124=, 144
-	i32.add 	$push125=, $16, $pop124
-	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
+	i32.const	$push158=, 8
+	i32.add 	$push29=, $pop121, $pop158
+	i64.load	$4=, 0($pop29)
+	i64.load	$5=, 160($16)
+	i32.const	$push124=, 144
+	i32.add 	$push125=, $16, $pop124
 	i64.load	$push32=, 256($16)
 	i32.const	$push122=, 256
 	i32.add 	$push123=, $16, $pop122
-	i32.const	$push181=, 8
-	i32.add 	$push30=, $pop123, $pop181
+	i32.const	$push157=, 8
+	i32.add 	$push30=, $pop123, $pop157
 	i64.load	$push31=, 0($pop30)
-	call    	__subtf3@FUNCTION, $pop125, $pop185, $pop182, $pop32, $pop31
-	i32.const	$push180=, 0
-	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
+	call    	__subtf3@FUNCTION, $pop125, $5, $4, $pop32, $pop31
+	i32.const	$push156=, 8
+	i32.add 	$push33=, $16, $pop156
+	i64.load	$8=, 0($pop33)
+	i32.const	$push155=, 0
+	i64.store	Y1+8($pop155), $8
+	i64.load	$9=, 0($16)
+	i32.const	$push154=, 0
+	i64.store	Y1($pop154), $9
+	i32.const	$push153=, 0
+	i64.store	S+8($pop153), $4
+	i32.const	$push152=, 0
+	i64.store	S($pop152), $5
 	i32.const	$push126=, 96
 	i32.add 	$push127=, $16, $pop126
-	i32.const	$push170=, 8
-	i32.add 	$push34=, $pop127, $pop170
-	i64.load	$push169=, 0($pop34)
-	tee_local	$push168=, $13=, $pop169
-	i64.store	T+8($pop171), $pop168
-	i32.const	$push167=, 0
-	i64.load	$push166=, 96($16)
-	tee_local	$push165=, $12=, $pop166
-	i64.store	T($pop167), $pop165
-	i32.const	$push164=, 0
+	i32.const	$push151=, 8
+	i32.add 	$push34=, $pop127, $pop151
+	i64.load	$12=, 0($pop34)
+	i32.const	$push150=, 0
+	i64.store	T+8($pop150), $12
+	i64.load	$13=, 96($16)
+	i32.const	$push149=, 0
+	i64.store	T($pop149), $13
 	i32.const	$push128=, 32
 	i32.add 	$push129=, $16, $pop128
-	i32.const	$push163=, 8
-	i32.add 	$push35=, $pop129, $pop163
-	i64.load	$push162=, 0($pop35)
-	tee_local	$push161=, $15=, $pop162
-	i64.store	R+8($pop164), $pop161
-	i32.const	$push160=, 0
-	i64.load	$push159=, 32($16)
-	tee_local	$push158=, $14=, $pop159
-	i64.store	R($pop160), $pop158
-	i32.const	$push157=, 0
+	i32.const	$push148=, 8
+	i32.add 	$push35=, $pop129, $pop148
+	i64.load	$14=, 0($pop35)
+	i32.const	$push147=, 0
+	i64.store	R+8($pop147), $14
+	i64.load	$15=, 32($16)
+	i32.const	$push146=, 0
+	i64.store	R($pop146), $15
 	i32.const	$push130=, 176
 	i32.add 	$push131=, $16, $pop130
-	i32.const	$push156=, 8
-	i32.add 	$push36=, $pop131, $pop156
-	i64.load	$push155=, 0($pop36)
-	tee_local	$push154=, $11=, $pop155
-	i64.store	X+8($pop157), $pop154
-	i32.const	$push153=, 0
-	i64.load	$push152=, 176($16)
-	tee_local	$push151=, $10=, $pop152
-	i64.store	X($pop153), $pop151
-	i32.const	$push150=, 0
+	i32.const	$push145=, 8
+	i32.add 	$push36=, $pop131, $pop145
+	i64.load	$10=, 0($pop36)
+	i32.const	$push144=, 0
+	i64.store	X+8($pop144), $10
+	i64.load	$11=, 176($16)
+	i32.const	$push143=, 0
+	i64.store	X($pop143), $11
 	i32.const	$push132=, 64
 	i32.add 	$push133=, $16, $pop132
-	i32.const	$push149=, 8
-	i32.add 	$push37=, $pop133, $pop149
-	i64.load	$push148=, 0($pop37)
-	tee_local	$push147=, $3=, $pop148
-	i64.store	Y+8($pop150), $pop147
-	i32.const	$push146=, 0
-	i64.load	$push145=, 64($16)
-	tee_local	$push144=, $2=, $pop145
-	i64.store	Y($pop146), $pop144
-	i32.const	$push143=, 0
+	i32.const	$push142=, 8
+	i32.add 	$push37=, $pop133, $pop142
+	i64.load	$3=, 0($pop37)
+	i32.const	$push141=, 0
+	i64.store	Y+8($pop141), $3
+	i64.load	$2=, 64($16)
+	i32.const	$push140=, 0
+	i64.store	Y($pop140), $2
 	i32.const	$push134=, 144
 	i32.add 	$push135=, $16, $pop134
-	i32.const	$push142=, 8
-	i32.add 	$push38=, $pop135, $pop142
-	i64.load	$push141=, 0($pop38)
-	tee_local	$push140=, $1=, $pop141
-	i64.store	Z+8($pop143), $pop140
-	i32.const	$push139=, 0
-	i64.load	$push138=, 144($16)
-	tee_local	$push137=, $0=, $pop138
-	i64.store	Z($pop139), $pop137
+	i32.const	$push139=, 8
+	i32.add 	$push38=, $pop135, $pop139
+	i64.load	$1=, 0($pop38)
+	i32.const	$push138=, 0
+	i64.store	Z+8($pop138), $1
+	i64.load	$0=, 144($16)
+	i32.const	$push137=, 0
+	i64.store	Z($pop137), $0
 	block   	
 	i64.const	$push136=, 0
 	i64.const	$push39=, 4612354521497075712
 	i32.call	$push40=, __netf2@FUNCTION, $7, $6, $pop136, $pop39
 	br_if   	0, $pop40       # 0: down to label0
-# BB#1:                                 # %entry
-	i64.const	$push244=, 0
+# %bb.1:                                # %entry
+	i64.const	$push178=, 0
 	i64.const	$push41=, 4613097791357452288
-	i32.call	$push42=, __netf2@FUNCTION, $12, $13, $pop244, $pop41
+	i32.call	$push42=, __netf2@FUNCTION, $13, $12, $pop178, $pop41
 	br_if   	0, $pop42       # 0: down to label0
-# BB#2:                                 # %entry
-	i64.const	$push245=, 0
+# %bb.2:                                # %entry
+	i64.const	$push179=, 0
 	i64.const	$push43=, 4613150567915585536
-	i32.call	$push44=, __netf2@FUNCTION, $5, $4, $pop245, $pop43
+	i32.call	$push44=, __netf2@FUNCTION, $5, $4, $pop179, $pop43
 	br_if   	0, $pop44       # 0: down to label0
-# BB#3:                                 # %entry
-	i64.const	$push246=, 0
+# %bb.3:                                # %entry
+	i64.const	$push180=, 0
 	i64.const	$push45=, 4613517804799262720
-	i32.call	$push46=, __netf2@FUNCTION, $14, $15, $pop246, $pop45
+	i32.call	$push46=, __netf2@FUNCTION, $15, $14, $pop180, $pop45
 	br_if   	0, $pop46       # 0: down to label0
-# BB#4:                                 # %entry
-	i64.const	$push247=, 0
+# %bb.4:                                # %entry
+	i64.const	$push181=, 0
 	i64.const	$push47=, 4613503511148101632
-	i32.call	$push48=, __netf2@FUNCTION, $8, $9, $pop247, $pop47
+	i32.call	$push48=, __netf2@FUNCTION, $9, $8, $pop181, $pop47
 	br_if   	0, $pop48       # 0: down to label0
-# BB#5:                                 # %entry
-	i64.const	$push248=, 0
+# %bb.5:                                # %entry
+	i64.const	$push182=, 0
 	i64.const	$push49=, 4613040616752807936
-	i32.call	$push50=, __netf2@FUNCTION, $10, $11, $pop248, $pop49
+	i32.call	$push50=, __netf2@FUNCTION, $11, $10, $pop182, $pop49
 	br_if   	0, $pop50       # 0: down to label0
-# BB#6:                                 # %entry
-	i64.const	$push249=, 0
+# %bb.6:                                # %entry
+	i64.const	$push183=, 0
 	i64.const	$push51=, 4613110985496985600
-	i32.call	$push52=, __netf2@FUNCTION, $0, $1, $pop249, $pop51
+	i32.call	$push52=, __netf2@FUNCTION, $0, $1, $pop183, $pop51
 	br_if   	0, $pop52       # 0: down to label0
-# BB#7:                                 # %entry
-	i64.const	$push250=, 0
+# %bb.7:                                # %entry
+	i64.const	$push184=, 0
 	i64.const	$push53=, 4612961451915608064
-	i32.call	$push54=, __eqtf2@FUNCTION, $2, $3, $pop250, $pop53
+	i32.call	$push54=, __eqtf2@FUNCTION, $2, $3, $pop184, $pop53
 	br_if   	0, $pop54       # 0: down to label0
-# BB#8:                                 # %if.end
+# %bb.8:                                # %if.end
 	i32.const	$push55=, 0
 	call    	exit@FUNCTION, $pop55
 	unreachable
@@ -422,6 +389,6 @@ S:
 	.size	S, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0a3c4262a..2db17b2e1 100644
--- a/test/torture-s/restrict-1.c.s
+++ b/test/torture-s/restrict-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	4($0), $pop0
 	i32.load	$push2=, 0($2)
@@ -25,18 +25,17 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.load	$push6=, 0($0)
-	tee_local	$push5=, $1=, $pop6
+# %bb.0:                                # %entry
+	i32.load	$1=, 0($0)
 	i32.const	$push0=, 1
-	i32.shl 	$push1=, $pop5, $pop0
+	i32.shl 	$push1=, $1, $pop0
 	i64.extend_u/i32	$push2=, $pop1
 	i64.store	0($0):p2align=2, $pop2
 	block   	
 	i32.const	$push4=, 1
 	i32.ne  	$push3=, $1, $pop4
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -52,7 +51,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %bar.exit
+# %bb.0:                                # %bar.exit
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -60,5 +59,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/scal-to-vec1.c.s b/test/torture-s/scal-to-vec1.c.s
index b03137aae..82ea90818 100644
--- a/test/torture-s/scal-to-vec1.c.s
+++ b/test/torture-s/scal-to-vec1.c.s
@@ -7,120 +7,117 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	block   	
+	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
-	i32.load	$push317=, one($pop2)
-	tee_local	$push316=, $2=, $pop317
+	i32.load	$2=, one($pop2)
 	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.shl 	$3=, $2, $pop3
+	i32.const	$push330=, 16
+	i32.shr_s	$4=, $3, $pop330
+	block   	
+	i32.const	$push329=, 2
+	i32.add 	$push7=, $4, $pop329
 	i32.const	$push4=, 131072
 	i32.add 	$push5=, $3, $pop4
-	i32.const	$push309=, 16
-	i32.shr_s	$push6=, $pop5, $pop309
+	i32.const	$push328=, 16
+	i32.shr_s	$push6=, $pop5, $pop328
 	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
+# %bb.1:                                # %entry
+	i32.const	$push332=, 3
+	i32.const	$push331=, 3
+	i32.ne  	$push9=, $pop332, $pop331
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %entry
-	i32.const	$push321=, 4
-	i32.const	$push320=, 4
-	i32.ne  	$push10=, $pop321, $pop320
+# %bb.2:                                # %entry
+	i32.const	$push334=, 4
+	i32.const	$push333=, 4
+	i32.ne  	$push10=, $pop334, $pop333
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %entry
-	i32.const	$push323=, 5
-	i32.const	$push322=, 5
-	i32.ne  	$push11=, $pop323, $pop322
+# %bb.3:                                # %entry
+	i32.const	$push336=, 5
+	i32.const	$push335=, 5
+	i32.ne  	$push11=, $pop336, $pop335
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %entry
-	i32.const	$push325=, 6
-	i32.const	$push324=, 6
-	i32.ne  	$push12=, $pop325, $pop324
+# %bb.4:                                # %entry
+	i32.const	$push338=, 6
+	i32.const	$push337=, 6
+	i32.ne  	$push12=, $pop338, $pop337
 	br_if   	0, $pop12       # 0: down to label0
-# BB#5:                                 # %entry
-	i32.const	$push327=, 7
-	i32.const	$push326=, 7
-	i32.ne  	$push13=, $pop327, $pop326
+# %bb.5:                                # %entry
+	i32.const	$push340=, 7
+	i32.const	$push339=, 7
+	i32.ne  	$push13=, $pop340, $pop339
 	br_if   	0, $pop13       # 0: down to label0
-# BB#6:                                 # %entry
+# %bb.6:                                # %entry
 	i32.const	$push0=, 8
-	i32.const	$push328=, 8
-	i32.ne  	$push14=, $pop0, $pop328
+	i32.const	$push341=, 8
+	i32.ne  	$push14=, $pop0, $pop341
 	br_if   	0, $pop14       # 0: down to label0
-# BB#7:                                 # %entry
+# %bb.7:                                # %entry
 	i32.const	$push1=, 9
-	i32.const	$push329=, 9
-	i32.ne  	$push15=, $pop1, $pop329
+	i32.const	$push342=, 9
+	i32.ne  	$push15=, $pop1, $pop342
 	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
+# %bb.8:                                # %for.cond.7
+	i32.const	$push345=, 2
+	i32.sub 	$push23=, $pop345, $4
+	i32.const	$push344=, 2
+	i32.sub 	$push24=, $pop344, $2
 	i32.const	$push25=, 16
 	i32.shl 	$push26=, $pop24, $pop25
-	i32.const	$push330=, 16
-	i32.shr_s	$push27=, $pop26, $pop330
+	i32.const	$push343=, 16
+	i32.shr_s	$push27=, $pop26, $pop343
 	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
+# %bb.9:                                # %for.cond.7
+	i32.const	$push347=, 2
+	i32.const	$push346=, 1
+	i32.sub 	$push16=, $pop347, $pop346
 	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
+# %bb.10:                               # %for.cond.7
+	i32.const	$push349=, 2
+	i32.const	$push348=, 2
+	i32.sub 	$push17=, $pop349, $pop348
 	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
+# %bb.11:                               # %for.cond.7
+	i32.const	$push351=, 2
+	i32.const	$push350=, 3
+	i32.sub 	$push18=, $pop351, $pop350
 	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
+# %bb.12:                               # %for.cond.7
+	i32.const	$push353=, 2
+	i32.const	$push352=, 4
+	i32.sub 	$push19=, $pop353, $pop352
 	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
+# %bb.13:                               # %for.cond.7
+	i32.const	$push355=, 2
+	i32.const	$push354=, 5
+	i32.sub 	$push20=, $pop355, $pop354
 	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
+# %bb.14:                               # %for.cond.7
+	i32.const	$push357=, 2
+	i32.const	$push356=, 6
+	i32.sub 	$push21=, $pop357, $pop356
 	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
+# %bb.15:                               # %for.cond.7
+	i32.const	$push359=, 2
+	i32.const	$push358=, 7
+	i32.sub 	$push22=, $pop359, $pop358
 	i32.const	$push39=, -5
 	i32.ne  	$push40=, $pop22, $pop39
 	br_if   	0, $pop40       # 0: down to label0
-# BB#16:                                # %for.cond17.7
+# %bb.16:                               # %for.cond17.7
 	i32.const	$push48=, 15
 	i32.shr_s	$push49=, $3, $pop48
 	i32.const	$push50=, 17
@@ -129,686 +126,690 @@ main:                                   # @main
 	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
+# %bb.17:                               # %for.cond17.7
+	i32.const	$push361=, 1
+	i32.const	$push360=, 1
+	i32.shl 	$push41=, $pop361, $pop360
 	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
+# %bb.18:                               # %for.cond17.7
+	i32.const	$push363=, 2
+	i32.const	$push362=, 1
+	i32.shl 	$push42=, $pop363, $pop362
 	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
+# %bb.19:                               # %for.cond17.7
+	i32.const	$push365=, 3
+	i32.const	$push364=, 1
+	i32.shl 	$push43=, $pop365, $pop364
 	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
+# %bb.20:                               # %for.cond17.7
+	i32.const	$push367=, 4
+	i32.const	$push366=, 1
+	i32.shl 	$push44=, $pop367, $pop366
 	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
+# %bb.21:                               # %for.cond17.7
+	i32.const	$push369=, 5
+	i32.const	$push368=, 1
+	i32.shl 	$push45=, $pop369, $pop368
 	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
+# %bb.22:                               # %for.cond17.7
+	i32.const	$push371=, 6
+	i32.const	$push370=, 1
+	i32.shl 	$push46=, $pop371, $pop370
 	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
+# %bb.23:                               # %for.cond17.7
+	i32.const	$push373=, 7
+	i32.const	$push372=, 1
+	i32.shl 	$push47=, $pop373, $pop372
 	i32.const	$push67=, 14
 	i32.ne  	$push68=, $pop47, $pop67
 	br_if   	0, $pop68       # 0: down to label0
-# BB#24:                                # %for.cond37.7
+# %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	$push390=, 3
+	i32.div_s	$3=, $pop70, $pop390
 	i32.const	$push389=, 2
-	i32.const	$push388=, 6
-	i32.rem_s	$9=, $pop389, $pop388
+	i32.const	$push388=, 4
+	i32.div_s	$7=, $pop389, $pop388
 	i32.const	$push387=, 2
-	i32.const	$push386=, 7
-	i32.rem_s	$10=, $pop387, $pop386
+	i32.const	$push386=, 5
+	i32.div_s	$8=, $pop387, $pop386
 	i32.const	$push385=, 2
-	i32.const	$push384=, 1
-	i32.rem_u	$push93=, $pop385, $pop384
+	i32.const	$push384=, 6
+	i32.div_s	$9=, $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	$push382=, 7
+	i32.div_s	$10=, $pop383, $pop382
+	i32.const	$push381=, 2
+	i32.div_s	$11=, $pop381, $4
+	i32.const	$push380=, 2
+	i32.const	$push379=, 1
+	i32.div_u	$12=, $pop380, $pop379
+	i32.const	$push378=, 2
+	i32.const	$push377=, 2
+	i32.div_s	$6=, $pop378, $pop377
+	i32.const	$push376=, 2
+	i32.const	$push375=, 16
+	i32.shl 	$push77=, $2, $pop375
+	i32.const	$push374=, 16
+	i32.shr_s	$push78=, $pop77, $pop374
+	i32.div_s	$5=, $pop376, $pop78
+	i32.or  	$push71=, $3, $7
+	i32.or  	$push72=, $pop71, $8
+	i32.or  	$push73=, $pop72, $9
+	i32.or  	$push74=, $pop73, $10
+	i32.const	$push75=, 65535
+	i32.and 	$push76=, $pop74, $pop75
+	br_if   	0, $pop76       # 0: down to label0
+# %bb.25:                               # %for.cond37.7
+	i32.const	$push392=, 16
+	i32.shl 	$push79=, $5, $pop392
+	i32.const	$push391=, 16
+	i32.shr_s	$push69=, $pop79, $pop391
+	i32.ne  	$push80=, $11, $pop69
+	br_if   	0, $pop80       # 0: down to label0
+# %bb.26:                               # %for.cond37.7
+	i32.const	$push81=, 2
+	i32.ne  	$push82=, $12, $pop81
+	br_if   	0, $pop82       # 0: down to label0
+# %bb.27:                               # %for.cond37.7
+	i32.const	$push393=, 65535
+	i32.and 	$push83=, $6, $pop393
+	i32.const	$push84=, 1
+	i32.ne  	$push85=, $pop83, $pop84
+	br_if   	0, $pop85       # 0: down to label0
+# %bb.28:                               # %for.cond57.7
+	i32.const	$push398=, 2
+	i32.const	$push397=, 1
+	i32.mul 	$push93=, $12, $pop397
+	i32.sub 	$push94=, $pop398, $pop93
+	i32.const	$push396=, 2
+	i32.const	$push395=, 2
+	i32.mul 	$push95=, $6, $pop395
+	i32.sub 	$push96=, $pop396, $pop95
+	i32.or  	$push97=, $pop94, $pop96
+	i32.const	$push394=, 65535
+	i32.and 	$push98=, $pop97, $pop394
+	br_if   	0, $pop98       # 0: down to label0
+# %bb.29:                               # %for.cond57.7
 	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.mul 	$push99=, $11, $4
+	i32.sub 	$push86=, $pop401, $pop99
+	i32.const	$push400=, 2
+	i32.mul 	$push100=, $5, $2
+	i32.sub 	$push101=, $pop400, $pop100
+	i32.const	$push102=, 16
+	i32.shl 	$push103=, $pop101, $pop102
+	i32.const	$push399=, 16
+	i32.shr_s	$push87=, $pop103, $pop399
+	i32.ne  	$push109=, $pop86, $pop87
+	br_if   	0, $pop109      # 0: down to label0
+# %bb.30:                               # %for.cond57.7
 	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	$push404=, 3
+	i32.mul 	$push104=, $3, $pop404
+	i32.sub 	$push88=, $pop405, $pop104
+	i32.const	$push403=, 65535
+	i32.and 	$push110=, $pop88, $pop403
+	i32.const	$push402=, 2
+	i32.ne  	$push111=, $pop110, $pop402
+	br_if   	0, $pop111      # 0: down to label0
+# %bb.31:                               # %for.cond57.7
 	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	$push408=, 4
+	i32.mul 	$push105=, $7, $pop408
+	i32.sub 	$push89=, $pop409, $pop105
+	i32.const	$push407=, 65535
+	i32.and 	$push112=, $pop89, $pop407
+	i32.const	$push406=, 2
+	i32.ne  	$push113=, $pop112, $pop406
+	br_if   	0, $pop113      # 0: down to label0
+# %bb.32:                               # %for.cond57.7
+	i32.const	$push413=, 2
+	i32.const	$push412=, 5
+	i32.mul 	$push106=, $8, $pop412
+	i32.sub 	$push90=, $pop413, $pop106
+	i32.const	$push411=, 65535
+	i32.and 	$push114=, $pop90, $pop411
+	i32.const	$push410=, 2
+	i32.ne  	$push115=, $pop114, $pop410
+	br_if   	0, $pop115      # 0: down to label0
+# %bb.33:                               # %for.cond57.7
 	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	$push416=, 6
+	i32.mul 	$push107=, $9, $pop416
+	i32.sub 	$push91=, $pop417, $pop107
+	i32.const	$push415=, 65535
+	i32.and 	$push116=, $pop91, $pop415
+	i32.const	$push414=, 2
+	i32.ne  	$push117=, $pop116, $pop414
+	br_if   	0, $pop117      # 0: down to label0
+# %bb.34:                               # %for.cond57.7
 	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	$push420=, 7
+	i32.mul 	$push108=, $10, $pop420
+	i32.sub 	$push92=, $pop421, $pop108
+	i32.const	$push419=, 65535
+	i32.and 	$push118=, $pop92, $pop419
+	i32.const	$push418=, 2
+	i32.ne  	$push119=, $pop118, $pop418
+	br_if   	0, $pop119      # 0: down to label0
+# %bb.35:                               # %for.cond77.7
 	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.xor 	$push127=, $2, $pop423
+	i32.const	$push422=, 65535
+	i32.and 	$3=, $pop127, $pop422
+	i32.ne  	$push128=, $3, $3
+	br_if   	0, $pop128      # 0: down to label0
+# %bb.36:                               # %for.cond77.7
+	i32.const	$push425=, 1
+	i32.const	$push424=, 2
+	i32.or  	$push120=, $pop425, $pop424
+	i32.const	$push129=, 3
+	i32.ne  	$push130=, $pop120, $pop129
+	br_if   	0, $pop130      # 0: down to label0
+# %bb.37:                               # %for.cond77.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	$push426=, 2
+	i32.xor 	$push121=, $pop427, $pop426
+	br_if   	0, $pop121      # 0: down to label0
+# %bb.38:                               # %for.cond77.7
+	i32.const	$push429=, 3
+	i32.const	$push428=, 2
+	i32.xor 	$push122=, $pop429, $pop428
+	i32.const	$push131=, 1
+	i32.ne  	$push132=, $pop122, $pop131
+	br_if   	0, $pop132      # 0: down to label0
+# %bb.39:                               # %for.cond77.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	$push430=, 2
+	i32.xor 	$push123=, $pop431, $pop430
+	i32.const	$push133=, 6
+	i32.ne  	$push134=, $pop123, $pop133
+	br_if   	0, $pop134      # 0: down to label0
+# %bb.40:                               # %for.cond77.7
+	i32.const	$push433=, 5
+	i32.const	$push432=, 2
+	i32.xor 	$push124=, $pop433, $pop432
+	i32.const	$push135=, 7
+	i32.ne  	$push136=, $pop124, $pop135
+	br_if   	0, $pop136      # 0: down to label0
+# %bb.41:                               # %for.cond77.7
+	i32.const	$push435=, 6
 	i32.const	$push434=, 2
-	i32.and 	$push433=, $2, $pop434
-	tee_local	$push432=, $3=, $pop433
-	i32.ne  	$push138=, $pop432, $3
+	i32.xor 	$push125=, $pop435, $pop434
+	i32.const	$push137=, 4
+	i32.ne  	$push138=, $pop125, $pop137
 	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
+# %bb.42:                               # %for.cond77.7
+	i32.const	$push437=, 7
 	i32.const	$push436=, 2
-	i32.and 	$push132=, $pop437, $pop436
-	i32.const	$push435=, 2
-	i32.ne  	$push140=, $pop132, $pop435
+	i32.xor 	$push126=, $pop437, $pop436
+	i32.const	$push139=, 5
+	i32.ne  	$push140=, $pop126, $pop139
 	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
+# %bb.43:                               # %for.cond97.7
+	i32.const	$push440=, 4
+	i32.const	$push439=, 5
+	i32.or  	$push145=, $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.and 	$push146=, $pop145, $pop438
+	br_if   	0, $pop146      # 0: down to label0
+# %bb.44:                               # %for.cond97.7
 	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.and 	$3=, $2, $pop441
+	i32.ne  	$push147=, $3, $3
+	br_if   	0, $pop147      # 0: down to label0
+# %bb.45:                               # %for.cond97.7
+	i32.const	$push148=, 0
+	br_if   	0, $pop148      # 0: down to label0
+# %bb.46:                               # %for.cond97.7
 	i32.const	$push444=, 2
-	i32.ne  	$push143=, $pop135, $pop444
-	br_if   	0, $pop143      # 0: down to label0
-# BB#50:                                # %for.cond117.7
+	i32.const	$push443=, 2
+	i32.and 	$push141=, $pop444, $pop443
+	i32.const	$push442=, 2
+	i32.ne  	$push149=, $pop141, $pop442
+	br_if   	0, $pop149      # 0: down to label0
+# %bb.47:                               # %for.cond97.7
+	i32.const	$push447=, 3
+	i32.const	$push446=, 2
+	i32.and 	$push142=, $pop447, $pop446
+	i32.const	$push445=, 2
+	i32.ne  	$push150=, $pop142, $pop445
+	br_if   	0, $pop150      # 0: down to label0
+# %bb.48:                               # %for.cond97.7
+	i32.const	$push450=, 6
 	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.and 	$push143=, $pop450, $pop449
+	i32.const	$push448=, 2
+	i32.ne  	$push151=, $pop143, $pop448
+	br_if   	0, $pop151      # 0: down to label0
+# %bb.49:                               # %for.cond97.7
+	i32.const	$push453=, 7
 	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.and 	$push144=, $pop453, $pop452
+	i32.const	$push451=, 2
+	i32.ne  	$push152=, $pop144, $pop451
+	br_if   	0, $pop152      # 0: down to label0
+# %bb.50:                               # %for.cond117.7
 	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.or  	$push160=, $2, $pop454
+	i32.const	$push161=, 65535
+	i32.and 	$3=, $pop160, $pop161
+	i32.ne  	$push162=, $3, $3
+	br_if   	0, $pop162      # 0: down to label0
+# %bb.51:                               # %for.cond117.7
+	i32.const	$push456=, 1
+	i32.const	$push455=, 2
+	i32.or  	$push153=, $pop456, $pop455
+	i32.const	$push163=, 3
+	i32.ne  	$push164=, $pop153, $pop163
+	br_if   	0, $pop164      # 0: down to label0
+# %bb.52:                               # %for.cond117.7
 	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	$push457=, 2
+	i32.or  	$push154=, $pop458, $pop457
+	i32.const	$push165=, 2
+	i32.ne  	$push166=, $pop154, $pop165
+	br_if   	0, $pop166      # 0: down to label0
+# %bb.53:                               # %for.cond117.7
+	i32.const	$push460=, 3
+	i32.const	$push459=, 2
+	i32.or  	$push155=, $pop460, $pop459
+	i32.const	$push167=, 3
+	i32.ne  	$push168=, $pop155, $pop167
+	br_if   	0, $pop168      # 0: down to label0
+# %bb.54:                               # %for.cond117.7
+	i32.const	$push462=, 4
+	i32.const	$push461=, 2
+	i32.or  	$push156=, $pop462, $pop461
+	i32.const	$push169=, 6
+	i32.ne  	$push170=, $pop156, $pop169
+	br_if   	0, $pop170      # 0: down to label0
+# %bb.55:                               # %for.cond117.7
+	i32.const	$push464=, 5
+	i32.const	$push463=, 2
+	i32.or  	$push157=, $pop464, $pop463
+	i32.const	$push171=, 7
+	i32.ne  	$push172=, $pop157, $pop171
+	br_if   	0, $pop172      # 0: down to label0
+# %bb.56:                               # %for.cond117.7
+	i32.const	$push466=, 6
+	i32.const	$push465=, 2
+	i32.or  	$push158=, $pop466, $pop465
+	i32.const	$push173=, 6
+	i32.ne  	$push174=, $pop158, $pop173
+	br_if   	0, $pop174      # 0: down to label0
+# %bb.57:                               # %for.cond117.7
+	i32.const	$push468=, 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
+	i32.or  	$push159=, $pop468, $pop467
+	i32.const	$push175=, 7
+	i32.ne  	$push176=, $pop159, $pop175
+	br_if   	0, $pop176      # 0: down to label0
+# %bb.58:                               # %for.cond137.7
+	i32.const	$push472=, 2
+	i32.shl 	$push184=, $pop472, $4
+	i32.const	$push471=, 2
+	i32.const	$push470=, 65535
+	i32.and 	$push185=, $2, $pop470
+	i32.shl 	$push186=, $pop471, $pop185
+	i32.const	$push187=, 16
+	i32.shl 	$push188=, $pop186, $pop187
+	i32.const	$push469=, 16
+	i32.shr_s	$push189=, $pop188, $pop469
+	i32.ne  	$push190=, $pop184, $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
+# %bb.59:                               # %for.cond137.7
+	i32.const	$push475=, 2
+	i32.const	$push474=, 1
+	i32.shl 	$push177=, $pop475, $pop474
+	i32.const	$push473=, 65535
+	i32.and 	$push197=, $pop177, $pop473
+	i32.const	$push198=, 4
 	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
+# %bb.60:                               # %for.cond137.7
+	i32.const	$push479=, 2
+	i32.const	$push478=, 2
+	i32.const	$push477=, 65535
+	i32.and 	$push191=, $pop478, $pop477
+	i32.shl 	$push178=, $pop479, $pop191
+	i32.const	$push476=, 65535
+	i32.and 	$push200=, $pop178, $pop476
+	i32.const	$push201=, 8
 	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
+# %bb.61:                               # %for.cond137.7
+	i32.const	$push483=, 2
+	i32.const	$push482=, 3
+	i32.const	$push481=, 65535
+	i32.and 	$push192=, $pop482, $pop481
+	i32.shl 	$push179=, $pop483, $pop192
+	i32.const	$push480=, 65535
+	i32.and 	$push203=, $pop179, $pop480
+	i32.const	$push204=, 16
 	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
+# %bb.62:                               # %for.cond137.7
+	i32.const	$push487=, 2
+	i32.const	$push486=, 4
+	i32.const	$push485=, 65535
+	i32.and 	$push193=, $pop486, $pop485
+	i32.shl 	$push180=, $pop487, $pop193
+	i32.const	$push484=, 65535
+	i32.and 	$push206=, $pop180, $pop484
+	i32.const	$push207=, 32
 	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
+# %bb.63:                               # %for.cond137.7
+	i32.const	$push491=, 2
+	i32.const	$push490=, 5
+	i32.const	$push489=, 65535
+	i32.and 	$push194=, $pop490, $pop489
+	i32.shl 	$push181=, $pop491, $pop194
+	i32.const	$push488=, 65535
+	i32.and 	$push209=, $pop181, $pop488
+	i32.const	$push210=, 64
+	i32.ne  	$push211=, $pop209, $pop210
+	br_if   	0, $pop211      # 0: down to label0
+# %bb.64:                               # %for.cond137.7
+	i32.const	$push495=, 2
+	i32.const	$push494=, 6
+	i32.const	$push493=, 65535
+	i32.and 	$push195=, $pop494, $pop493
+	i32.shl 	$push182=, $pop495, $pop195
+	i32.const	$push492=, 65535
+	i32.and 	$push212=, $pop182, $pop492
+	i32.const	$push213=, 128
+	i32.ne  	$push214=, $pop212, $pop213
+	br_if   	0, $pop214      # 0: down to label0
+# %bb.65:                               # %for.cond137.7
+	i32.const	$push499=, 2
+	i32.const	$push498=, 7
+	i32.const	$push497=, 65535
+	i32.and 	$push196=, $pop498, $pop497
+	i32.shl 	$push183=, $pop499, $pop196
 	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.and 	$push215=, $pop183, $pop496
+	i32.const	$push216=, 256
+	i32.ne  	$push217=, $pop215, $pop216
+	br_if   	0, $pop217      # 0: down to label0
+# %bb.66:                               # %for.cond157.7
+	i32.const	$push518=, 2
 	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
+	i32.const	$push516=, 65535
+	i32.and 	$push221=, $pop517, $pop516
+	i32.shr_u	$push222=, $pop518, $pop221
+	i32.const	$push515=, 2
+	i32.const	$push514=, 3
+	i32.const	$push513=, 65535
+	i32.and 	$push223=, $pop514, $pop513
+	i32.shr_u	$push224=, $pop515, $pop223
+	i32.or  	$push225=, $pop222, $pop224
+	i32.const	$push512=, 2
+	i32.const	$push511=, 4
+	i32.const	$push510=, 65535
+	i32.and 	$push226=, $pop511, $pop510
+	i32.shr_u	$push227=, $pop512, $pop226
+	i32.or  	$push228=, $pop225, $pop227
+	i32.const	$push509=, 2
+	i32.const	$push508=, 5
+	i32.const	$push507=, 65535
+	i32.and 	$push229=, $pop508, $pop507
+	i32.shr_u	$push230=, $pop509, $pop229
+	i32.or  	$push231=, $pop228, $pop230
+	i32.const	$push506=, 2
+	i32.const	$push505=, 6
+	i32.const	$push504=, 65535
+	i32.and 	$push232=, $pop505, $pop504
+	i32.shr_u	$push233=, $pop506, $pop232
+	i32.or  	$push234=, $pop231, $pop233
+	i32.const	$push503=, 2
+	i32.const	$push502=, 7
+	i32.const	$push501=, 65535
+	i32.and 	$push235=, $pop502, $pop501
+	i32.shr_u	$push236=, $pop503, $pop235
+	i32.or  	$push237=, $pop234, $pop236
+	i32.const	$push500=, 65535
+	i32.and 	$push238=, $pop237, $pop500
 	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
+# %bb.67:                               # %for.cond157.7
+	i32.const	$push522=, 2
+	i32.shr_u	$push218=, $pop522, $4
+	i32.const	$push521=, 2
+	i32.const	$push520=, 65535
+	i32.and 	$push239=, $2, $pop520
+	i32.shr_u	$push240=, $pop521, $pop239
+	i32.const	$push241=, 16
+	i32.shl 	$push242=, $pop240, $pop241
+	i32.const	$push519=, 16
+	i32.shr_s	$push219=, $pop242, $pop519
+	i32.ne  	$push243=, $pop218, $pop219
+	br_if   	0, $pop243      # 0: down to label0
+# %bb.68:                               # %for.cond157.7
+	i32.const	$push524=, 2
 	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.shr_u	$push220=, $pop524, $pop523
+	i32.const	$push244=, 65535
+	i32.and 	$push245=, $pop220, $pop244
+	i32.const	$push246=, 1
+	i32.ne  	$push247=, $pop245, $pop246
+	br_if   	0, $pop247      # 0: down to label0
+# %bb.69:                               # %for.cond198.7
 	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
+	i32.add 	$push255=, $4, $pop526
+	i32.const	$push256=, 16
+	i32.shl 	$push257=, $2, $pop256
+	i32.const	$push258=, -131072
+	i32.add 	$push259=, $pop257, $pop258
+	i32.const	$push525=, 16
+	i32.shr_s	$push260=, $pop259, $pop525
+	i32.ne  	$push261=, $pop255, $pop260
+	br_if   	0, $pop261      # 0: down to label0
+# %bb.70:                               # %for.cond198.7
+	i32.const	$push528=, 1
+	i32.const	$push527=, -2
+	i32.or  	$push248=, $pop528, $pop527
+	i32.const	$push262=, -1
+	i32.ne  	$push263=, $pop248, $pop262
+	br_if   	0, $pop263      # 0: down to label0
+# %bb.71:                               # %for.cond198.7
+	i32.const	$push530=, 2
+	i32.const	$push529=, -2
+	i32.add 	$push249=, $pop530, $pop529
+	br_if   	0, $pop249      # 0: down to label0
+# %bb.72:                               # %for.cond198.7
+	i32.const	$push532=, 3
+	i32.const	$push531=, -2
+	i32.add 	$push250=, $pop532, $pop531
+	i32.const	$push264=, 1
+	i32.ne  	$push265=, $pop250, $pop264
+	br_if   	0, $pop265      # 0: down to label0
+# %bb.73:                               # %for.cond198.7
+	i32.const	$push534=, 4
+	i32.const	$push533=, -2
+	i32.add 	$push251=, $pop534, $pop533
+	i32.const	$push266=, 2
+	i32.ne  	$push267=, $pop251, $pop266
+	br_if   	0, $pop267      # 0: down to label0
+# %bb.74:                               # %for.cond198.7
+	i32.const	$push536=, 5
+	i32.const	$push535=, -2
+	i32.add 	$push252=, $pop536, $pop535
+	i32.const	$push268=, 3
+	i32.ne  	$push269=, $pop252, $pop268
+	br_if   	0, $pop269      # 0: down to label0
+# %bb.75:                               # %for.cond198.7
+	i32.const	$push538=, 6
+	i32.const	$push537=, -2
+	i32.add 	$push253=, $pop538, $pop537
+	i32.const	$push270=, 4
+	i32.ne  	$push271=, $pop253, $pop270
+	br_if   	0, $pop271      # 0: down to label0
+# %bb.76:                               # %for.cond198.7
+	i32.const	$push540=, 7
+	i32.const	$push539=, -2
+	i32.add 	$push254=, $pop540, $pop539
+	i32.const	$push272=, 5
+	i32.ne  	$push273=, $pop254, $pop272
 	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
+# %bb.77:                               # %for.cond240.7
+	i32.const	$push274=, 16
+	i32.shl 	$push275=, $2, $pop274
+	i32.const	$push555=, 16
+	i32.shr_s	$3=, $pop275, $pop555
+	i32.const	$push276=, 2
+	i32.div_s	$7=, $3, $pop276
+	i32.const	$push554=, 2
+	i32.const	$push553=, 2
+	i32.div_s	$8=, $pop554, $pop553
+	i32.const	$push552=, 3
+	i32.const	$push551=, 2
+	i32.div_s	$9=, $pop552, $pop551
+	i32.const	$push550=, 4
+	i32.const	$push549=, 2
+	i32.div_s	$10=, $pop550, $pop549
+	i32.const	$push548=, 5
+	i32.const	$push547=, 2
+	i32.div_s	$11=, $pop548, $pop547
+	i32.const	$push546=, 6
+	i32.const	$push545=, 2
+	i32.div_s	$12=, $pop546, $pop545
+	i32.const	$push544=, 7
+	i32.const	$push543=, 2
+	i32.div_s	$6=, $pop544, $pop543
+	i32.const	$push542=, 2
+	i32.div_s	$push279=, $3, $pop542
+	i32.const	$push277=, 65535
+	i32.and 	$push280=, $pop279, $pop277
+	i32.const	$push541=, 65535
+	i32.and 	$push278=, $7, $pop541
+	i32.ne  	$push281=, $pop280, $pop278
+	br_if   	0, $pop281      # 0: down to label0
+# %bb.78:                               # %for.cond240.7
+	i32.const	$push282=, 0
 	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
+# %bb.79:                               # %for.cond240.7
+	i32.const	$push557=, 65535
+	i32.and 	$push283=, $8, $pop557
+	i32.const	$push556=, 1
+	i32.ne  	$push284=, $pop283, $pop556
 	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
+# %bb.80:                               # %for.cond240.7
+	i32.const	$push559=, 65535
+	i32.and 	$push285=, $9, $pop559
+	i32.const	$push558=, 1
+	i32.ne  	$push286=, $pop285, $pop558
 	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
+# %bb.81:                               # %for.cond240.7
+	i32.const	$push561=, 65535
+	i32.and 	$push287=, $10, $pop561
+	i32.const	$push560=, 2
+	i32.ne  	$push288=, $pop287, $pop560
+	br_if   	0, $pop288      # 0: down to label0
+# %bb.82:                               # %for.cond240.7
+	i32.const	$push563=, 65535
+	i32.and 	$push289=, $11, $pop563
+	i32.const	$push562=, 2
+	i32.ne  	$push290=, $pop289, $pop562
+	br_if   	0, $pop290      # 0: down to label0
+# %bb.83:                               # %for.cond240.7
+	i32.const	$push565=, 65535
+	i32.and 	$push291=, $12, $pop565
+	i32.const	$push564=, 3
+	i32.ne  	$push292=, $pop291, $pop564
+	br_if   	0, $pop292      # 0: down to label0
+# %bb.84:                               # %for.cond240.7
+	i32.const	$push567=, 65535
+	i32.and 	$push293=, $6, $pop567
+	i32.const	$push566=, 3
+	i32.ne  	$push294=, $pop293, $pop566
+	br_if   	0, $pop294      # 0: down to label0
+# %bb.85:                               # %for.cond261.7
+	i32.const	$push301=, 2
+	i32.rem_s	$push302=, $4, $pop301
+	i32.const	$push569=, 1
+	i32.shl 	$push303=, $7, $pop569
+	i32.sub 	$push304=, $2, $pop303
+	i32.const	$push305=, 16
+	i32.shl 	$push306=, $pop304, $pop305
 	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.shr_s	$push307=, $pop306, $pop568
+	i32.ne  	$push308=, $pop302, $pop307
+	br_if   	0, $pop308      # 0: down to label0
+# %bb.86:                               # %for.cond261.7
+	i32.const	$push570=, 1
+	i32.eqz 	$push589=, $pop570
+	br_if   	0, $pop589      # 0: down to label0
+# %bb.87:                               # %for.cond261.7
+	i32.const	$push573=, 2
+	i32.const	$push572=, 1
+	i32.shl 	$push309=, $8, $pop572
+	i32.sub 	$push295=, $pop573, $pop309
+	i32.const	$push571=, 65535
+	i32.and 	$push315=, $pop295, $pop571
+	br_if   	0, $pop315      # 0: down to label0
+# %bb.88:                               # %for.cond261.7
+	i32.const	$push576=, 3
+	i32.const	$push575=, 1
+	i32.shl 	$push310=, $9, $pop575
+	i32.sub 	$push296=, $pop576, $pop310
+	i32.const	$push574=, 65535
+	i32.and 	$push316=, $pop296, $pop574
+	i32.const	$push317=, 1
+	i32.ne  	$push318=, $pop316, $pop317
+	br_if   	0, $pop318      # 0: down to label0
+# %bb.89:                               # %for.cond261.7
+	i32.const	$push579=, 4
+	i32.const	$push578=, 1
+	i32.shl 	$push311=, $10, $pop578
+	i32.sub 	$push297=, $pop579, $pop311
+	i32.const	$push577=, 65535
+	i32.and 	$push319=, $pop297, $pop577
+	br_if   	0, $pop319      # 0: down to label0
+# %bb.90:                               # %for.cond261.7
+	i32.const	$push582=, 5
 	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.shl 	$push312=, $11, $pop581
+	i32.sub 	$push298=, $pop582, $pop312
+	i32.const	$push580=, 65535
+	i32.and 	$push320=, $pop298, $pop580
+	i32.const	$push321=, 1
+	i32.ne  	$push322=, $pop320, $pop321
+	br_if   	0, $pop322      # 0: down to label0
+# %bb.91:                               # %for.cond261.7
+	i32.const	$push585=, 6
+	i32.const	$push584=, 1
+	i32.shl 	$push313=, $12, $pop584
+	i32.sub 	$push299=, $pop585, $pop313
 	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.and 	$push323=, $pop299, $pop583
+	br_if   	0, $pop323      # 0: down to label0
+# %bb.92:                               # %for.cond261.7
+	i32.const	$push588=, 7
+	i32.const	$push587=, 1
+	i32.shl 	$push314=, $6, $pop587
+	i32.sub 	$push300=, $pop588, $pop314
 	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
+	i32.and 	$push324=, $pop300, $pop586
+	i32.const	$push325=, 1
+	i32.ne  	$push326=, $pop324, $pop325
+	br_if   	0, $pop326      # 0: down to label0
+# %bb.93:                               # %for.cond667.1
+	i32.const	$push327=, 0
+	return  	$pop327
 .LBB0_94:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -827,5 +828,5 @@ one:
 	.size	one, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/scal-to-vec2.c.s b/test/torture-s/scal-to-vec2.c.s
index dfb018170..7ca4cc616 100644
--- a/test/torture-s/scal-to-vec2.c.s
+++ b/test/torture-s/scal-to-vec2.c.s
@@ -6,7 +6,7 @@
 	.type	vlng,@function
 vlng:                                   # @vlng
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 42
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ vlng:                                   # @vlng
 	.type	vint,@function
 vint:                                   # @vint
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 43
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ vint:                                   # @vint
 	.type	vsrt,@function
 vsrt:                                   # @vsrt
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 42
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -45,7 +45,7 @@ vsrt:                                   # @vsrt
 	.type	vchr,@function
 vchr:                                   # @vchr
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 42
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -60,338 +60,306 @@ 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
+# %bb.0:                                # %entry
+	i32.const	$push114=, 0
+	i32.load	$push113=, __stack_pointer($pop114)
+	i32.const	$push115=, 48
+	i32.sub 	$3=, $pop113, $pop115
+	i32.const	$push116=, 0
+	i32.store	__stack_pointer($pop116), $3
+	i32.const	$push129=, 7
+	i32.store8	47($3), $pop129
+	i32.const	$push14=, 1541
+	i32.store16	45($3):p2align=0, $pop14
 	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.const	$push15=, 67305985
+	i32.store	41($3):p2align=0, $pop15
+	i32.const	$push128=, 7
+	i32.store8	39($3), $pop128
+	i32.const	$push127=, 1541
+	i32.store16	37($3):p2align=0, $pop127
 	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.const	$push126=, 67305985
+	i32.store	33($3):p2align=0, $pop126
+	i32.const	$push125=, 7
+	i32.store16	30($3), $pop125
+	i32.const	$push16=, 393221
+	i32.store	26($3):p2align=1, $pop16
 	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
+	i64.const	$push17=, 1125912791875585
+	i64.store	18($3):p2align=1, $pop17
+	i32.const	$push124=, 3
+	i32.store	12($3), $pop124
+	i64.const	$push18=, 8589934593
+	i64.store	4($3):p2align=2, $pop18
 	i32.store	0($3), $0
+	i32.const	$push19=, 42
+	i32.add 	$2=, $0, $pop19
 	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	$push20=, 24
+	i32.shl 	$push23=, $0, $pop20
+	i32.const	$push123=, 24
+	i32.shr_s	$push24=, $pop23, $pop123
+	i32.const	$push122=, 42
+	i32.add 	$push25=, $pop24, $pop122
+	i32.const	$push121=, 24
+	i32.shl 	$push21=, $2, $pop121
+	i32.const	$push120=, 24
+	i32.shr_s	$push22=, $pop21, $pop120
+	i32.ne  	$push26=, $pop25, $pop22
+	br_if   	0, $pop26       # 0: down to label0
+# %bb.1:                                # %entry
+	i32.const	$push131=, 43
+	i32.const	$push130=, 43
+	i32.ne  	$push30=, $pop131, $pop130
+	br_if   	0, $pop30       # 0: down to label0
+# %bb.2:                                # %entry
+	i32.const	$push133=, 44
+	i32.const	$push132=, 44
+	i32.ne  	$push31=, $pop133, $pop132
+	br_if   	0, $pop31       # 0: down to label0
+# %bb.3:                                # %entry
+	i32.const	$push135=, 45
+	i32.const	$push134=, 45
+	i32.ne  	$push32=, $pop135, $pop134
+	br_if   	0, $pop32       # 0: down to label0
+# %bb.4:                                # %entry
+	i32.const	$push137=, 46
+	i32.const	$push136=, 46
+	i32.ne  	$push33=, $pop137, $pop136
+	br_if   	0, $pop33       # 0: down to label0
+# %bb.5:                                # %entry
+	i32.const	$push139=, 47
+	i32.const	$push138=, 47
+	i32.ne  	$push34=, $pop139, $pop138
+	br_if   	0, $pop34       # 0: down to label0
+# %bb.6:                                # %entry
+	i32.const	$push141=, 48
+	i32.const	$push140=, 48
+	i32.ne  	$push35=, $pop141, $pop140
+	br_if   	0, $pop35       # 0: down to label0
+# %bb.7:                                # %entry
+	i32.const	$push143=, 49
+	i32.const	$push142=, 49
+	i32.ne  	$push36=, $pop143, $pop142
+	br_if   	0, $pop36       # 0: down to label0
+# %bb.8:                                # %for.cond.7
+	i32.const	$push37=, 24
+	i32.shl 	$push38=, $0, $pop37
+	i32.const	$push146=, 24
+	i32.shr_s	$push39=, $pop38, $pop146
+	i32.const	$push40=, 42
+	i32.add 	$push41=, $pop39, $pop40
+	i32.const	$push145=, 24
+	i32.shl 	$push42=, $2, $pop145
+	i32.const	$push144=, 24
+	i32.shr_s	$push43=, $pop42, $pop144
+	i32.ne  	$push44=, $pop41, $pop43
+	br_if   	0, $pop44       # 0: down to label0
+# %bb.9:                                # %for.cond.7
+	i32.const	$push147=, 43
+	i32.const	$push45=, 43
+	i32.ne  	$push46=, $pop147, $pop45
+	br_if   	0, $pop46       # 0: down to label0
+# %bb.10:                               # %for.cond.7
+	i32.const	$push148=, 44
+	i32.const	$push47=, 44
+	i32.ne  	$push48=, $pop148, $pop47
+	br_if   	0, $pop48       # 0: down to label0
+# %bb.11:                               # %for.cond.7
 	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	$push49=, 45
+	i32.ne  	$push50=, $pop149, $pop49
+	br_if   	0, $pop50       # 0: down to label0
+# %bb.12:                               # %for.cond.11
+	i32.load8_s	$push51=, 44($3)
+	i32.const	$push151=, 42
+	i32.add 	$push52=, $pop51, $pop151
 	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.ne  	$push53=, $pop52, $pop150
+	br_if   	0, $pop53       # 0: down to label0
+# %bb.13:                               # %for.cond.12
+	i32.load8_s	$push54=, 45($3)
+	i32.const	$push153=, 42
+	i32.add 	$push55=, $pop54, $pop153
 	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.ne  	$push56=, $pop55, $pop152
+	br_if   	0, $pop56       # 0: down to label0
+# %bb.14:                               # %for.cond.13
+	i32.load8_s	$push57=, 46($3)
+	i32.const	$push155=, 42
+	i32.add 	$push58=, $pop57, $pop155
 	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.ne  	$push59=, $pop58, $pop154
+	br_if   	0, $pop59       # 0: down to label0
+# %bb.15:                               # %for.cond.14
+	i32.load8_s	$push60=, 47($3)
+	i32.const	$push157=, 42
+	i32.add 	$push61=, $pop60, $pop157
 	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.ne  	$push62=, $pop61, $pop156
+	br_if   	0, $pop62       # 0: down to label0
+# %bb.16:                               # %for.cond.15
+	i32.const	$push27=, 65535
+	i32.and 	$push28=, $0, $pop27
+	i32.const	$push29=, 65536
+	i32.or  	$push3=, $pop28, $pop29
+	i32.const	$push64=, 16
+	i32.shl 	$push67=, $pop3, $pop64
+	i32.const	$push162=, 16
+	i32.shr_s	$push68=, $pop67, $pop162
+	i32.const	$push161=, 42
+	i32.add 	$push69=, $pop68, $pop161
+	i32.const	$push160=, 42
+	i32.add 	$push7=, $0, $pop160
+	i32.const	$push159=, 16
+	i32.shl 	$push65=, $pop7, $pop159
+	i32.const	$push158=, 16
+	i32.shr_s	$push66=, $pop65, $pop158
+	i32.ne  	$push70=, $pop69, $pop66
+	br_if   	0, $pop70       # 0: down to label0
+# %bb.17:                               # %for.cond.15
+	i32.const	$push164=, 1
+	i32.const	$push163=, 42
+	i32.or  	$push63=, $pop164, $pop163
+	i32.const	$push71=, 43
+	i32.ne  	$push72=, $pop63, $pop71
+	br_if   	0, $pop72       # 0: down to label0
+# %bb.18:                               # %for.cond.15
+	i32.const	$push166=, 2
 	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.add 	$push8=, $pop166, $pop165
+	i32.const	$push73=, 44
+	i32.ne  	$push74=, $pop8, $pop73
+	br_if   	0, $pop74       # 0: down to label0
+# %bb.19:                               # %for.cond.15
+	i32.const	$push168=, 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.add 	$push9=, $pop168, $pop167
+	i32.const	$push75=, 45
+	i32.ne  	$push76=, $pop9, $pop75
+	br_if   	0, $pop76       # 0: down to label0
+# %bb.20:                               # %for.cond.15
+	i32.const	$push0=, 4
 	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.add 	$push10=, $pop0, $pop169
+	i32.const	$push77=, 46
+	i32.ne  	$push78=, $pop10, $pop77
+	br_if   	0, $pop78       # 0: down to label0
+# %bb.21:                               # %for.cond.15
+	i32.const	$push1=, 5
+	i32.const	$push170=, 42
+	i32.add 	$push11=, $pop1, $pop170
+	i32.const	$push79=, 47
+	i32.ne  	$push80=, $pop11, $pop79
+	br_if   	0, $pop80       # 0: down to label0
+# %bb.22:                               # %for.cond47.5
+	i32.load16_s	$push81=, 28($3)
+	i32.const	$push172=, 42
+	i32.add 	$push82=, $pop81, $pop172
+	i32.const	$push2=, 6
 	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.add 	$push12=, $pop2, $pop171
+	i32.ne  	$push83=, $pop82, $pop12
+	br_if   	0, $pop83       # 0: down to label0
+# %bb.23:                               # %for.cond47.6
+	i32.load16_s	$push84=, 30($3)
 	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.add 	$push85=, $pop84, $pop175
+	i32.const	$push174=, 7
+	i32.const	$push173=, 42
+	i32.add 	$push13=, $pop174, $pop173
+	i32.ne  	$push86=, $pop85, $pop13
+	br_if   	0, $pop86       # 0: down to label0
+# %bb.24:                               # %for.cond74.7
+	i32.const	$push176=, 43
+	i32.mul 	$2=, $0, $pop176
+	i32.ne  	$push87=, $2, $2
+	br_if   	0, $pop87       # 0: down to label0
+# %bb.25:                               # %for.cond74.7
+	i32.const	$push179=, 1
+	i32.const	$push178=, 43
+	i32.mul 	$push4=, $pop179, $pop178
+	i32.const	$push177=, 43
+	i32.ne  	$push88=, $pop4, $pop177
+	br_if   	0, $pop88       # 0: down to label0
+# %bb.26:                               # %for.cond74.7
+	i32.const	$push181=, 2
+	i32.const	$push180=, 43
+	i32.mul 	$push5=, $pop181, $pop180
+	i32.const	$push89=, 86
+	i32.ne  	$push90=, $pop5, $pop89
+	br_if   	0, $pop90       # 0: down to label0
+# %bb.27:                               # %for.cond99.2
+	i32.load	$2=, 12($3)
+	i32.const	$push183=, 3
+	i32.const	$push182=, 43
+	i32.mul 	$push6=, $pop183, $pop182
+	i32.const	$push91=, 43
+	i32.mul 	$push92=, $2, $pop91
+	i32.ne  	$push93=, $pop6, $pop92
+	br_if   	0, $pop93       # 0: down to label0
+# %bb.28:                               # %for.cond99.3
+	i32.load	$push99=, 0($3)
 	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.mul 	$push100=, $pop99, $pop185
+	i32.const	$push184=, 42
+	i32.mul 	$push98=, $0, $pop184
+	i32.ne  	$push101=, $pop100, $pop98
+	br_if   	0, $pop101      # 0: down to label0
+# %bb.29:                               # %for.cond99.3
+	i32.const	$push188=, 1
 	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.mul 	$push94=, $pop188, $pop187
+	i32.const	$push186=, 42
+	i32.ne  	$push102=, $pop94, $pop186
+	br_if   	0, $pop102      # 0: down to label0
+# %bb.30:                               # %for.cond99.3
+	i32.const	$push190=, 2
+	i32.const	$push189=, 42
+	i32.mul 	$push95=, $pop190, $pop189
+	i32.const	$push103=, 84
+	i32.ne  	$push104=, $pop95, $pop103
+	br_if   	0, $pop104      # 0: down to label0
+# %bb.31:                               # %for.cond99.3
+	i32.const	$push193=, 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.mul 	$push96=, $pop193, $pop192
+	i32.const	$push191=, 42
+	i32.mul 	$push97=, $2, $pop191
+	i32.ne  	$push105=, $pop96, $pop97
+	br_if   	0, $pop105      # 0: down to label0
+# %bb.32:                               # %for.cond148.3
+	i32.const	$push194=, 42
+	i32.mul 	$2=, $0, $pop194
+	i32.ne  	$push107=, $2, $2
+	br_if   	0, $pop107      # 0: down to label0
+# %bb.33:                               # %for.cond148.3
+	i32.const	$push197=, 1
+	i32.const	$push196=, 42
+	i32.mul 	$push106=, $pop197, $pop196
+	i32.const	$push195=, 42
+	i32.ne  	$push108=, $pop106, $pop195
+	br_if   	0, $pop108      # 0: down to label0
+# %bb.34:                               # %for.cond172.1
+	i32.const	$push198=, 43
+	i32.mul 	$0=, $0, $pop198
+	i32.ne  	$push110=, $0, $0
+	br_if   	0, $pop110      # 0: down to label0
+# %bb.35:                               # %for.cond172.1
+	i32.const	$push201=, 1
+	i32.const	$push200=, 43
+	i32.mul 	$push109=, $pop201, $pop200
 	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
+	i32.ne  	$push111=, $pop109, $pop199
+	br_if   	0, $pop111      # 0: down to label0
+# %bb.36:                               # %for.cond244.1
+	i32.const	$push119=, 0
+	i32.const	$push117=, 48
+	i32.add 	$push118=, $3, $pop117
+	i32.store	__stack_pointer($pop119), $pop118
+	i32.const	$push112=, 0
+	return  	$pop112
 .LBB4_37:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -401,5 +369,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/scal-to-vec3.c.s b/test/torture-s/scal-to-vec3.c.s
index 1f0755c48..f3c2cdb9d 100644
--- a/test/torture-s/scal-to-vec3.c.s
+++ b/test/torture-s/scal-to-vec3.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %for.cond258.1
+# %bb.0:                                # %for.cond258.1
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -15,4 +15,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/scope-1.c.s b/test/torture-s/scope-1.c.s
index d26ddc302..4eaddacbf 100644
--- a/test/torture-s/scope-1.c.s
+++ b/test/torture-s/scope-1.c.s
@@ -7,14 +7,14 @@
 f:                                      # @f
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 0
 	i32.load	$push1=, v($pop0)
 	i32.const	$push2=, 3
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return  	$0
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -30,7 +30,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$drop=, f@FUNCTION
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
@@ -49,6 +49,6 @@ v:
 	.size	v, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	exit, void, i32
diff --git a/test/torture-s/shiftdi.c.s b/test/torture-s/shiftdi.c.s
index ca5cdee86..3a7949c0f 100644
--- a/test/torture-s/shiftdi.c.s
+++ b/test/torture-s/shiftdi.c.s
@@ -6,7 +6,7 @@
 	.type	g,@function
 g:                                      # @g
 	.param  	i64, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push11=, 0($3)
 	i64.extend_u/i32	$push0=, $1
 	i64.shr_u	$push1=, $0, $pop0
@@ -33,7 +33,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -41,4 +41,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/shiftopt-1.c.s b/test/torture-s/shiftopt-1.c.s
index b94aa42bb..0c1fdfbdf 100644
--- a/test/torture-s/shiftopt-1.c.s
+++ b/test/torture-s/shiftopt-1.c.s
@@ -6,7 +6,7 @@
 	.type	utest,@function
 utest:                                  # @utest
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,7 +18,7 @@ utest:                                  # @utest
 	.type	stest,@function
 stest:                                  # @stest
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -30,7 +30,7 @@ stest:                                  # @stest
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -38,4 +38,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/simd-1.c.s b/test/torture-s/simd-1.c.s
index 7f1072403..361684498 100644
--- a/test/torture-s/simd-1.c.s
+++ b/test/torture-s/simd-1.c.s
@@ -6,20 +6,20 @@
 	.type	verify,@function
 verify:                                 # @verify
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $4
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.ne  	$push1=, $1, $5
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.ne  	$push2=, $2, $6
 	br_if   	0, $pop2        # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.ne  	$push3=, $3, $7
 	br_if   	0, $pop3        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -36,264 +36,199 @@ verify:                                 # @verify
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push280=, 0
-	i32.load	$push2=, j+12($pop280)
-	i32.const	$push279=, 0
-	i32.load	$push1=, i+12($pop279)
-	i32.add 	$push278=, $pop2, $pop1
-	tee_local	$push277=, $0=, $pop278
-	i32.store	k+12($pop0), $pop277
-	i32.const	$push276=, 0
-	i32.const	$push275=, 0
-	i32.load	$push4=, j+8($pop275)
-	i32.const	$push274=, 0
-	i32.load	$push3=, i+8($pop274)
-	i32.add 	$push273=, $pop4, $pop3
-	tee_local	$push272=, $1=, $pop273
-	i32.store	k+8($pop276), $pop272
-	i32.const	$push271=, 0
-	i32.const	$push270=, 0
-	i32.load	$push6=, j+4($pop270)
-	i32.const	$push269=, 0
-	i32.load	$push5=, i+4($pop269)
-	i32.add 	$push268=, $pop6, $pop5
-	tee_local	$push267=, $2=, $pop268
-	i32.store	k+4($pop271), $pop267
-	i32.const	$push266=, 0
-	i32.const	$push265=, 0
-	i32.load	$push8=, j($pop265)
-	i32.const	$push264=, 0
-	i32.load	$push7=, i($pop264)
-	i32.add 	$push263=, $pop8, $pop7
-	tee_local	$push262=, $3=, $pop263
-	i32.store	k($pop266), $pop262
-	i32.const	$push261=, 0
-	i32.store	res+12($pop261), $0
-	i32.const	$push260=, 0
-	i32.store	res+8($pop260), $1
-	i32.const	$push259=, 0
-	i32.store	res+4($pop259), $2
-	i32.const	$push258=, 0
-	i32.store	res($pop258), $3
-	i32.const	$push12=, 160
-	i32.const	$push11=, 113
-	i32.const	$push10=, 170
-	i32.const	$push9=, 230
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop12, $pop11, $pop10, $pop9
-	i32.const	$push257=, 0
-	i32.const	$push256=, 0
-	i32.load	$push14=, j+12($pop256)
-	i32.const	$push255=, 0
-	i32.load	$push13=, i+12($pop255)
-	i32.mul 	$push254=, $pop14, $pop13
-	tee_local	$push253=, $0=, $pop254
-	i32.store	k+12($pop257), $pop253
-	i32.const	$push252=, 0
-	i32.const	$push251=, 0
-	i32.load	$push16=, j+8($pop251)
-	i32.const	$push250=, 0
-	i32.load	$push15=, i+8($pop250)
-	i32.mul 	$push249=, $pop16, $pop15
-	tee_local	$push248=, $1=, $pop249
-	i32.store	k+8($pop252), $pop248
-	i32.const	$push247=, 0
-	i32.const	$push246=, 0
-	i32.load	$push18=, j+4($pop246)
-	i32.const	$push245=, 0
-	i32.load	$push17=, i+4($pop245)
-	i32.mul 	$push244=, $pop18, $pop17
-	tee_local	$push243=, $2=, $pop244
-	i32.store	k+4($pop247), $pop243
-	i32.const	$push242=, 0
-	i32.const	$push241=, 0
-	i32.load	$push20=, j($pop241)
-	i32.const	$push240=, 0
-	i32.load	$push19=, i($pop240)
-	i32.mul 	$push239=, $pop20, $pop19
-	tee_local	$push238=, $3=, $pop239
-	i32.store	k($pop242), $pop238
-	i32.const	$push237=, 0
-	i32.store	res+12($pop237), $0
-	i32.const	$push236=, 0
-	i32.store	res+8($pop236), $1
-	i32.const	$push235=, 0
-	i32.store	res+4($pop235), $2
-	i32.const	$push234=, 0
-	i32.store	res($pop234), $3
-	i32.const	$push24=, 1500
-	i32.const	$push23=, 1300
-	i32.const	$push22=, 3000
-	i32.const	$push21=, 6000
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop24, $pop23, $pop22, $pop21
-	i32.const	$push233=, 0
-	i32.const	$push232=, 0
-	i32.load	$push26=, i+12($pop232)
-	i32.const	$push231=, 0
-	i32.load	$push25=, j+12($pop231)
-	i32.div_s	$push230=, $pop26, $pop25
-	tee_local	$push229=, $0=, $pop230
-	i32.store	k+12($pop233), $pop229
-	i32.const	$push228=, 0
-	i32.const	$push227=, 0
-	i32.load	$push28=, i+8($pop227)
-	i32.const	$push226=, 0
-	i32.load	$push27=, j+8($pop226)
-	i32.div_s	$push225=, $pop28, $pop27
-	tee_local	$push224=, $1=, $pop225
-	i32.store	k+8($pop228), $pop224
-	i32.const	$push223=, 0
-	i32.const	$push222=, 0
-	i32.load	$push30=, i+4($pop222)
-	i32.const	$push221=, 0
-	i32.load	$push29=, j+4($pop221)
-	i32.div_s	$push220=, $pop30, $pop29
-	tee_local	$push219=, $2=, $pop220
-	i32.store	k+4($pop223), $pop219
-	i32.const	$push218=, 0
-	i32.const	$push217=, 0
-	i32.load	$push32=, i($pop217)
+	i32.load	$push2=, j+12($pop0)
 	i32.const	$push216=, 0
-	i32.load	$push31=, j($pop216)
-	i32.div_s	$push215=, $pop32, $pop31
-	tee_local	$push214=, $3=, $pop215
-	i32.store	k($pop218), $pop214
+	i32.load	$push1=, i+12($pop216)
+	i32.add 	$0=, $pop2, $pop1
+	i32.const	$push215=, 0
+	i32.store	k+12($pop215), $0
+	i32.const	$push214=, 0
+	i32.load	$push4=, j+8($pop214)
 	i32.const	$push213=, 0
-	i32.store	res+12($pop213), $0
+	i32.load	$push3=, i+8($pop213)
+	i32.add 	$1=, $pop4, $pop3
 	i32.const	$push212=, 0
-	i32.store	res+8($pop212), $1
+	i32.store	k+8($pop212), $1
 	i32.const	$push211=, 0
-	i32.store	res+4($pop211), $2
+	i32.load	$push6=, j+4($pop211)
 	i32.const	$push210=, 0
-	i32.store	res($pop210), $3
-	i32.const	$push35=, 15
-	i32.const	$push34=, 7
-	i32.const	$push209=, 7
-	i32.const	$push33=, 6
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop35, $pop34, $pop209, $pop33
+	i32.load	$push5=, i+4($pop210)
+	i32.add 	$2=, $pop6, $pop5
+	i32.const	$push209=, 0
+	i32.store	k+4($pop209), $2
 	i32.const	$push208=, 0
+	i32.load	$push8=, j($pop208)
 	i32.const	$push207=, 0
-	i32.load	$push37=, j+12($pop207)
+	i32.load	$push7=, i($pop207)
+	i32.add 	$3=, $pop8, $pop7
 	i32.const	$push206=, 0
-	i32.load	$push36=, i+12($pop206)
-	i32.and 	$push205=, $pop37, $pop36
-	tee_local	$push204=, $0=, $pop205
-	i32.store	k+12($pop208), $pop204
+	i32.store	k($pop206), $3
+	i32.const	$push205=, 0
+	i32.store	res+12($pop205), $0
+	i32.const	$push204=, 0
+	i32.store	res+8($pop204), $1
 	i32.const	$push203=, 0
+	i32.store	res+4($pop203), $2
 	i32.const	$push202=, 0
-	i32.load	$push39=, j+8($pop202)
+	i32.store	res($pop202), $3
+	i32.const	$push12=, 160
+	i32.const	$push11=, 113
+	i32.const	$push10=, 170
+	i32.const	$push9=, 230
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop12, $pop11, $pop10, $pop9
 	i32.const	$push201=, 0
-	i32.load	$push38=, i+8($pop201)
-	i32.and 	$push200=, $pop39, $pop38
-	tee_local	$push199=, $1=, $pop200
-	i32.store	k+8($pop203), $pop199
+	i32.load	$push14=, j+12($pop201)
+	i32.const	$push200=, 0
+	i32.load	$push13=, i+12($pop200)
+	i32.mul 	$0=, $pop14, $pop13
+	i32.const	$push199=, 0
+	i32.store	k+12($pop199), $0
 	i32.const	$push198=, 0
+	i32.load	$push16=, j+8($pop198)
 	i32.const	$push197=, 0
-	i32.load	$push41=, j+4($pop197)
+	i32.load	$push15=, i+8($pop197)
+	i32.mul 	$1=, $pop16, $pop15
 	i32.const	$push196=, 0
-	i32.load	$push40=, i+4($pop196)
-	i32.and 	$push195=, $pop41, $pop40
-	tee_local	$push194=, $2=, $pop195
-	i32.store	k+4($pop198), $pop194
+	i32.store	k+8($pop196), $1
+	i32.const	$push195=, 0
+	i32.load	$push18=, j+4($pop195)
+	i32.const	$push194=, 0
+	i32.load	$push17=, i+4($pop194)
+	i32.mul 	$2=, $pop18, $pop17
 	i32.const	$push193=, 0
+	i32.store	k+4($pop193), $2
 	i32.const	$push192=, 0
-	i32.load	$push43=, j($pop192)
+	i32.load	$push20=, j($pop192)
 	i32.const	$push191=, 0
-	i32.load	$push42=, i($pop191)
-	i32.and 	$push190=, $pop43, $pop42
-	tee_local	$push189=, $3=, $pop190
-	i32.store	k($pop193), $pop189
+	i32.load	$push19=, i($pop191)
+	i32.mul 	$3=, $pop20, $pop19
+	i32.const	$push190=, 0
+	i32.store	k($pop190), $3
+	i32.const	$push189=, 0
+	i32.store	res+12($pop189), $0
 	i32.const	$push188=, 0
-	i32.store	res+12($pop188), $0
+	i32.store	res+8($pop188), $1
 	i32.const	$push187=, 0
-	i32.store	res+8($pop187), $1
+	i32.store	res+4($pop187), $2
 	i32.const	$push186=, 0
-	i32.store	res+4($pop186), $2
+	i32.store	res($pop186), $3
+	i32.const	$push24=, 1500
+	i32.const	$push23=, 1300
+	i32.const	$push22=, 3000
+	i32.const	$push21=, 6000
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop24, $pop23, $pop22, $pop21
 	i32.const	$push185=, 0
-	i32.store	res($pop185), $3
-	i32.const	$push47=, 2
-	i32.const	$push46=, 4
-	i32.const	$push45=, 20
-	i32.const	$push44=, 8
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop47, $pop46, $pop45, $pop44
+	i32.load	$push26=, i+12($pop185)
 	i32.const	$push184=, 0
+	i32.load	$push25=, j+12($pop184)
+	i32.div_s	$0=, $pop26, $pop25
 	i32.const	$push183=, 0
-	i32.load	$push49=, j+12($pop183)
+	i32.store	k+12($pop183), $0
 	i32.const	$push182=, 0
-	i32.load	$push48=, i+12($pop182)
-	i32.or  	$push181=, $pop49, $pop48
-	tee_local	$push180=, $0=, $pop181
-	i32.store	k+12($pop184), $pop180
+	i32.load	$push28=, i+8($pop182)
+	i32.const	$push181=, 0
+	i32.load	$push27=, j+8($pop181)
+	i32.div_s	$1=, $pop28, $pop27
+	i32.const	$push180=, 0
+	i32.store	k+8($pop180), $1
 	i32.const	$push179=, 0
+	i32.load	$push30=, i+4($pop179)
 	i32.const	$push178=, 0
-	i32.load	$push51=, j+8($pop178)
+	i32.load	$push29=, j+4($pop178)
+	i32.div_s	$2=, $pop30, $pop29
 	i32.const	$push177=, 0
-	i32.load	$push50=, i+8($pop177)
-	i32.or  	$push176=, $pop51, $pop50
-	tee_local	$push175=, $1=, $pop176
-	i32.store	k+8($pop179), $pop175
+	i32.store	k+4($pop177), $2
+	i32.const	$push176=, 0
+	i32.load	$push32=, i($pop176)
+	i32.const	$push175=, 0
+	i32.load	$push31=, j($pop175)
+	i32.div_s	$3=, $pop32, $pop31
 	i32.const	$push174=, 0
+	i32.store	k($pop174), $3
 	i32.const	$push173=, 0
-	i32.load	$push53=, j+4($pop173)
+	i32.store	res+12($pop173), $0
 	i32.const	$push172=, 0
-	i32.load	$push52=, i+4($pop172)
-	i32.or  	$push171=, $pop53, $pop52
-	tee_local	$push170=, $2=, $pop171
-	i32.store	k+4($pop174), $pop170
-	i32.const	$push169=, 0
+	i32.store	res+8($pop172), $1
+	i32.const	$push171=, 0
+	i32.store	res+4($pop171), $2
+	i32.const	$push170=, 0
+	i32.store	res($pop170), $3
+	i32.const	$push35=, 15
+	i32.const	$push34=, 7
+	i32.const	$push169=, 7
+	i32.const	$push33=, 6
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop35, $pop34, $pop169, $pop33
 	i32.const	$push168=, 0
-	i32.load	$push55=, j($pop168)
+	i32.load	$push37=, j+12($pop168)
 	i32.const	$push167=, 0
-	i32.load	$push54=, i($pop167)
-	i32.or  	$push166=, $pop55, $pop54
-	tee_local	$push165=, $3=, $pop166
-	i32.store	k($pop169), $pop165
+	i32.load	$push36=, i+12($pop167)
+	i32.and 	$0=, $pop37, $pop36
+	i32.const	$push166=, 0
+	i32.store	k+12($pop166), $0
+	i32.const	$push165=, 0
+	i32.load	$push39=, j+8($pop165)
 	i32.const	$push164=, 0
-	i32.store	res+12($pop164), $0
+	i32.load	$push38=, i+8($pop164)
+	i32.and 	$1=, $pop39, $pop38
 	i32.const	$push163=, 0
-	i32.store	res+8($pop163), $1
+	i32.store	k+8($pop163), $1
 	i32.const	$push162=, 0
-	i32.store	res+4($pop162), $2
+	i32.load	$push41=, j+4($pop162)
 	i32.const	$push161=, 0
-	i32.store	res($pop161), $3
-	i32.const	$push59=, 158
-	i32.const	$push58=, 109
-	i32.const	$push57=, 150
-	i32.const	$push56=, 222
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop59, $pop58, $pop57, $pop56
+	i32.load	$push40=, i+4($pop161)
+	i32.and 	$2=, $pop41, $pop40
 	i32.const	$push160=, 0
+	i32.store	k+4($pop160), $2
 	i32.const	$push159=, 0
-	i32.load	$push61=, j+12($pop159)
+	i32.load	$push43=, j($pop159)
 	i32.const	$push158=, 0
-	i32.load	$push60=, i+12($pop158)
-	i32.xor 	$push157=, $pop61, $pop60
-	tee_local	$push156=, $0=, $pop157
-	i32.store	k+12($pop160), $pop156
+	i32.load	$push42=, i($pop158)
+	i32.and 	$3=, $pop43, $pop42
+	i32.const	$push157=, 0
+	i32.store	k($pop157), $3
+	i32.const	$push156=, 0
+	i32.store	res+12($pop156), $0
 	i32.const	$push155=, 0
+	i32.store	res+8($pop155), $1
 	i32.const	$push154=, 0
-	i32.load	$push63=, j+8($pop154)
+	i32.store	res+4($pop154), $2
 	i32.const	$push153=, 0
-	i32.load	$push62=, i+8($pop153)
-	i32.xor 	$push152=, $pop63, $pop62
-	tee_local	$push151=, $1=, $pop152
-	i32.store	k+8($pop155), $pop151
+	i32.store	res($pop153), $3
+	i32.const	$push47=, 2
+	i32.const	$push46=, 4
+	i32.const	$push45=, 20
+	i32.const	$push44=, 8
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop47, $pop46, $pop45, $pop44
+	i32.const	$push152=, 0
+	i32.load	$push49=, j+12($pop152)
+	i32.const	$push151=, 0
+	i32.load	$push48=, i+12($pop151)
+	i32.or  	$0=, $pop49, $pop48
 	i32.const	$push150=, 0
+	i32.store	k+12($pop150), $0
 	i32.const	$push149=, 0
-	i32.load	$push65=, j+4($pop149)
+	i32.load	$push51=, j+8($pop149)
 	i32.const	$push148=, 0
-	i32.load	$push64=, i+4($pop148)
-	i32.xor 	$push147=, $pop65, $pop64
-	tee_local	$push146=, $2=, $pop147
-	i32.store	k+4($pop150), $pop146
+	i32.load	$push50=, i+8($pop148)
+	i32.or  	$1=, $pop51, $pop50
+	i32.const	$push147=, 0
+	i32.store	k+8($pop147), $1
+	i32.const	$push146=, 0
+	i32.load	$push53=, j+4($pop146)
 	i32.const	$push145=, 0
+	i32.load	$push52=, i+4($pop145)
+	i32.or  	$2=, $pop53, $pop52
 	i32.const	$push144=, 0
-	i32.load	$push67=, j($pop144)
+	i32.store	k+4($pop144), $2
 	i32.const	$push143=, 0
-	i32.load	$push66=, i($pop143)
-	i32.xor 	$push142=, $pop67, $pop66
-	tee_local	$push141=, $3=, $pop142
-	i32.store	k($pop145), $pop141
+	i32.load	$push55=, j($pop143)
+	i32.const	$push142=, 0
+	i32.load	$push54=, i($pop142)
+	i32.or  	$3=, $pop55, $pop54
+	i32.const	$push141=, 0
+	i32.store	k($pop141), $3
 	i32.const	$push140=, 0
 	i32.store	res+12($pop140), $0
 	i32.const	$push139=, 0
@@ -302,80 +237,113 @@ main:                                   # @main
 	i32.store	res+4($pop138), $2
 	i32.const	$push137=, 0
 	i32.store	res($pop137), $3
-	i32.const	$push71=, 156
-	i32.const	$push70=, 105
-	i32.const	$push69=, 130
-	i32.const	$push68=, 214
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop71, $pop70, $pop69, $pop68
+	i32.const	$push59=, 158
+	i32.const	$push58=, 109
+	i32.const	$push57=, 150
+	i32.const	$push56=, 222
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop59, $pop58, $pop57, $pop56
 	i32.const	$push136=, 0
+	i32.load	$push61=, j+12($pop136)
 	i32.const	$push135=, 0
+	i32.load	$push60=, i+12($pop135)
+	i32.xor 	$0=, $pop61, $pop60
 	i32.const	$push134=, 0
-	i32.load	$push72=, i+12($pop134)
-	i32.sub 	$push133=, $pop135, $pop72
-	tee_local	$push132=, $0=, $pop133
-	i32.store	k+12($pop136), $pop132
+	i32.store	k+12($pop134), $0
+	i32.const	$push133=, 0
+	i32.load	$push63=, j+8($pop133)
+	i32.const	$push132=, 0
+	i32.load	$push62=, i+8($pop132)
+	i32.xor 	$1=, $pop63, $pop62
 	i32.const	$push131=, 0
+	i32.store	k+8($pop131), $1
 	i32.const	$push130=, 0
+	i32.load	$push65=, j+4($pop130)
 	i32.const	$push129=, 0
-	i32.load	$push73=, i+8($pop129)
-	i32.sub 	$push128=, $pop130, $pop73
-	tee_local	$push127=, $1=, $pop128
-	i32.store	k+8($pop131), $pop127
+	i32.load	$push64=, i+4($pop129)
+	i32.xor 	$2=, $pop65, $pop64
+	i32.const	$push128=, 0
+	i32.store	k+4($pop128), $2
+	i32.const	$push127=, 0
+	i32.load	$push67=, j($pop127)
 	i32.const	$push126=, 0
+	i32.load	$push66=, i($pop126)
+	i32.xor 	$3=, $pop67, $pop66
 	i32.const	$push125=, 0
+	i32.store	k($pop125), $3
 	i32.const	$push124=, 0
-	i32.load	$push74=, i+4($pop124)
-	i32.sub 	$push123=, $pop125, $pop74
-	tee_local	$push122=, $2=, $pop123
-	i32.store	k+4($pop126), $pop122
+	i32.store	res+12($pop124), $0
+	i32.const	$push123=, 0
+	i32.store	res+8($pop123), $1
+	i32.const	$push122=, 0
+	i32.store	res+4($pop122), $2
 	i32.const	$push121=, 0
+	i32.store	res($pop121), $3
+	i32.const	$push71=, 156
+	i32.const	$push70=, 105
+	i32.const	$push69=, 130
+	i32.const	$push68=, 214
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop71, $pop70, $pop69, $pop68
 	i32.const	$push120=, 0
 	i32.const	$push119=, 0
-	i32.load	$push75=, i($pop119)
-	i32.sub 	$push118=, $pop120, $pop75
-	tee_local	$push117=, $3=, $pop118
-	i32.store	k($pop121), $pop117
+	i32.load	$push72=, i+12($pop119)
+	i32.sub 	$0=, $pop120, $pop72
+	i32.const	$push118=, 0
+	i32.store	k+12($pop118), $0
+	i32.const	$push117=, 0
 	i32.const	$push116=, 0
-	i32.store	res+12($pop116), $0
+	i32.load	$push73=, i+8($pop116)
+	i32.sub 	$1=, $pop117, $pop73
 	i32.const	$push115=, 0
-	i32.store	res+8($pop115), $1
+	i32.store	k+8($pop115), $1
 	i32.const	$push114=, 0
-	i32.store	res+4($pop114), $2
 	i32.const	$push113=, 0
-	i32.store	res($pop113), $3
-	i32.const	$push78=, -150
-	i32.const	$push77=, -100
-	i32.const	$push112=, -150
-	i32.const	$push76=, -200
-	call    	verify@FUNCTION, $3, $2, $1, $0, $pop78, $pop77, $pop112, $pop76
+	i32.load	$push74=, i+4($pop113)
+	i32.sub 	$2=, $pop114, $pop74
+	i32.const	$push112=, 0
+	i32.store	k+4($pop112), $2
 	i32.const	$push111=, 0
 	i32.const	$push110=, 0
-	i32.load	$push79=, i+12($pop110)
-	i32.const	$push80=, -1
-	i32.xor 	$push109=, $pop79, $pop80
-	tee_local	$push108=, $0=, $pop109
-	i32.store	k+12($pop111), $pop108
+	i32.load	$push75=, i($pop110)
+	i32.sub 	$3=, $pop111, $pop75
+	i32.const	$push109=, 0
+	i32.store	k($pop109), $3
+	i32.const	$push108=, 0
+	i32.store	res+12($pop108), $0
 	i32.const	$push107=, 0
+	i32.store	res+8($pop107), $1
 	i32.const	$push106=, 0
-	i32.load	$push81=, i+8($pop106)
-	i32.const	$push105=, -1
-	i32.xor 	$push104=, $pop81, $pop105
-	tee_local	$push103=, $1=, $pop104
-	i32.store	k+8($pop107), $pop103
+	i32.store	res+4($pop106), $2
+	i32.const	$push105=, 0
+	i32.store	res($pop105), $3
+	i32.const	$push78=, -150
+	i32.const	$push77=, -100
+	i32.const	$push104=, -150
+	i32.const	$push76=, -200
+	call    	verify@FUNCTION, $3, $2, $1, $0, $pop78, $pop77, $pop104, $pop76
+	i32.const	$push103=, 0
+	i32.load	$push79=, i+12($pop103)
+	i32.const	$push80=, -1
+	i32.xor 	$0=, $pop79, $pop80
 	i32.const	$push102=, 0
+	i32.store	k+12($pop102), $0
 	i32.const	$push101=, 0
-	i32.load	$push82=, i+4($pop101)
+	i32.load	$push81=, i+8($pop101)
 	i32.const	$push100=, -1
-	i32.xor 	$push99=, $pop82, $pop100
-	tee_local	$push98=, $2=, $pop99
-	i32.store	k+4($pop102), $pop98
-	i32.const	$push97=, 0
+	i32.xor 	$1=, $pop81, $pop100
+	i32.const	$push99=, 0
+	i32.store	k+8($pop99), $1
+	i32.const	$push98=, 0
+	i32.load	$push82=, i+4($pop98)
+	i32.const	$push97=, -1
+	i32.xor 	$2=, $pop82, $pop97
 	i32.const	$push96=, 0
-	i32.load	$push83=, i($pop96)
-	i32.const	$push95=, -1
-	i32.xor 	$push94=, $pop83, $pop95
-	tee_local	$push93=, $3=, $pop94
-	i32.store	k($pop97), $pop93
+	i32.store	k+4($pop96), $2
+	i32.const	$push95=, 0
+	i32.load	$push83=, i($pop95)
+	i32.const	$push94=, -1
+	i32.xor 	$3=, $pop83, $pop94
+	i32.const	$push93=, 0
+	i32.store	k($pop93), $3
 	i32.const	$push92=, 0
 	i32.store	res+12($pop92), $0
 	i32.const	$push91=, 0
@@ -439,6 +407,6 @@ res:
 	.size	res, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 64caf6a26..b3aa46a4b 100644
--- a/test/torture-s/simd-2.c.s
+++ b/test/torture-s/simd-2.c.s
@@ -6,20 +6,20 @@
 	.type	verify,@function
 verify:                                 # @verify
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.ne  	$push0=, $0, $4
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.ne  	$push1=, $1, $5
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.ne  	$push2=, $2, $6
 	br_if   	0, $pop2        # 0: down to label0
-# BB#3:                                 # %entry
+# %bb.3:                                # %entry
 	i32.ne  	$push3=, $3, $7
 	br_if   	0, $pop3        # 0: down to label0
-# BB#4:                                 # %if.end
+# %bb.4:                                # %if.end
 	return
 .LBB0_5:                                # %if.then
 	end_block                       # label0:
@@ -36,762 +36,698 @@ verify:                                 # @verify
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push656=, 0
-	i32.load16_u	$push2=, j+14($pop656)
-	i32.const	$push655=, 0
-	i32.load16_u	$push1=, i+14($pop655)
-	i32.add 	$push654=, $pop2, $pop1
-	tee_local	$push653=, $0=, $pop654
-	i32.store16	k+14($pop0), $pop653
-	i32.const	$push652=, 0
-	i32.const	$push651=, 0
-	i32.load16_u	$push4=, j+12($pop651)
-	i32.const	$push650=, 0
-	i32.load16_u	$push3=, i+12($pop650)
-	i32.add 	$push649=, $pop4, $pop3
-	tee_local	$push648=, $1=, $pop649
-	i32.store16	k+12($pop652), $pop648
-	i32.const	$push647=, 0
-	i32.const	$push646=, 0
-	i32.load16_u	$push6=, j+10($pop646)
-	i32.const	$push645=, 0
-	i32.load16_u	$push5=, i+10($pop645)
-	i32.add 	$push644=, $pop6, $pop5
-	tee_local	$push643=, $2=, $pop644
-	i32.store16	k+10($pop647), $pop643
-	i32.const	$push642=, 0
-	i32.const	$push641=, 0
-	i32.load16_u	$push8=, j+8($pop641)
-	i32.const	$push640=, 0
-	i32.load16_u	$push7=, i+8($pop640)
-	i32.add 	$push639=, $pop8, $pop7
-	tee_local	$push638=, $3=, $pop639
-	i32.store16	k+8($pop642), $pop638
-	i32.const	$push637=, 0
-	i32.const	$push636=, 0
-	i32.load16_u	$push10=, j+6($pop636)
-	i32.const	$push635=, 0
-	i32.load16_u	$push9=, i+6($pop635)
-	i32.add 	$push634=, $pop10, $pop9
-	tee_local	$push633=, $4=, $pop634
-	i32.store16	k+6($pop637), $pop633
-	i32.const	$push632=, 0
-	i32.const	$push631=, 0
-	i32.load16_u	$push12=, j+4($pop631)
-	i32.const	$push630=, 0
-	i32.load16_u	$push11=, i+4($pop630)
-	i32.add 	$push629=, $pop12, $pop11
-	tee_local	$push628=, $5=, $pop629
-	i32.store16	k+4($pop632), $pop628
-	i32.const	$push627=, 0
-	i32.const	$push626=, 0
-	i32.load16_u	$push14=, j+2($pop626)
-	i32.const	$push625=, 0
-	i32.load16_u	$push13=, i+2($pop625)
-	i32.add 	$push624=, $pop14, $pop13
-	tee_local	$push623=, $6=, $pop624
-	i32.store16	k+2($pop627), $pop623
-	i32.const	$push622=, 0
-	i32.const	$push621=, 0
-	i32.load16_u	$push16=, j($pop621)
-	i32.const	$push620=, 0
-	i32.load16_u	$push15=, i($pop620)
-	i32.add 	$push619=, $pop16, $pop15
-	tee_local	$push618=, $7=, $pop619
-	i32.store16	k($pop622), $pop618
-	i32.const	$push617=, 0
-	i32.store16	res+14($pop617), $0
-	i32.const	$push616=, 0
-	i32.store16	res+12($pop616), $1
-	i32.const	$push615=, 0
-	i32.store16	res+10($pop615), $2
-	i32.const	$push614=, 0
-	i32.store16	res+8($pop614), $3
-	i32.const	$push613=, 0
-	i32.store16	res+6($pop613), $4
-	i32.const	$push612=, 0
-	i32.store16	res+4($pop612), $5
-	i32.const	$push611=, 0
-	i32.store16	res+2($pop611), $6
-	i32.const	$push610=, 0
-	i32.store16	res($pop610), $7
-	i32.const	$push17=, 16
-	i32.shl 	$push24=, $7, $pop17
-	i32.const	$push609=, 16
-	i32.shr_s	$push25=, $pop24, $pop609
-	i32.const	$push608=, 16
-	i32.shl 	$push22=, $6, $pop608
-	i32.const	$push607=, 16
-	i32.shr_s	$push23=, $pop22, $pop607
-	i32.const	$push606=, 16
-	i32.shl 	$push20=, $5, $pop606
-	i32.const	$push605=, 16
-	i32.shr_s	$push21=, $pop20, $pop605
-	i32.const	$push604=, 16
-	i32.shl 	$push18=, $4, $pop604
-	i32.const	$push603=, 16
-	i32.shr_s	$push19=, $pop18, $pop603
-	i32.const	$push29=, 160
-	i32.const	$push28=, 113
-	i32.const	$push27=, 170
-	i32.const	$push26=, 230
-	call    	verify@FUNCTION, $pop25, $pop23, $pop21, $pop19, $pop29, $pop28, $pop27, $pop26
-	i32.const	$push602=, 0
-	i32.const	$push601=, 0
-	i32.load16_u	$push31=, j+14($pop601)
-	i32.const	$push600=, 0
-	i32.load16_u	$push30=, i+14($pop600)
-	i32.mul 	$push599=, $pop31, $pop30
-	tee_local	$push598=, $0=, $pop599
-	i32.store16	k+14($pop602), $pop598
-	i32.const	$push597=, 0
-	i32.const	$push596=, 0
-	i32.load16_u	$push33=, j+12($pop596)
-	i32.const	$push595=, 0
-	i32.load16_u	$push32=, i+12($pop595)
-	i32.mul 	$push594=, $pop33, $pop32
-	tee_local	$push593=, $1=, $pop594
-	i32.store16	k+12($pop597), $pop593
-	i32.const	$push592=, 0
-	i32.const	$push591=, 0
-	i32.load16_u	$push35=, j+10($pop591)
-	i32.const	$push590=, 0
-	i32.load16_u	$push34=, i+10($pop590)
-	i32.mul 	$push589=, $pop35, $pop34
-	tee_local	$push588=, $2=, $pop589
-	i32.store16	k+10($pop592), $pop588
-	i32.const	$push587=, 0
-	i32.const	$push586=, 0
-	i32.load16_u	$push37=, j+8($pop586)
-	i32.const	$push585=, 0
-	i32.load16_u	$push36=, i+8($pop585)
-	i32.mul 	$push584=, $pop37, $pop36
-	tee_local	$push583=, $3=, $pop584
-	i32.store16	k+8($pop587), $pop583
-	i32.const	$push582=, 0
-	i32.const	$push581=, 0
-	i32.load16_u	$push39=, j+6($pop581)
-	i32.const	$push580=, 0
-	i32.load16_u	$push38=, i+6($pop580)
-	i32.mul 	$push579=, $pop39, $pop38
-	tee_local	$push578=, $4=, $pop579
-	i32.store16	k+6($pop582), $pop578
-	i32.const	$push577=, 0
-	i32.const	$push576=, 0
-	i32.load16_u	$push41=, j+4($pop576)
-	i32.const	$push575=, 0
-	i32.load16_u	$push40=, i+4($pop575)
-	i32.mul 	$push574=, $pop41, $pop40
-	tee_local	$push573=, $5=, $pop574
-	i32.store16	k+4($pop577), $pop573
-	i32.const	$push572=, 0
-	i32.const	$push571=, 0
-	i32.load16_u	$push43=, j+2($pop571)
-	i32.const	$push570=, 0
-	i32.load16_u	$push42=, i+2($pop570)
-	i32.mul 	$push569=, $pop43, $pop42
-	tee_local	$push568=, $6=, $pop569
-	i32.store16	k+2($pop572), $pop568
-	i32.const	$push567=, 0
-	i32.const	$push566=, 0
-	i32.load16_u	$push45=, j($pop566)
-	i32.const	$push565=, 0
-	i32.load16_u	$push44=, i($pop565)
-	i32.mul 	$push564=, $pop45, $pop44
-	tee_local	$push563=, $7=, $pop564
-	i32.store16	k($pop567), $pop563
-	i32.const	$push562=, 0
-	i32.store16	res+14($pop562), $0
-	i32.const	$push561=, 0
-	i32.store16	res+12($pop561), $1
-	i32.const	$push560=, 0
-	i32.store16	res+10($pop560), $2
-	i32.const	$push559=, 0
-	i32.store16	res+8($pop559), $3
-	i32.const	$push558=, 0
-	i32.store16	res+6($pop558), $4
-	i32.const	$push557=, 0
-	i32.store16	res+4($pop557), $5
-	i32.const	$push556=, 0
-	i32.store16	res+2($pop556), $6
-	i32.const	$push555=, 0
-	i32.store16	res($pop555), $7
-	i32.const	$push554=, 16
-	i32.shl 	$push52=, $7, $pop554
-	i32.const	$push553=, 16
-	i32.shr_s	$push53=, $pop52, $pop553
-	i32.const	$push552=, 16
-	i32.shl 	$push50=, $6, $pop552
-	i32.const	$push551=, 16
-	i32.shr_s	$push51=, $pop50, $pop551
-	i32.const	$push550=, 16
-	i32.shl 	$push48=, $5, $pop550
-	i32.const	$push549=, 16
-	i32.shr_s	$push49=, $pop48, $pop549
-	i32.const	$push548=, 16
-	i32.shl 	$push46=, $4, $pop548
-	i32.const	$push547=, 16
-	i32.shr_s	$push47=, $pop46, $pop547
-	i32.const	$push57=, 1500
-	i32.const	$push56=, 1300
-	i32.const	$push55=, 3000
-	i32.const	$push54=, 6000
-	call    	verify@FUNCTION, $pop53, $pop51, $pop49, $pop47, $pop57, $pop56, $pop55, $pop54
-	i32.const	$push546=, 0
-	i32.const	$push545=, 0
-	i32.load16_s	$push59=, i+14($pop545)
-	i32.const	$push544=, 0
-	i32.load16_s	$push58=, j+14($pop544)
-	i32.div_s	$push543=, $pop59, $pop58
-	tee_local	$push542=, $0=, $pop543
-	i32.store16	k+14($pop546), $pop542
-	i32.const	$push541=, 0
-	i32.const	$push540=, 0
-	i32.load16_s	$push61=, i+12($pop540)
-	i32.const	$push539=, 0
-	i32.load16_s	$push60=, j+12($pop539)
-	i32.div_s	$push538=, $pop61, $pop60
-	tee_local	$push537=, $1=, $pop538
-	i32.store16	k+12($pop541), $pop537
-	i32.const	$push536=, 0
-	i32.const	$push535=, 0
-	i32.load16_s	$push63=, i+10($pop535)
-	i32.const	$push534=, 0
-	i32.load16_s	$push62=, j+10($pop534)
-	i32.div_s	$push533=, $pop63, $pop62
-	tee_local	$push532=, $2=, $pop533
-	i32.store16	k+10($pop536), $pop532
-	i32.const	$push531=, 0
-	i32.const	$push530=, 0
-	i32.load16_s	$push65=, i+8($pop530)
-	i32.const	$push529=, 0
-	i32.load16_s	$push64=, j+8($pop529)
-	i32.div_s	$push528=, $pop65, $pop64
-	tee_local	$push527=, $3=, $pop528
-	i32.store16	k+8($pop531), $pop527
+	i32.load16_u	$push2=, j+14($pop0)
+	i32.const	$push528=, 0
+	i32.load16_u	$push1=, i+14($pop528)
+	i32.add 	$0=, $pop2, $pop1
+	i32.const	$push527=, 0
+	i32.store16	k+14($pop527), $0
 	i32.const	$push526=, 0
+	i32.load16_u	$push4=, j+12($pop526)
 	i32.const	$push525=, 0
-	i32.load16_s	$push67=, i+6($pop525)
+	i32.load16_u	$push3=, i+12($pop525)
+	i32.add 	$1=, $pop4, $pop3
 	i32.const	$push524=, 0
-	i32.load16_s	$push66=, j+6($pop524)
-	i32.div_s	$push523=, $pop67, $pop66
-	tee_local	$push522=, $4=, $pop523
-	i32.store16	k+6($pop526), $pop522
+	i32.store16	k+12($pop524), $1
+	i32.const	$push523=, 0
+	i32.load16_u	$push6=, j+10($pop523)
+	i32.const	$push522=, 0
+	i32.load16_u	$push5=, i+10($pop522)
+	i32.add 	$2=, $pop6, $pop5
 	i32.const	$push521=, 0
+	i32.store16	k+10($pop521), $2
 	i32.const	$push520=, 0
-	i32.load16_s	$push69=, i+4($pop520)
+	i32.load16_u	$push8=, j+8($pop520)
 	i32.const	$push519=, 0
-	i32.load16_s	$push68=, j+4($pop519)
-	i32.div_s	$push518=, $pop69, $pop68
-	tee_local	$push517=, $5=, $pop518
-	i32.store16	k+4($pop521), $pop517
+	i32.load16_u	$push7=, i+8($pop519)
+	i32.add 	$3=, $pop8, $pop7
+	i32.const	$push518=, 0
+	i32.store16	k+8($pop518), $3
+	i32.const	$push517=, 0
+	i32.load16_u	$push10=, j+6($pop517)
 	i32.const	$push516=, 0
+	i32.load16_u	$push9=, i+6($pop516)
+	i32.add 	$4=, $pop10, $pop9
 	i32.const	$push515=, 0
-	i32.load16_s	$push71=, i+2($pop515)
+	i32.store16	k+6($pop515), $4
 	i32.const	$push514=, 0
-	i32.load16_s	$push70=, j+2($pop514)
-	i32.div_s	$push513=, $pop71, $pop70
-	tee_local	$push512=, $6=, $pop513
-	i32.store16	k+2($pop516), $pop512
+	i32.load16_u	$push12=, j+4($pop514)
+	i32.const	$push513=, 0
+	i32.load16_u	$push11=, i+4($pop513)
+	i32.add 	$5=, $pop12, $pop11
+	i32.const	$push512=, 0
+	i32.store16	k+4($pop512), $5
 	i32.const	$push511=, 0
+	i32.load16_u	$push14=, j+2($pop511)
 	i32.const	$push510=, 0
-	i32.load16_s	$push73=, i($pop510)
+	i32.load16_u	$push13=, i+2($pop510)
+	i32.add 	$6=, $pop14, $pop13
 	i32.const	$push509=, 0
-	i32.load16_s	$push72=, j($pop509)
-	i32.div_s	$push508=, $pop73, $pop72
-	tee_local	$push507=, $7=, $pop508
-	i32.store16	k($pop511), $pop507
+	i32.store16	k+2($pop509), $6
+	i32.const	$push508=, 0
+	i32.load16_u	$push16=, j($pop508)
+	i32.const	$push507=, 0
+	i32.load16_u	$push15=, i($pop507)
+	i32.add 	$7=, $pop16, $pop15
 	i32.const	$push506=, 0
-	i32.store16	res+14($pop506), $0
+	i32.store16	k($pop506), $7
 	i32.const	$push505=, 0
-	i32.store16	res+12($pop505), $1
+	i32.store16	res+14($pop505), $0
 	i32.const	$push504=, 0
-	i32.store16	res+10($pop504), $2
+	i32.store16	res+12($pop504), $1
 	i32.const	$push503=, 0
-	i32.store16	res+8($pop503), $3
+	i32.store16	res+10($pop503), $2
 	i32.const	$push502=, 0
-	i32.store16	res+6($pop502), $4
+	i32.store16	res+8($pop502), $3
 	i32.const	$push501=, 0
-	i32.store16	res+4($pop501), $5
+	i32.store16	res+6($pop501), $4
 	i32.const	$push500=, 0
-	i32.store16	res+2($pop500), $6
+	i32.store16	res+4($pop500), $5
 	i32.const	$push499=, 0
-	i32.store16	res($pop499), $7
-	i32.const	$push498=, 16
-	i32.shl 	$push80=, $7, $pop498
+	i32.store16	res+2($pop499), $6
+	i32.const	$push498=, 0
+	i32.store16	res($pop498), $7
+	i32.const	$push17=, 16
+	i32.shl 	$push24=, $7, $pop17
 	i32.const	$push497=, 16
-	i32.shr_s	$push81=, $pop80, $pop497
+	i32.shr_s	$push25=, $pop24, $pop497
 	i32.const	$push496=, 16
-	i32.shl 	$push78=, $6, $pop496
+	i32.shl 	$push22=, $6, $pop496
 	i32.const	$push495=, 16
-	i32.shr_s	$push79=, $pop78, $pop495
+	i32.shr_s	$push23=, $pop22, $pop495
 	i32.const	$push494=, 16
-	i32.shl 	$push76=, $5, $pop494
+	i32.shl 	$push20=, $5, $pop494
 	i32.const	$push493=, 16
-	i32.shr_s	$push77=, $pop76, $pop493
+	i32.shr_s	$push21=, $pop20, $pop493
 	i32.const	$push492=, 16
-	i32.shl 	$push74=, $4, $pop492
+	i32.shl 	$push18=, $4, $pop492
 	i32.const	$push491=, 16
-	i32.shr_s	$push75=, $pop74, $pop491
-	i32.const	$push84=, 15
-	i32.const	$push83=, 7
-	i32.const	$push490=, 7
-	i32.const	$push82=, 6
-	call    	verify@FUNCTION, $pop81, $pop79, $pop77, $pop75, $pop84, $pop83, $pop490, $pop82
+	i32.shr_s	$push19=, $pop18, $pop491
+	i32.const	$push29=, 160
+	i32.const	$push28=, 113
+	i32.const	$push27=, 170
+	i32.const	$push26=, 230
+	call    	verify@FUNCTION, $pop25, $pop23, $pop21, $pop19, $pop29, $pop28, $pop27, $pop26
+	i32.const	$push490=, 0
+	i32.load16_u	$push31=, j+14($pop490)
 	i32.const	$push489=, 0
+	i32.load16_u	$push30=, i+14($pop489)
+	i32.mul 	$0=, $pop31, $pop30
 	i32.const	$push488=, 0
-	i32.load16_u	$push86=, j+14($pop488)
+	i32.store16	k+14($pop488), $0
 	i32.const	$push487=, 0
-	i32.load16_u	$push85=, i+14($pop487)
-	i32.and 	$push486=, $pop86, $pop85
-	tee_local	$push485=, $0=, $pop486
-	i32.store16	k+14($pop489), $pop485
+	i32.load16_u	$push33=, j+12($pop487)
+	i32.const	$push486=, 0
+	i32.load16_u	$push32=, i+12($pop486)
+	i32.mul 	$1=, $pop33, $pop32
+	i32.const	$push485=, 0
+	i32.store16	k+12($pop485), $1
 	i32.const	$push484=, 0
+	i32.load16_u	$push35=, j+10($pop484)
 	i32.const	$push483=, 0
-	i32.load16_u	$push88=, j+12($pop483)
+	i32.load16_u	$push34=, i+10($pop483)
+	i32.mul 	$2=, $pop35, $pop34
 	i32.const	$push482=, 0
-	i32.load16_u	$push87=, i+12($pop482)
-	i32.and 	$push481=, $pop88, $pop87
-	tee_local	$push480=, $1=, $pop481
-	i32.store16	k+12($pop484), $pop480
+	i32.store16	k+10($pop482), $2
+	i32.const	$push481=, 0
+	i32.load16_u	$push37=, j+8($pop481)
+	i32.const	$push480=, 0
+	i32.load16_u	$push36=, i+8($pop480)
+	i32.mul 	$3=, $pop37, $pop36
 	i32.const	$push479=, 0
+	i32.store16	k+8($pop479), $3
 	i32.const	$push478=, 0
-	i32.load16_u	$push90=, j+10($pop478)
+	i32.load16_u	$push39=, j+6($pop478)
 	i32.const	$push477=, 0
-	i32.load16_u	$push89=, i+10($pop477)
-	i32.and 	$push476=, $pop90, $pop89
-	tee_local	$push475=, $2=, $pop476
-	i32.store16	k+10($pop479), $pop475
+	i32.load16_u	$push38=, i+6($pop477)
+	i32.mul 	$4=, $pop39, $pop38
+	i32.const	$push476=, 0
+	i32.store16	k+6($pop476), $4
+	i32.const	$push475=, 0
+	i32.load16_u	$push41=, j+4($pop475)
 	i32.const	$push474=, 0
+	i32.load16_u	$push40=, i+4($pop474)
+	i32.mul 	$5=, $pop41, $pop40
 	i32.const	$push473=, 0
-	i32.load16_u	$push92=, j+8($pop473)
+	i32.store16	k+4($pop473), $5
 	i32.const	$push472=, 0
-	i32.load16_u	$push91=, i+8($pop472)
-	i32.and 	$push471=, $pop92, $pop91
-	tee_local	$push470=, $3=, $pop471
-	i32.store16	k+8($pop474), $pop470
+	i32.load16_u	$push43=, j+2($pop472)
+	i32.const	$push471=, 0
+	i32.load16_u	$push42=, i+2($pop471)
+	i32.mul 	$6=, $pop43, $pop42
+	i32.const	$push470=, 0
+	i32.store16	k+2($pop470), $6
 	i32.const	$push469=, 0
+	i32.load16_u	$push45=, j($pop469)
 	i32.const	$push468=, 0
-	i32.load16_u	$push94=, j+6($pop468)
+	i32.load16_u	$push44=, i($pop468)
+	i32.mul 	$7=, $pop45, $pop44
 	i32.const	$push467=, 0
-	i32.load16_u	$push93=, i+6($pop467)
-	i32.and 	$push466=, $pop94, $pop93
-	tee_local	$push465=, $4=, $pop466
-	i32.store16	k+6($pop469), $pop465
+	i32.store16	k($pop467), $7
+	i32.const	$push466=, 0
+	i32.store16	res+14($pop466), $0
+	i32.const	$push465=, 0
+	i32.store16	res+12($pop465), $1
 	i32.const	$push464=, 0
+	i32.store16	res+10($pop464), $2
 	i32.const	$push463=, 0
-	i32.load16_u	$push96=, j+4($pop463)
+	i32.store16	res+8($pop463), $3
 	i32.const	$push462=, 0
-	i32.load16_u	$push95=, i+4($pop462)
-	i32.and 	$push461=, $pop96, $pop95
-	tee_local	$push460=, $5=, $pop461
-	i32.store16	k+4($pop464), $pop460
+	i32.store16	res+6($pop462), $4
+	i32.const	$push461=, 0
+	i32.store16	res+4($pop461), $5
+	i32.const	$push460=, 0
+	i32.store16	res+2($pop460), $6
 	i32.const	$push459=, 0
-	i32.const	$push458=, 0
-	i32.load16_u	$push98=, j+2($pop458)
-	i32.const	$push457=, 0
-	i32.load16_u	$push97=, i+2($pop457)
-	i32.and 	$push456=, $pop98, $pop97
-	tee_local	$push455=, $6=, $pop456
-	i32.store16	k+2($pop459), $pop455
-	i32.const	$push454=, 0
-	i32.const	$push453=, 0
-	i32.load16_u	$push100=, j($pop453)
-	i32.const	$push452=, 0
-	i32.load16_u	$push99=, i($pop452)
-	i32.and 	$push451=, $pop100, $pop99
-	tee_local	$push450=, $7=, $pop451
-	i32.store16	k($pop454), $pop450
+	i32.store16	res($pop459), $7
+	i32.const	$push458=, 16
+	i32.shl 	$push52=, $7, $pop458
+	i32.const	$push457=, 16
+	i32.shr_s	$push53=, $pop52, $pop457
+	i32.const	$push456=, 16
+	i32.shl 	$push50=, $6, $pop456
+	i32.const	$push455=, 16
+	i32.shr_s	$push51=, $pop50, $pop455
+	i32.const	$push454=, 16
+	i32.shl 	$push48=, $5, $pop454
+	i32.const	$push453=, 16
+	i32.shr_s	$push49=, $pop48, $pop453
+	i32.const	$push452=, 16
+	i32.shl 	$push46=, $4, $pop452
+	i32.const	$push451=, 16
+	i32.shr_s	$push47=, $pop46, $pop451
+	i32.const	$push57=, 1500
+	i32.const	$push56=, 1300
+	i32.const	$push55=, 3000
+	i32.const	$push54=, 6000
+	call    	verify@FUNCTION, $pop53, $pop51, $pop49, $pop47, $pop57, $pop56, $pop55, $pop54
+	i32.const	$push450=, 0
+	i32.load16_s	$push59=, i+14($pop450)
 	i32.const	$push449=, 0
-	i32.store16	res+14($pop449), $0
+	i32.load16_s	$push58=, j+14($pop449)
+	i32.div_s	$0=, $pop59, $pop58
 	i32.const	$push448=, 0
-	i32.store16	res+12($pop448), $1
+	i32.store16	k+14($pop448), $0
 	i32.const	$push447=, 0
-	i32.store16	res+10($pop447), $2
+	i32.load16_s	$push61=, i+12($pop447)
 	i32.const	$push446=, 0
-	i32.store16	res+8($pop446), $3
+	i32.load16_s	$push60=, j+12($pop446)
+	i32.div_s	$1=, $pop61, $pop60
 	i32.const	$push445=, 0
-	i32.store16	res+6($pop445), $4
+	i32.store16	k+12($pop445), $1
 	i32.const	$push444=, 0
-	i32.store16	res+4($pop444), $5
+	i32.load16_s	$push63=, i+10($pop444)
 	i32.const	$push443=, 0
-	i32.store16	res+2($pop443), $6
+	i32.load16_s	$push62=, j+10($pop443)
+	i32.div_s	$2=, $pop63, $pop62
 	i32.const	$push442=, 0
-	i32.store16	res($pop442), $7
-	i32.const	$push441=, 16
-	i32.shl 	$push107=, $7, $pop441
-	i32.const	$push440=, 16
-	i32.shr_s	$push108=, $pop107, $pop440
-	i32.const	$push439=, 16
-	i32.shl 	$push105=, $6, $pop439
-	i32.const	$push438=, 16
-	i32.shr_s	$push106=, $pop105, $pop438
-	i32.const	$push437=, 16
-	i32.shl 	$push103=, $5, $pop437
-	i32.const	$push436=, 16
-	i32.shr_s	$push104=, $pop103, $pop436
-	i32.const	$push435=, 16
-	i32.shl 	$push101=, $4, $pop435
-	i32.const	$push434=, 16
-	i32.shr_s	$push102=, $pop101, $pop434
-	i32.const	$push112=, 2
-	i32.const	$push111=, 4
-	i32.const	$push110=, 20
-	i32.const	$push109=, 8
-	call    	verify@FUNCTION, $pop108, $pop106, $pop104, $pop102, $pop112, $pop111, $pop110, $pop109
+	i32.store16	k+10($pop442), $2
+	i32.const	$push441=, 0
+	i32.load16_s	$push65=, i+8($pop441)
+	i32.const	$push440=, 0
+	i32.load16_s	$push64=, j+8($pop440)
+	i32.div_s	$3=, $pop65, $pop64
+	i32.const	$push439=, 0
+	i32.store16	k+8($pop439), $3
+	i32.const	$push438=, 0
+	i32.load16_s	$push67=, i+6($pop438)
+	i32.const	$push437=, 0
+	i32.load16_s	$push66=, j+6($pop437)
+	i32.div_s	$4=, $pop67, $pop66
+	i32.const	$push436=, 0
+	i32.store16	k+6($pop436), $4
+	i32.const	$push435=, 0
+	i32.load16_s	$push69=, i+4($pop435)
+	i32.const	$push434=, 0
+	i32.load16_s	$push68=, j+4($pop434)
+	i32.div_s	$5=, $pop69, $pop68
 	i32.const	$push433=, 0
+	i32.store16	k+4($pop433), $5
 	i32.const	$push432=, 0
-	i32.load16_u	$push114=, j+14($pop432)
+	i32.load16_s	$push71=, i+2($pop432)
 	i32.const	$push431=, 0
-	i32.load16_u	$push113=, i+14($pop431)
-	i32.or  	$push430=, $pop114, $pop113
-	tee_local	$push429=, $0=, $pop430
-	i32.store16	k+14($pop433), $pop429
+	i32.load16_s	$push70=, j+2($pop431)
+	i32.div_s	$6=, $pop71, $pop70
+	i32.const	$push430=, 0
+	i32.store16	k+2($pop430), $6
+	i32.const	$push429=, 0
+	i32.load16_s	$push73=, i($pop429)
 	i32.const	$push428=, 0
+	i32.load16_s	$push72=, j($pop428)
+	i32.div_s	$7=, $pop73, $pop72
 	i32.const	$push427=, 0
-	i32.load16_u	$push116=, j+12($pop427)
+	i32.store16	k($pop427), $7
 	i32.const	$push426=, 0
-	i32.load16_u	$push115=, i+12($pop426)
-	i32.or  	$push425=, $pop116, $pop115
-	tee_local	$push424=, $1=, $pop425
-	i32.store16	k+12($pop428), $pop424
+	i32.store16	res+14($pop426), $0
+	i32.const	$push425=, 0
+	i32.store16	res+12($pop425), $1
+	i32.const	$push424=, 0
+	i32.store16	res+10($pop424), $2
 	i32.const	$push423=, 0
+	i32.store16	res+8($pop423), $3
 	i32.const	$push422=, 0
-	i32.load16_u	$push118=, j+10($pop422)
+	i32.store16	res+6($pop422), $4
 	i32.const	$push421=, 0
-	i32.load16_u	$push117=, i+10($pop421)
-	i32.or  	$push420=, $pop118, $pop117
-	tee_local	$push419=, $2=, $pop420
-	i32.store16	k+10($pop423), $pop419
-	i32.const	$push418=, 0
-	i32.const	$push417=, 0
-	i32.load16_u	$push120=, j+8($pop417)
-	i32.const	$push416=, 0
-	i32.load16_u	$push119=, i+8($pop416)
-	i32.or  	$push415=, $pop120, $pop119
-	tee_local	$push414=, $3=, $pop415
-	i32.store16	k+8($pop418), $pop414
-	i32.const	$push413=, 0
-	i32.const	$push412=, 0
-	i32.load16_u	$push122=, j+6($pop412)
-	i32.const	$push411=, 0
-	i32.load16_u	$push121=, i+6($pop411)
-	i32.or  	$push410=, $pop122, $pop121
-	tee_local	$push409=, $4=, $pop410
-	i32.store16	k+6($pop413), $pop409
+	i32.store16	res+4($pop421), $5
+	i32.const	$push420=, 0
+	i32.store16	res+2($pop420), $6
+	i32.const	$push419=, 0
+	i32.store16	res($pop419), $7
+	i32.const	$push418=, 16
+	i32.shl 	$push80=, $7, $pop418
+	i32.const	$push417=, 16
+	i32.shr_s	$push81=, $pop80, $pop417
+	i32.const	$push416=, 16
+	i32.shl 	$push78=, $6, $pop416
+	i32.const	$push415=, 16
+	i32.shr_s	$push79=, $pop78, $pop415
+	i32.const	$push414=, 16
+	i32.shl 	$push76=, $5, $pop414
+	i32.const	$push413=, 16
+	i32.shr_s	$push77=, $pop76, $pop413
+	i32.const	$push412=, 16
+	i32.shl 	$push74=, $4, $pop412
+	i32.const	$push411=, 16
+	i32.shr_s	$push75=, $pop74, $pop411
+	i32.const	$push84=, 15
+	i32.const	$push83=, 7
+	i32.const	$push410=, 7
+	i32.const	$push82=, 6
+	call    	verify@FUNCTION, $pop81, $pop79, $pop77, $pop75, $pop84, $pop83, $pop410, $pop82
+	i32.const	$push409=, 0
+	i32.load16_u	$push86=, j+14($pop409)
 	i32.const	$push408=, 0
+	i32.load16_u	$push85=, i+14($pop408)
+	i32.and 	$0=, $pop86, $pop85
 	i32.const	$push407=, 0
-	i32.load16_u	$push124=, j+4($pop407)
+	i32.store16	k+14($pop407), $0
 	i32.const	$push406=, 0
-	i32.load16_u	$push123=, i+4($pop406)
-	i32.or  	$push405=, $pop124, $pop123
-	tee_local	$push404=, $5=, $pop405
-	i32.store16	k+4($pop408), $pop404
+	i32.load16_u	$push88=, j+12($pop406)
+	i32.const	$push405=, 0
+	i32.load16_u	$push87=, i+12($pop405)
+	i32.and 	$1=, $pop88, $pop87
+	i32.const	$push404=, 0
+	i32.store16	k+12($pop404), $1
 	i32.const	$push403=, 0
+	i32.load16_u	$push90=, j+10($pop403)
 	i32.const	$push402=, 0
-	i32.load16_u	$push126=, j+2($pop402)
+	i32.load16_u	$push89=, i+10($pop402)
+	i32.and 	$2=, $pop90, $pop89
 	i32.const	$push401=, 0
-	i32.load16_u	$push125=, i+2($pop401)
-	i32.or  	$push400=, $pop126, $pop125
-	tee_local	$push399=, $6=, $pop400
-	i32.store16	k+2($pop403), $pop399
+	i32.store16	k+10($pop401), $2
+	i32.const	$push400=, 0
+	i32.load16_u	$push92=, j+8($pop400)
+	i32.const	$push399=, 0
+	i32.load16_u	$push91=, i+8($pop399)
+	i32.and 	$3=, $pop92, $pop91
 	i32.const	$push398=, 0
+	i32.store16	k+8($pop398), $3
 	i32.const	$push397=, 0
-	i32.load16_u	$push128=, j($pop397)
+	i32.load16_u	$push94=, j+6($pop397)
 	i32.const	$push396=, 0
-	i32.load16_u	$push127=, i($pop396)
-	i32.or  	$push395=, $pop128, $pop127
-	tee_local	$push394=, $7=, $pop395
-	i32.store16	k($pop398), $pop394
+	i32.load16_u	$push93=, i+6($pop396)
+	i32.and 	$4=, $pop94, $pop93
+	i32.const	$push395=, 0
+	i32.store16	k+6($pop395), $4
+	i32.const	$push394=, 0
+	i32.load16_u	$push96=, j+4($pop394)
 	i32.const	$push393=, 0
-	i32.store16	res+14($pop393), $0
+	i32.load16_u	$push95=, i+4($pop393)
+	i32.and 	$5=, $pop96, $pop95
 	i32.const	$push392=, 0
-	i32.store16	res+12($pop392), $1
+	i32.store16	k+4($pop392), $5
 	i32.const	$push391=, 0
-	i32.store16	res+10($pop391), $2
+	i32.load16_u	$push98=, j+2($pop391)
 	i32.const	$push390=, 0
-	i32.store16	res+8($pop390), $3
+	i32.load16_u	$push97=, i+2($pop390)
+	i32.and 	$6=, $pop98, $pop97
 	i32.const	$push389=, 0
-	i32.store16	res+6($pop389), $4
+	i32.store16	k+2($pop389), $6
 	i32.const	$push388=, 0
-	i32.store16	res+4($pop388), $5
+	i32.load16_u	$push100=, j($pop388)
 	i32.const	$push387=, 0
-	i32.store16	res+2($pop387), $6
+	i32.load16_u	$push99=, i($pop387)
+	i32.and 	$7=, $pop100, $pop99
 	i32.const	$push386=, 0
-	i32.store16	res($pop386), $7
-	i32.const	$push385=, 16
-	i32.shl 	$push135=, $7, $pop385
-	i32.const	$push384=, 16
-	i32.shr_s	$push136=, $pop135, $pop384
-	i32.const	$push383=, 16
-	i32.shl 	$push133=, $6, $pop383
-	i32.const	$push382=, 16
-	i32.shr_s	$push134=, $pop133, $pop382
-	i32.const	$push381=, 16
-	i32.shl 	$push131=, $5, $pop381
-	i32.const	$push380=, 16
-	i32.shr_s	$push132=, $pop131, $pop380
-	i32.const	$push379=, 16
-	i32.shl 	$push129=, $4, $pop379
-	i32.const	$push378=, 16
-	i32.shr_s	$push130=, $pop129, $pop378
-	i32.const	$push140=, 158
-	i32.const	$push139=, 109
-	i32.const	$push138=, 150
-	i32.const	$push137=, 222
-	call    	verify@FUNCTION, $pop136, $pop134, $pop132, $pop130, $pop140, $pop139, $pop138, $pop137
-	i32.const	$push377=, 0
-	i32.const	$push376=, 0
-	i32.load16_u	$push142=, j+14($pop376)
-	i32.const	$push375=, 0
-	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=, j+12($pop371)
-	i32.const	$push370=, 0
-	i32.load16_u	$push143=, i+12($pop370)
-	i32.xor 	$push369=, $pop144, $pop143
-	tee_local	$push368=, $1=, $pop369
-	i32.store16	k+12($pop372), $pop368
+	i32.store16	k($pop386), $7
+	i32.const	$push385=, 0
+	i32.store16	res+14($pop385), $0
+	i32.const	$push384=, 0
+	i32.store16	res+12($pop384), $1
+	i32.const	$push383=, 0
+	i32.store16	res+10($pop383), $2
+	i32.const	$push382=, 0
+	i32.store16	res+8($pop382), $3
+	i32.const	$push381=, 0
+	i32.store16	res+6($pop381), $4
+	i32.const	$push380=, 0
+	i32.store16	res+4($pop380), $5
+	i32.const	$push379=, 0
+	i32.store16	res+2($pop379), $6
+	i32.const	$push378=, 0
+	i32.store16	res($pop378), $7
+	i32.const	$push377=, 16
+	i32.shl 	$push107=, $7, $pop377
+	i32.const	$push376=, 16
+	i32.shr_s	$push108=, $pop107, $pop376
+	i32.const	$push375=, 16
+	i32.shl 	$push105=, $6, $pop375
+	i32.const	$push374=, 16
+	i32.shr_s	$push106=, $pop105, $pop374
+	i32.const	$push373=, 16
+	i32.shl 	$push103=, $5, $pop373
+	i32.const	$push372=, 16
+	i32.shr_s	$push104=, $pop103, $pop372
+	i32.const	$push371=, 16
+	i32.shl 	$push101=, $4, $pop371
+	i32.const	$push370=, 16
+	i32.shr_s	$push102=, $pop101, $pop370
+	i32.const	$push112=, 2
+	i32.const	$push111=, 4
+	i32.const	$push110=, 20
+	i32.const	$push109=, 8
+	call    	verify@FUNCTION, $pop108, $pop106, $pop104, $pop102, $pop112, $pop111, $pop110, $pop109
+	i32.const	$push369=, 0
+	i32.load16_u	$push114=, j+14($pop369)
+	i32.const	$push368=, 0
+	i32.load16_u	$push113=, i+14($pop368)
+	i32.or  	$0=, $pop114, $pop113
 	i32.const	$push367=, 0
+	i32.store16	k+14($pop367), $0
 	i32.const	$push366=, 0
-	i32.load16_u	$push146=, j+10($pop366)
+	i32.load16_u	$push116=, j+12($pop366)
 	i32.const	$push365=, 0
-	i32.load16_u	$push145=, i+10($pop365)
-	i32.xor 	$push364=, $pop146, $pop145
-	tee_local	$push363=, $2=, $pop364
-	i32.store16	k+10($pop367), $pop363
+	i32.load16_u	$push115=, i+12($pop365)
+	i32.or  	$1=, $pop116, $pop115
+	i32.const	$push364=, 0
+	i32.store16	k+12($pop364), $1
+	i32.const	$push363=, 0
+	i32.load16_u	$push118=, j+10($pop363)
 	i32.const	$push362=, 0
+	i32.load16_u	$push117=, i+10($pop362)
+	i32.or  	$2=, $pop118, $pop117
 	i32.const	$push361=, 0
-	i32.load16_u	$push148=, j+8($pop361)
+	i32.store16	k+10($pop361), $2
 	i32.const	$push360=, 0
-	i32.load16_u	$push147=, i+8($pop360)
-	i32.xor 	$push359=, $pop148, $pop147
-	tee_local	$push358=, $3=, $pop359
-	i32.store16	k+8($pop362), $pop358
+	i32.load16_u	$push120=, j+8($pop360)
+	i32.const	$push359=, 0
+	i32.load16_u	$push119=, i+8($pop359)
+	i32.or  	$3=, $pop120, $pop119
+	i32.const	$push358=, 0
+	i32.store16	k+8($pop358), $3
 	i32.const	$push357=, 0
+	i32.load16_u	$push122=, j+6($pop357)
 	i32.const	$push356=, 0
-	i32.load16_u	$push150=, j+6($pop356)
+	i32.load16_u	$push121=, i+6($pop356)
+	i32.or  	$4=, $pop122, $pop121
 	i32.const	$push355=, 0
-	i32.load16_u	$push149=, i+6($pop355)
-	i32.xor 	$push354=, $pop150, $pop149
-	tee_local	$push353=, $4=, $pop354
-	i32.store16	k+6($pop357), $pop353
+	i32.store16	k+6($pop355), $4
+	i32.const	$push354=, 0
+	i32.load16_u	$push124=, j+4($pop354)
+	i32.const	$push353=, 0
+	i32.load16_u	$push123=, i+4($pop353)
+	i32.or  	$5=, $pop124, $pop123
 	i32.const	$push352=, 0
+	i32.store16	k+4($pop352), $5
 	i32.const	$push351=, 0
-	i32.load16_u	$push152=, j+4($pop351)
+	i32.load16_u	$push126=, j+2($pop351)
 	i32.const	$push350=, 0
-	i32.load16_u	$push151=, i+4($pop350)
-	i32.xor 	$push349=, $pop152, $pop151
-	tee_local	$push348=, $5=, $pop349
-	i32.store16	k+4($pop352), $pop348
+	i32.load16_u	$push125=, i+2($pop350)
+	i32.or  	$6=, $pop126, $pop125
+	i32.const	$push349=, 0
+	i32.store16	k+2($pop349), $6
+	i32.const	$push348=, 0
+	i32.load16_u	$push128=, j($pop348)
 	i32.const	$push347=, 0
+	i32.load16_u	$push127=, i($pop347)
+	i32.or  	$7=, $pop128, $pop127
 	i32.const	$push346=, 0
-	i32.load16_u	$push154=, j+2($pop346)
+	i32.store16	k($pop346), $7
 	i32.const	$push345=, 0
-	i32.load16_u	$push153=, i+2($pop345)
-	i32.xor 	$push344=, $pop154, $pop153
-	tee_local	$push343=, $6=, $pop344
-	i32.store16	k+2($pop347), $pop343
+	i32.store16	res+14($pop345), $0
+	i32.const	$push344=, 0
+	i32.store16	res+12($pop344), $1
+	i32.const	$push343=, 0
+	i32.store16	res+10($pop343), $2
 	i32.const	$push342=, 0
+	i32.store16	res+8($pop342), $3
 	i32.const	$push341=, 0
-	i32.load16_u	$push156=, j($pop341)
+	i32.store16	res+6($pop341), $4
 	i32.const	$push340=, 0
-	i32.load16_u	$push155=, i($pop340)
-	i32.xor 	$push339=, $pop156, $pop155
-	tee_local	$push338=, $7=, $pop339
-	i32.store16	k($pop342), $pop338
-	i32.const	$push337=, 0
-	i32.store16	res+14($pop337), $0
-	i32.const	$push336=, 0
-	i32.store16	res+12($pop336), $1
-	i32.const	$push335=, 0
-	i32.store16	res+10($pop335), $2
-	i32.const	$push334=, 0
-	i32.store16	res+8($pop334), $3
-	i32.const	$push333=, 0
-	i32.store16	res+6($pop333), $4
-	i32.const	$push332=, 0
-	i32.store16	res+4($pop332), $5
-	i32.const	$push331=, 0
-	i32.store16	res+2($pop331), $6
-	i32.const	$push330=, 0
-	i32.store16	res($pop330), $7
-	i32.const	$push329=, 16
-	i32.shl 	$push163=, $7, $pop329
-	i32.const	$push328=, 16
-	i32.shr_s	$push164=, $pop163, $pop328
-	i32.const	$push327=, 16
-	i32.shl 	$push161=, $6, $pop327
-	i32.const	$push326=, 16
-	i32.shr_s	$push162=, $pop161, $pop326
-	i32.const	$push325=, 16
-	i32.shl 	$push159=, $5, $pop325
-	i32.const	$push324=, 16
-	i32.shr_s	$push160=, $pop159, $pop324
-	i32.const	$push323=, 16
-	i32.shl 	$push157=, $4, $pop323
-	i32.const	$push322=, 16
-	i32.shr_s	$push158=, $pop157, $pop322
-	i32.const	$push168=, 156
-	i32.const	$push167=, 105
-	i32.const	$push166=, 130
-	i32.const	$push165=, 214
-	call    	verify@FUNCTION, $pop164, $pop162, $pop160, $pop158, $pop168, $pop167, $pop166, $pop165
+	i32.store16	res+4($pop340), $5
+	i32.const	$push339=, 0
+	i32.store16	res+2($pop339), $6
+	i32.const	$push338=, 0
+	i32.store16	res($pop338), $7
+	i32.const	$push337=, 16
+	i32.shl 	$push135=, $7, $pop337
+	i32.const	$push336=, 16
+	i32.shr_s	$push136=, $pop135, $pop336
+	i32.const	$push335=, 16
+	i32.shl 	$push133=, $6, $pop335
+	i32.const	$push334=, 16
+	i32.shr_s	$push134=, $pop133, $pop334
+	i32.const	$push333=, 16
+	i32.shl 	$push131=, $5, $pop333
+	i32.const	$push332=, 16
+	i32.shr_s	$push132=, $pop131, $pop332
+	i32.const	$push331=, 16
+	i32.shl 	$push129=, $4, $pop331
+	i32.const	$push330=, 16
+	i32.shr_s	$push130=, $pop129, $pop330
+	i32.const	$push140=, 158
+	i32.const	$push139=, 109
+	i32.const	$push138=, 150
+	i32.const	$push137=, 222
+	call    	verify@FUNCTION, $pop136, $pop134, $pop132, $pop130, $pop140, $pop139, $pop138, $pop137
+	i32.const	$push329=, 0
+	i32.load16_u	$push142=, j+14($pop329)
+	i32.const	$push328=, 0
+	i32.load16_u	$push141=, i+14($pop328)
+	i32.xor 	$0=, $pop142, $pop141
+	i32.const	$push327=, 0
+	i32.store16	k+14($pop327), $0
+	i32.const	$push326=, 0
+	i32.load16_u	$push144=, j+12($pop326)
+	i32.const	$push325=, 0
+	i32.load16_u	$push143=, i+12($pop325)
+	i32.xor 	$1=, $pop144, $pop143
+	i32.const	$push324=, 0
+	i32.store16	k+12($pop324), $1
+	i32.const	$push323=, 0
+	i32.load16_u	$push146=, j+10($pop323)
+	i32.const	$push322=, 0
+	i32.load16_u	$push145=, i+10($pop322)
+	i32.xor 	$2=, $pop146, $pop145
 	i32.const	$push321=, 0
+	i32.store16	k+10($pop321), $2
 	i32.const	$push320=, 0
+	i32.load16_u	$push148=, j+8($pop320)
 	i32.const	$push319=, 0
-	i32.load16_u	$push169=, i+14($pop319)
-	i32.sub 	$push318=, $pop320, $pop169
-	tee_local	$push317=, $0=, $pop318
-	i32.store16	k+14($pop321), $pop317
+	i32.load16_u	$push147=, i+8($pop319)
+	i32.xor 	$3=, $pop148, $pop147
+	i32.const	$push318=, 0
+	i32.store16	k+8($pop318), $3
+	i32.const	$push317=, 0
+	i32.load16_u	$push150=, j+6($pop317)
 	i32.const	$push316=, 0
+	i32.load16_u	$push149=, i+6($pop316)
+	i32.xor 	$4=, $pop150, $pop149
 	i32.const	$push315=, 0
+	i32.store16	k+6($pop315), $4
 	i32.const	$push314=, 0
-	i32.load16_u	$push170=, i+12($pop314)
-	i32.sub 	$push313=, $pop315, $pop170
-	tee_local	$push312=, $1=, $pop313
-	i32.store16	k+12($pop316), $pop312
+	i32.load16_u	$push152=, j+4($pop314)
+	i32.const	$push313=, 0
+	i32.load16_u	$push151=, i+4($pop313)
+	i32.xor 	$5=, $pop152, $pop151
+	i32.const	$push312=, 0
+	i32.store16	k+4($pop312), $5
 	i32.const	$push311=, 0
+	i32.load16_u	$push154=, j+2($pop311)
 	i32.const	$push310=, 0
+	i32.load16_u	$push153=, i+2($pop310)
+	i32.xor 	$6=, $pop154, $pop153
 	i32.const	$push309=, 0
-	i32.load16_u	$push171=, i+10($pop309)
-	i32.sub 	$push308=, $pop310, $pop171
-	tee_local	$push307=, $2=, $pop308
-	i32.store16	k+10($pop311), $pop307
+	i32.store16	k+2($pop309), $6
+	i32.const	$push308=, 0
+	i32.load16_u	$push156=, j($pop308)
+	i32.const	$push307=, 0
+	i32.load16_u	$push155=, i($pop307)
+	i32.xor 	$7=, $pop156, $pop155
 	i32.const	$push306=, 0
+	i32.store16	k($pop306), $7
 	i32.const	$push305=, 0
+	i32.store16	res+14($pop305), $0
 	i32.const	$push304=, 0
-	i32.load16_u	$push172=, i+8($pop304)
-	i32.sub 	$push303=, $pop305, $pop172
-	tee_local	$push302=, $3=, $pop303
-	i32.store16	k+8($pop306), $pop302
+	i32.store16	res+12($pop304), $1
+	i32.const	$push303=, 0
+	i32.store16	res+10($pop303), $2
+	i32.const	$push302=, 0
+	i32.store16	res+8($pop302), $3
 	i32.const	$push301=, 0
+	i32.store16	res+6($pop301), $4
 	i32.const	$push300=, 0
+	i32.store16	res+4($pop300), $5
 	i32.const	$push299=, 0
-	i32.load16_u	$push173=, i+6($pop299)
-	i32.sub 	$push298=, $pop300, $pop173
-	tee_local	$push297=, $4=, $pop298
-	i32.store16	k+6($pop301), $pop297
-	i32.const	$push296=, 0
-	i32.const	$push295=, 0
-	i32.const	$push294=, 0
-	i32.load16_u	$push174=, i+4($pop294)
-	i32.sub 	$push293=, $pop295, $pop174
-	tee_local	$push292=, $5=, $pop293
-	i32.store16	k+4($pop296), $pop292
-	i32.const	$push291=, 0
-	i32.const	$push290=, 0
+	i32.store16	res+2($pop299), $6
+	i32.const	$push298=, 0
+	i32.store16	res($pop298), $7
+	i32.const	$push297=, 16
+	i32.shl 	$push163=, $7, $pop297
+	i32.const	$push296=, 16
+	i32.shr_s	$push164=, $pop163, $pop296
+	i32.const	$push295=, 16
+	i32.shl 	$push161=, $6, $pop295
+	i32.const	$push294=, 16
+	i32.shr_s	$push162=, $pop161, $pop294
+	i32.const	$push293=, 16
+	i32.shl 	$push159=, $5, $pop293
+	i32.const	$push292=, 16
+	i32.shr_s	$push160=, $pop159, $pop292
+	i32.const	$push291=, 16
+	i32.shl 	$push157=, $4, $pop291
+	i32.const	$push290=, 16
+	i32.shr_s	$push158=, $pop157, $pop290
+	i32.const	$push168=, 156
+	i32.const	$push167=, 105
+	i32.const	$push166=, 130
+	i32.const	$push165=, 214
+	call    	verify@FUNCTION, $pop164, $pop162, $pop160, $pop158, $pop168, $pop167, $pop166, $pop165
 	i32.const	$push289=, 0
-	i32.load16_u	$push175=, i+2($pop289)
-	i32.sub 	$push288=, $pop290, $pop175
-	tee_local	$push287=, $6=, $pop288
-	i32.store16	k+2($pop291), $pop287
+	i32.const	$push288=, 0
+	i32.load16_u	$push169=, i+14($pop288)
+	i32.sub 	$0=, $pop289, $pop169
+	i32.const	$push287=, 0
+	i32.store16	k+14($pop287), $0
 	i32.const	$push286=, 0
 	i32.const	$push285=, 0
+	i32.load16_u	$push170=, i+12($pop285)
+	i32.sub 	$1=, $pop286, $pop170
 	i32.const	$push284=, 0
-	i32.load16_u	$push176=, i($pop284)
-	i32.sub 	$push283=, $pop285, $pop176
-	tee_local	$push282=, $7=, $pop283
-	i32.store16	k($pop286), $pop282
+	i32.store16	k+12($pop284), $1
+	i32.const	$push283=, 0
+	i32.const	$push282=, 0
+	i32.load16_u	$push171=, i+10($pop282)
+	i32.sub 	$2=, $pop283, $pop171
 	i32.const	$push281=, 0
-	i32.store16	res+14($pop281), $0
+	i32.store16	k+10($pop281), $2
 	i32.const	$push280=, 0
-	i32.store16	res+12($pop280), $1
 	i32.const	$push279=, 0
-	i32.store16	res+10($pop279), $2
+	i32.load16_u	$push172=, i+8($pop279)
+	i32.sub 	$3=, $pop280, $pop172
 	i32.const	$push278=, 0
-	i32.store16	res+8($pop278), $3
+	i32.store16	k+8($pop278), $3
 	i32.const	$push277=, 0
-	i32.store16	res+6($pop277), $4
 	i32.const	$push276=, 0
-	i32.store16	res+4($pop276), $5
+	i32.load16_u	$push173=, i+6($pop276)
+	i32.sub 	$4=, $pop277, $pop173
 	i32.const	$push275=, 0
-	i32.store16	res+2($pop275), $6
+	i32.store16	k+6($pop275), $4
 	i32.const	$push274=, 0
-	i32.store16	res($pop274), $7
-	i32.const	$push273=, 16
-	i32.shl 	$push183=, $7, $pop273
-	i32.const	$push272=, 16
-	i32.shr_s	$push184=, $pop183, $pop272
-	i32.const	$push271=, 16
-	i32.shl 	$push181=, $6, $pop271
-	i32.const	$push270=, 16
-	i32.shr_s	$push182=, $pop181, $pop270
-	i32.const	$push269=, 16
-	i32.shl 	$push179=, $5, $pop269
-	i32.const	$push268=, 16
-	i32.shr_s	$push180=, $pop179, $pop268
-	i32.const	$push267=, 16
-	i32.shl 	$push177=, $4, $pop267
-	i32.const	$push266=, 16
-	i32.shr_s	$push178=, $pop177, $pop266
-	i32.const	$push187=, -150
-	i32.const	$push186=, -100
-	i32.const	$push265=, -150
-	i32.const	$push185=, -200
-	call    	verify@FUNCTION, $pop184, $pop182, $pop180, $pop178, $pop187, $pop186, $pop265, $pop185
+	i32.const	$push273=, 0
+	i32.load16_u	$push174=, i+4($pop273)
+	i32.sub 	$5=, $pop274, $pop174
+	i32.const	$push272=, 0
+	i32.store16	k+4($pop272), $5
+	i32.const	$push271=, 0
+	i32.const	$push270=, 0
+	i32.load16_u	$push175=, i+2($pop270)
+	i32.sub 	$6=, $pop271, $pop175
+	i32.const	$push269=, 0
+	i32.store16	k+2($pop269), $6
+	i32.const	$push268=, 0
+	i32.const	$push267=, 0
+	i32.load16_u	$push176=, i($pop267)
+	i32.sub 	$7=, $pop268, $pop176
+	i32.const	$push266=, 0
+	i32.store16	k($pop266), $7
+	i32.const	$push265=, 0
+	i32.store16	res+14($pop265), $0
 	i32.const	$push264=, 0
+	i32.store16	res+12($pop264), $1
 	i32.const	$push263=, 0
-	i32.load16_u	$push188=, i+14($pop263)
-	i32.const	$push189=, -1
-	i32.xor 	$push262=, $pop188, $pop189
-	tee_local	$push261=, $0=, $pop262
-	i32.store16	k+14($pop264), $pop261
+	i32.store16	res+10($pop263), $2
+	i32.const	$push262=, 0
+	i32.store16	res+8($pop262), $3
+	i32.const	$push261=, 0
+	i32.store16	res+6($pop261), $4
 	i32.const	$push260=, 0
+	i32.store16	res+4($pop260), $5
 	i32.const	$push259=, 0
-	i32.load16_u	$push190=, i+12($pop259)
-	i32.const	$push258=, -1
-	i32.xor 	$push257=, $pop190, $pop258
-	tee_local	$push256=, $1=, $pop257
-	i32.store16	k+12($pop260), $pop256
-	i32.const	$push255=, 0
-	i32.const	$push254=, 0
-	i32.load16_u	$push191=, i+10($pop254)
-	i32.const	$push253=, -1
-	i32.xor 	$push252=, $pop191, $pop253
-	tee_local	$push251=, $2=, $pop252
-	i32.store16	k+10($pop255), $pop251
-	i32.const	$push250=, 0
-	i32.const	$push249=, 0
-	i32.load16_u	$push192=, i+8($pop249)
-	i32.const	$push248=, -1
-	i32.xor 	$push247=, $pop192, $pop248
-	tee_local	$push246=, $3=, $pop247
-	i32.store16	k+8($pop250), $pop246
-	i32.const	$push245=, 0
+	i32.store16	res+2($pop259), $6
+	i32.const	$push258=, 0
+	i32.store16	res($pop258), $7
+	i32.const	$push257=, 16
+	i32.shl 	$push183=, $7, $pop257
+	i32.const	$push256=, 16
+	i32.shr_s	$push184=, $pop183, $pop256
+	i32.const	$push255=, 16
+	i32.shl 	$push181=, $6, $pop255
+	i32.const	$push254=, 16
+	i32.shr_s	$push182=, $pop181, $pop254
+	i32.const	$push253=, 16
+	i32.shl 	$push179=, $5, $pop253
+	i32.const	$push252=, 16
+	i32.shr_s	$push180=, $pop179, $pop252
+	i32.const	$push251=, 16
+	i32.shl 	$push177=, $4, $pop251
+	i32.const	$push250=, 16
+	i32.shr_s	$push178=, $pop177, $pop250
+	i32.const	$push187=, -150
+	i32.const	$push186=, -100
+	i32.const	$push249=, -150
+	i32.const	$push185=, -200
+	call    	verify@FUNCTION, $pop184, $pop182, $pop180, $pop178, $pop187, $pop186, $pop249, $pop185
+	i32.const	$push248=, 0
+	i32.load16_u	$push188=, i+14($pop248)
+	i32.const	$push189=, -1
+	i32.xor 	$0=, $pop188, $pop189
+	i32.const	$push247=, 0
+	i32.store16	k+14($pop247), $0
+	i32.const	$push246=, 0
+	i32.load16_u	$push190=, i+12($pop246)
+	i32.const	$push245=, -1
+	i32.xor 	$1=, $pop190, $pop245
 	i32.const	$push244=, 0
-	i32.load16_u	$push193=, i+6($pop244)
-	i32.const	$push243=, -1
-	i32.xor 	$push242=, $pop193, $pop243
-	tee_local	$push241=, $4=, $pop242
-	i32.store16	k+6($pop245), $pop241
+	i32.store16	k+12($pop244), $1
+	i32.const	$push243=, 0
+	i32.load16_u	$push191=, i+10($pop243)
+	i32.const	$push242=, -1
+	i32.xor 	$2=, $pop191, $pop242
+	i32.const	$push241=, 0
+	i32.store16	k+10($pop241), $2
 	i32.const	$push240=, 0
-	i32.const	$push239=, 0
-	i32.load16_u	$push194=, i+4($pop239)
-	i32.const	$push238=, -1
-	i32.xor 	$push237=, $pop194, $pop238
-	tee_local	$push236=, $5=, $pop237
-	i32.store16	k+4($pop240), $pop236
+	i32.load16_u	$push192=, i+8($pop240)
+	i32.const	$push239=, -1
+	i32.xor 	$3=, $pop192, $pop239
+	i32.const	$push238=, 0
+	i32.store16	k+8($pop238), $3
+	i32.const	$push237=, 0
+	i32.load16_u	$push193=, i+6($pop237)
+	i32.const	$push236=, -1
+	i32.xor 	$4=, $pop193, $pop236
 	i32.const	$push235=, 0
+	i32.store16	k+6($pop235), $4
 	i32.const	$push234=, 0
-	i32.load16_u	$push195=, i+2($pop234)
+	i32.load16_u	$push194=, i+4($pop234)
 	i32.const	$push233=, -1
-	i32.xor 	$push232=, $pop195, $pop233
-	tee_local	$push231=, $6=, $pop232
-	i32.store16	k+2($pop235), $pop231
-	i32.const	$push230=, 0
+	i32.xor 	$5=, $pop194, $pop233
+	i32.const	$push232=, 0
+	i32.store16	k+4($pop232), $5
+	i32.const	$push231=, 0
+	i32.load16_u	$push195=, i+2($pop231)
+	i32.const	$push230=, -1
+	i32.xor 	$6=, $pop195, $pop230
 	i32.const	$push229=, 0
-	i32.load16_u	$push196=, i($pop229)
-	i32.const	$push228=, -1
-	i32.xor 	$push227=, $pop196, $pop228
-	tee_local	$push226=, $7=, $pop227
-	i32.store16	k($pop230), $pop226
+	i32.store16	k+2($pop229), $6
+	i32.const	$push228=, 0
+	i32.load16_u	$push196=, i($pop228)
+	i32.const	$push227=, -1
+	i32.xor 	$7=, $pop196, $pop227
+	i32.const	$push226=, 0
+	i32.store16	k($pop226), $7
 	i32.const	$push225=, 0
 	i32.store16	res+14($pop225), $0
 	i32.const	$push224=, 0
@@ -887,6 +823,6 @@ res:
 	.size	res, 16
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 88e1ddf42..8e4474999 100644
--- a/test/torture-s/simd-4.c.s
+++ b/test/torture-s/simd-4.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i64.const	$push0=, -4294967295
 	i64.store	s64($pop1), $pop0
@@ -26,4 +26,4 @@ s64:
 	.size	s64, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/simd-5.c.s b/test/torture-s/simd-5.c.s
index 341511b34..ee73a50b8 100644
--- a/test/torture-s/simd-5.c.s
+++ b/test/torture-s/simd-5.c.s
@@ -5,7 +5,7 @@
 	.globl	func0
 	.type	func0,@function
 func0:                                  # @func0
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store	dummy($pop1), $pop0
@@ -20,71 +20,63 @@ func0:                                  # @func0
 	.type	func1,@function
 func1:                                  # @func1
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push63=, 0
-	i32.load16_u	$push2=, q2+6($pop63)
-	i32.const	$push62=, 0
-	i32.load16_u	$push1=, q1+6($pop62)
-	i32.mul 	$push61=, $pop2, $pop1
-	tee_local	$push60=, $0=, $pop61
-	i32.store16	w1+6($pop0), $pop60
-	i32.const	$push59=, 0
-	i32.const	$push58=, 0
-	i32.load16_u	$push4=, q2+4($pop58)
-	i32.const	$push57=, 0
-	i32.load16_u	$push3=, q1+4($pop57)
-	i32.mul 	$push56=, $pop4, $pop3
-	tee_local	$push55=, $1=, $pop56
-	i32.store16	w1+4($pop59), $pop55
-	i32.const	$push54=, 0
-	i32.const	$push53=, 0
-	i32.load16_u	$push6=, q2+2($pop53)
-	i32.const	$push52=, 0
-	i32.load16_u	$push5=, q1+2($pop52)
-	i32.mul 	$push51=, $pop6, $pop5
-	tee_local	$push50=, $2=, $pop51
-	i32.store16	w1+2($pop54), $pop50
-	i32.const	$push49=, 0
-	i32.const	$push48=, 0
-	i32.load16_u	$push8=, q2($pop48)
+	i32.load16_u	$push2=, q2+6($pop0)
 	i32.const	$push47=, 0
-	i32.load16_u	$push7=, q1($pop47)
-	i32.mul 	$push46=, $pop8, $pop7
-	tee_local	$push45=, $3=, $pop46
-	i32.store16	w1($pop49), $pop45
+	i32.load16_u	$push1=, q1+6($pop47)
+	i32.mul 	$0=, $pop2, $pop1
+	i32.const	$push46=, 0
+	i32.store16	w1+6($pop46), $0
+	i32.const	$push45=, 0
+	i32.load16_u	$push4=, q2+4($pop45)
 	i32.const	$push44=, 0
+	i32.load16_u	$push3=, q1+4($pop44)
+	i32.mul 	$1=, $pop4, $pop3
 	i32.const	$push43=, 0
-	i32.load16_u	$push10=, q4+6($pop43)
+	i32.store16	w1+4($pop43), $1
 	i32.const	$push42=, 0
-	i32.load16_u	$push9=, q3+6($pop42)
-	i32.mul 	$push41=, $pop10, $pop9
-	tee_local	$push40=, $4=, $pop41
-	i32.store16	w2+6($pop44), $pop40
+	i32.load16_u	$push6=, q2+2($pop42)
+	i32.const	$push41=, 0
+	i32.load16_u	$push5=, q1+2($pop41)
+	i32.mul 	$2=, $pop6, $pop5
+	i32.const	$push40=, 0
+	i32.store16	w1+2($pop40), $2
 	i32.const	$push39=, 0
+	i32.load16_u	$push8=, q2($pop39)
 	i32.const	$push38=, 0
-	i32.load16_u	$push12=, q4+4($pop38)
+	i32.load16_u	$push7=, q1($pop38)
+	i32.mul 	$3=, $pop8, $pop7
 	i32.const	$push37=, 0
-	i32.load16_u	$push11=, q3+4($pop37)
-	i32.mul 	$push36=, $pop12, $pop11
-	tee_local	$push35=, $5=, $pop36
-	i32.store16	w2+4($pop39), $pop35
+	i32.store16	w1($pop37), $3
+	i32.const	$push36=, 0
+	i32.load16_u	$push10=, q4+6($pop36)
+	i32.const	$push35=, 0
+	i32.load16_u	$push9=, q3+6($pop35)
+	i32.mul 	$4=, $pop10, $pop9
 	i32.const	$push34=, 0
+	i32.store16	w2+6($pop34), $4
 	i32.const	$push33=, 0
-	i32.load16_u	$push14=, q4+2($pop33)
+	i32.load16_u	$push12=, q4+4($pop33)
 	i32.const	$push32=, 0
-	i32.load16_u	$push13=, q3+2($pop32)
-	i32.mul 	$push31=, $pop14, $pop13
-	tee_local	$push30=, $6=, $pop31
-	i32.store16	w2+2($pop34), $pop30
+	i32.load16_u	$push11=, q3+4($pop32)
+	i32.mul 	$5=, $pop12, $pop11
+	i32.const	$push31=, 0
+	i32.store16	w2+4($pop31), $5
+	i32.const	$push30=, 0
+	i32.load16_u	$push14=, q4+2($pop30)
 	i32.const	$push29=, 0
+	i32.load16_u	$push13=, q3+2($pop29)
+	i32.mul 	$6=, $pop14, $pop13
 	i32.const	$push28=, 0
-	i32.load16_u	$push16=, q4($pop28)
+	i32.store16	w2+2($pop28), $6
 	i32.const	$push27=, 0
-	i32.load16_u	$push15=, q3($pop27)
-	i32.mul 	$push26=, $pop16, $pop15
-	tee_local	$push25=, $7=, $pop26
-	i32.store16	w2($pop29), $pop25
+	i32.load16_u	$push16=, q4($pop27)
+	i32.const	$push26=, 0
+	i32.load16_u	$push15=, q3($pop26)
+	i32.mul 	$7=, $pop16, $pop15
+	i32.const	$push25=, 0
+	i32.store16	w2($pop25), $7
 	call    	func0@FUNCTION
 	i32.const	$push24=, 0
 	i32.store16	w4+6($pop24), $4
@@ -113,71 +105,63 @@ func1:                                  # @func1
 	.type	func2,@function
 func2:                                  # @func2
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push63=, 0
-	i32.load16_u	$push2=, q2+6($pop63)
-	i32.const	$push62=, 0
-	i32.load16_u	$push1=, q1+6($pop62)
-	i32.add 	$push61=, $pop2, $pop1
-	tee_local	$push60=, $0=, $pop61
-	i32.store16	z1+6($pop0), $pop60
-	i32.const	$push59=, 0
-	i32.const	$push58=, 0
-	i32.load16_u	$push4=, q2+4($pop58)
-	i32.const	$push57=, 0
-	i32.load16_u	$push3=, q1+4($pop57)
-	i32.add 	$push56=, $pop4, $pop3
-	tee_local	$push55=, $1=, $pop56
-	i32.store16	z1+4($pop59), $pop55
-	i32.const	$push54=, 0
-	i32.const	$push53=, 0
-	i32.load16_u	$push6=, q2+2($pop53)
-	i32.const	$push52=, 0
-	i32.load16_u	$push5=, q1+2($pop52)
-	i32.add 	$push51=, $pop6, $pop5
-	tee_local	$push50=, $2=, $pop51
-	i32.store16	z1+2($pop54), $pop50
-	i32.const	$push49=, 0
-	i32.const	$push48=, 0
-	i32.load16_u	$push8=, q2($pop48)
+	i32.load16_u	$push2=, q2+6($pop0)
 	i32.const	$push47=, 0
-	i32.load16_u	$push7=, q1($pop47)
-	i32.add 	$push46=, $pop8, $pop7
-	tee_local	$push45=, $3=, $pop46
-	i32.store16	z1($pop49), $pop45
+	i32.load16_u	$push1=, q1+6($pop47)
+	i32.add 	$0=, $pop2, $pop1
+	i32.const	$push46=, 0
+	i32.store16	z1+6($pop46), $0
+	i32.const	$push45=, 0
+	i32.load16_u	$push4=, q2+4($pop45)
 	i32.const	$push44=, 0
+	i32.load16_u	$push3=, q1+4($pop44)
+	i32.add 	$1=, $pop4, $pop3
 	i32.const	$push43=, 0
-	i32.load16_u	$push10=, q3+6($pop43)
+	i32.store16	z1+4($pop43), $1
 	i32.const	$push42=, 0
-	i32.load16_u	$push9=, q4+6($pop42)
-	i32.sub 	$push41=, $pop10, $pop9
-	tee_local	$push40=, $4=, $pop41
-	i32.store16	z2+6($pop44), $pop40
+	i32.load16_u	$push6=, q2+2($pop42)
+	i32.const	$push41=, 0
+	i32.load16_u	$push5=, q1+2($pop41)
+	i32.add 	$2=, $pop6, $pop5
+	i32.const	$push40=, 0
+	i32.store16	z1+2($pop40), $2
 	i32.const	$push39=, 0
+	i32.load16_u	$push8=, q2($pop39)
 	i32.const	$push38=, 0
-	i32.load16_u	$push12=, q3+4($pop38)
+	i32.load16_u	$push7=, q1($pop38)
+	i32.add 	$3=, $pop8, $pop7
 	i32.const	$push37=, 0
-	i32.load16_u	$push11=, q4+4($pop37)
-	i32.sub 	$push36=, $pop12, $pop11
-	tee_local	$push35=, $5=, $pop36
-	i32.store16	z2+4($pop39), $pop35
+	i32.store16	z1($pop37), $3
+	i32.const	$push36=, 0
+	i32.load16_u	$push10=, q3+6($pop36)
+	i32.const	$push35=, 0
+	i32.load16_u	$push9=, q4+6($pop35)
+	i32.sub 	$4=, $pop10, $pop9
 	i32.const	$push34=, 0
+	i32.store16	z2+6($pop34), $4
 	i32.const	$push33=, 0
-	i32.load16_u	$push14=, q3+2($pop33)
+	i32.load16_u	$push12=, q3+4($pop33)
 	i32.const	$push32=, 0
-	i32.load16_u	$push13=, q4+2($pop32)
-	i32.sub 	$push31=, $pop14, $pop13
-	tee_local	$push30=, $6=, $pop31
-	i32.store16	z2+2($pop34), $pop30
+	i32.load16_u	$push11=, q4+4($pop32)
+	i32.sub 	$5=, $pop12, $pop11
+	i32.const	$push31=, 0
+	i32.store16	z2+4($pop31), $5
+	i32.const	$push30=, 0
+	i32.load16_u	$push14=, q3+2($pop30)
 	i32.const	$push29=, 0
+	i32.load16_u	$push13=, q4+2($pop29)
+	i32.sub 	$6=, $pop14, $pop13
 	i32.const	$push28=, 0
-	i32.load16_u	$push16=, q3($pop28)
+	i32.store16	z2+2($pop28), $6
 	i32.const	$push27=, 0
-	i32.load16_u	$push15=, q4($pop27)
-	i32.sub 	$push26=, $pop16, $pop15
-	tee_local	$push25=, $7=, $pop26
-	i32.store16	z2($pop29), $pop25
+	i32.load16_u	$push16=, q3($pop27)
+	i32.const	$push26=, 0
+	i32.load16_u	$push15=, q4($pop26)
+	i32.sub 	$7=, $pop16, $pop15
+	i32.const	$push25=, 0
+	i32.store16	z2($pop25), $7
 	call    	func1@FUNCTION
 	i32.const	$push24=, 0
 	i32.store16	z4+6($pop24), $4
@@ -206,7 +190,7 @@ func2:                                  # @func2
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	call    	func2@FUNCTION
 	block   	
 	i32.const	$push14=, 0
@@ -215,28 +199,28 @@ main:                                   # @main
 	i64.load	$push0=, w3($pop13)
 	i64.ne  	$push2=, $pop1, $pop0
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push16=, 0
 	i64.load	$push4=, w2($pop16)
 	i32.const	$push15=, 0
 	i64.load	$push3=, w4($pop15)
 	i64.ne  	$push5=, $pop4, $pop3
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push18=, 0
 	i64.load	$push7=, z1($pop18)
 	i32.const	$push17=, 0
 	i64.load	$push6=, z3($pop17)
 	i64.ne  	$push8=, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	i32.const	$push20=, 0
 	i64.load	$push10=, z2($pop20)
 	i32.const	$push19=, 0
 	i64.load	$push9=, z4($pop19)
 	i64.ne  	$push11=, $pop10, $pop9
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	i32.const	$push12=, 0
 	return  	$pop12
 .LBB3_5:                                # %if.then
@@ -377,5 +361,5 @@ z4:
 	.size	z4, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/simd-6.c.s b/test/torture-s/simd-6.c.s
index df66911d1..2d546bb65 100644
--- a/test/torture-s/simd-6.c.s
+++ b/test/torture-s/simd-6.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $0, $pop1
 	i32.mul 	$push0=, $16, $8
@@ -19,24 +19,18 @@ foo:                                    # @foo
 	i32.add 	$push8=, $0, $pop7
 	i32.mul 	$push6=, $14, $6
 	i32.store8	0($pop8), $pop6
-	i32.const	$push10=, 4
-	i32.add 	$push11=, $0, $pop10
 	i32.mul 	$push9=, $13, $5
-	i32.store8	0($pop11), $pop9
-	i32.const	$push13=, 3
-	i32.add 	$push14=, $0, $pop13
-	i32.mul 	$push12=, $12, $4
-	i32.store8	0($pop14), $pop12
-	i32.const	$push16=, 2
-	i32.add 	$push17=, $0, $pop16
-	i32.mul 	$push15=, $11, $3
-	i32.store8	0($pop17), $pop15
-	i32.const	$push19=, 1
-	i32.add 	$push20=, $0, $pop19
-	i32.mul 	$push18=, $10, $2
-	i32.store8	0($pop20), $pop18
-	i32.mul 	$push21=, $9, $1
-	i32.store8	0($0), $pop21
+	i32.store8	4($0), $pop9
+	i32.const	$push11=, 3
+	i32.add 	$push12=, $0, $pop11
+	i32.mul 	$push10=, $12, $4
+	i32.store8	0($pop12), $pop10
+	i32.mul 	$push13=, $11, $3
+	i32.store8	2($0), $pop13
+	i32.mul 	$push14=, $10, $2
+	i32.store8	1($0), $pop14
+	i32.mul 	$push15=, $9, $1
+	i32.store8	0($0), $pop15
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -48,7 +42,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -56,4 +50,4 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/stdarg-1.c.s b/test/torture-s/stdarg-1.c.s
index 89ffee24b..bc65800fa 100644
--- a/test/torture-s/stdarg-1.c.s
+++ b/test/torture-s/stdarg-1.c.s
@@ -6,12 +6,12 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 5
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %sw.bb
+# %bb.1:                                # %sw.bb
 	i32.const	$push3=, 0
 	i32.load	$push2=, 0($1)
 	i32.store	foo_arg($pop3), $pop2
@@ -31,39 +31,37 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 16392
 	i32.eq  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label3
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 16390
 	i32.ne  	$push3=, $0, $pop2
 	br_if   	1, $pop3        # 1: down to label2
-# BB#2:                                 # %if.then
-	i32.const	$push49=, 0
-	i32.const	$push48=, 0
-	i32.load	$push30=, gap($pop48)
+# %bb.2:                                # %if.then
+	i32.const	$push45=, 0
+	i32.load	$push30=, gap($pop45)
 	i32.const	$push31=, 7
 	i32.add 	$push32=, $pop30, $pop31
 	i32.const	$push33=, -8
-	i32.and 	$push47=, $pop32, $pop33
-	tee_local	$push46=, $1=, $pop47
+	i32.and 	$1=, $pop32, $pop33
 	i32.const	$push34=, 8
-	i32.add 	$push45=, $pop46, $pop34
-	tee_local	$push44=, $2=, $pop45
-	i32.store	gap($pop49), $pop44
+	i32.add 	$2=, $1, $pop34
+	i32.const	$push44=, 0
+	i32.store	gap($pop44), $2
 	f64.load	$push35=, 0($1)
 	f64.const	$push36=, 0x1.1p4
 	f64.ne  	$push37=, $pop35, $pop36
 	br_if   	2, $pop37       # 2: down to label1
-# BB#3:                                 # %lor.lhs.false
-	i32.const	$push50=, 0
+# %bb.3:                                # %lor.lhs.false
+	i32.const	$push46=, 0
 	i32.const	$push38=, 12
 	i32.add 	$push39=, $1, $pop38
-	i32.store	gap($pop50), $pop39
+	i32.store	gap($pop46), $pop39
 	i32.load	$push40=, 0($2)
 	i32.const	$push41=, 129
 	i32.eq  	$push42=, $pop40, $pop41
@@ -71,51 +69,45 @@ bar:                                    # @bar
 	br      	2               # 2: down to label1
 .LBB1_4:                                # %if.then7
 	end_block                       # label3:
-	i32.const	$push55=, 0
-	i32.load	$push54=, pap($pop55)
-	tee_local	$push53=, $1=, $pop54
+	i32.const	$push47=, 0
+	i32.load	$1=, pap($pop47)
 	i32.load	$push4=, 0($1)
 	i32.const	$push5=, 7
 	i32.add 	$push6=, $pop4, $pop5
 	i32.const	$push7=, -8
-	i32.and 	$push52=, $pop6, $pop7
-	tee_local	$push51=, $1=, $pop52
+	i32.and 	$2=, $pop6, $pop7
 	i32.const	$push8=, 8
-	i32.add 	$push9=, $pop51, $pop8
-	i32.store	0($pop53), $pop9
-	i64.load	$push10=, 0($1)
+	i32.add 	$push9=, $2, $pop8
+	i32.store	0($1), $pop9
+	i64.load	$push10=, 0($2)
 	i64.const	$push11=, 14
 	i64.ne  	$push12=, $pop10, $pop11
 	br_if   	1, $pop12       # 1: down to label1
-# BB#5:                                 # %lor.lhs.false11
-	i32.const	$push60=, 0
-	i32.load	$push59=, pap($pop60)
-	tee_local	$push58=, $1=, $pop59
-	i32.load	$push13=, 0($1)
+# %bb.5:                                # %lor.lhs.false11
+	i32.const	$push48=, 0
+	i32.load	$2=, pap($pop48)
+	i32.load	$push13=, 0($2)
 	i32.const	$push14=, 15
 	i32.add 	$push15=, $pop13, $pop14
 	i32.const	$push16=, -16
-	i32.and 	$push57=, $pop15, $pop16
-	tee_local	$push56=, $1=, $pop57
+	i32.and 	$1=, $pop15, $pop16
 	i32.const	$push17=, 16
-	i32.add 	$push18=, $pop56, $pop17
-	i32.store	0($pop58), $pop18
+	i32.add 	$push18=, $1, $pop17
+	i32.store	0($2), $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 label1
-# BB#6:                                 # %lor.lhs.false15
+# %bb.6:                                # %lor.lhs.false15
 	i32.const	$push24=, 0
-	i32.load	$push64=, pap($pop24)
-	tee_local	$push63=, $1=, $pop64
-	i32.load	$push62=, 0($1)
-	tee_local	$push61=, $1=, $pop62
+	i32.load	$1=, pap($pop24)
+	i32.load	$2=, 0($1)
 	i32.const	$push25=, 4
-	i32.add 	$push26=, $pop61, $pop25
-	i32.store	0($pop63), $pop26
-	i32.load	$push27=, 0($1)
+	i32.add 	$push26=, $2, $pop25
+	i32.store	0($1), $pop26
+	i32.load	$push27=, 0($2)
 	i32.const	$push28=, 17
 	i32.ne  	$push29=, $pop27, $pop28
 	br_if   	1, $pop29       # 1: down to label1
@@ -138,7 +130,7 @@ bar:                                    # @bar
 	.type	f0,@function
 f0:                                     # @f0
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -150,7 +142,7 @@ f0:                                     # @f0
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -162,217 +154,210 @@ f1:                                     # @f1
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	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
+	.local  	i32, f64, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push93=, 0
+	i32.load	$push92=, __stack_pointer($pop93)
+	i32.const	$push94=, 16
+	i32.sub 	$5=, $pop92, $pop94
+	i32.const	$push95=, 0
+	i32.store	__stack_pointer($pop95), $5
+	i32.store	12($5), $1
+	i32.const	$push0=, 0
+	f64.load	$3=, d($pop0)
+	block   	
+	block   	
+	f64.abs 	$push89=, $3
+	f64.const	$push90=, 0x1p31
+	f64.lt  	$push91=, $pop89, $pop90
+	br_if   	0, $pop91       # 0: down to label5
+# %bb.1:                                # %entry
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label4
+.LBB4_2:                                # %entry
+	end_block                       # label5:
+	i32.trunc_s/f64	$1=, $3
+.LBB4_3:                                # %entry
+	end_block                       # label4:
 	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.eq  	$push2=, $1, $pop1
+	br_if   	0, $pop2        # 0: down to label8
+# %bb.4:                                # %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
+	br_if   	1, $pop4        # 1: down to label7
+# %bb.5:                                # %if.then.i
+	i32.const	$push100=, 0
+	i32.load	$push31=, gap($pop100)
+	i32.const	$push32=, 7
+	i32.add 	$push33=, $pop31, $pop32
+	i32.const	$push34=, -8
+	i32.and 	$2=, $pop33, $pop34
+	i32.const	$push35=, 8
+	i32.add 	$4=, $2, $pop35
+	i32.const	$push99=, 0
+	i32.store	gap($pop99), $4
+	f64.load	$push36=, 0($2)
+	f64.const	$push37=, 0x1.1p4
+	f64.ne  	$push38=, $pop36, $pop37
+	br_if   	2, $pop38       # 2: down to label6
+# %bb.6:                                # %lor.lhs.false.i
+	i32.const	$push101=, 0
+	i32.const	$push39=, 12
+	i32.add 	$push40=, $2, $pop39
+	i32.store	gap($pop101), $pop40
+	i32.load	$push41=, 0($4)
+	i32.const	$push42=, 129
+	i32.eq  	$push43=, $pop41, $pop42
+	br_if   	1, $pop43       # 1: down to label7
+	br      	2               # 2: down to label6
+.LBB4_7:                                # %if.then7.i
+	end_block                       # label8:
+	i32.const	$push102=, 0
+	i32.load	$2=, pap($pop102)
 	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.and 	$4=, $pop7, $pop8
 	i32.const	$push9=, 8
-	i32.add 	$push10=, $pop107, $pop9
-	i32.store	0($pop109), $pop10
-	i64.load	$push11=, 0($2)
+	i32.add 	$push10=, $4, $pop9
+	i32.store	0($2), $pop10
+	i64.load	$push11=, 0($4)
 	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)
+	br_if   	1, $pop13       # 1: down to label6
+# %bb.8:                                # %lor.lhs.false11.i
+	i32.const	$push103=, 0
+	i32.load	$4=, pap($pop103)
+	i32.load	$push14=, 0($4)
 	i32.const	$push15=, 15
 	i32.add 	$push16=, $pop14, $pop15
 	i32.const	$push17=, -16
-	i32.and 	$push113=, $pop16, $pop17
-	tee_local	$push112=, $2=, $pop113
+	i32.and 	$2=, $pop16, $pop17
 	i32.const	$push18=, 16
-	i32.add 	$push19=, $pop112, $pop18
-	i32.store	0($pop114), $pop19
+	i32.add 	$push19=, $2, $pop18
+	i32.store	0($4), $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
+	br_if   	1, $pop24       # 1: down to label6
+# %bb.9:                                # %lor.lhs.false15.i
+	i32.const	$push25=, 0
+	i32.load	$2=, pap($pop25)
+	i32.load	$4=, 0($2)
+	i32.const	$push26=, 4
+	i32.add 	$push27=, $4, $pop26
+	i32.store	0($2), $pop27
+	i32.load	$push28=, 0($4)
+	i32.const	$push29=, 17
+	i32.ne  	$push30=, $pop28, $pop29
+	br_if   	1, $pop30       # 1: down to label6
+.LBB4_10:                               # %bar.exit
+	end_block                       # label7:
+	i32.const	$push105=, 0
+	i32.store	bar_arg($pop105), $1
+	i32.load	$1=, 12($5)
+	i32.const	$push44=, 4
+	i32.add 	$push45=, $1, $pop44
+	i32.store	12($5), $pop45
+	i32.load	$1=, 0($1)
+	i32.const	$push104=, 0
+	i32.store	x($pop104), $1
 	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
+	i32.const	$push46=, 16392
+	i32.eq  	$push47=, $1, $pop46
+	br_if   	0, $pop47       # 0: down to label10
+# %bb.11:                               # %bar.exit
+	i32.const	$push48=, 16390
+	i32.ne  	$push49=, $1, $pop48
+	br_if   	1, $pop49       # 1: down to label9
+# %bb.12:                               # %if.then.i7
+	i32.const	$push107=, 0
+	i32.load	$push75=, gap($pop107)
+	i32.const	$push76=, 7
+	i32.add 	$push77=, $pop75, $pop76
+	i32.const	$push78=, -8
+	i32.and 	$2=, $pop77, $pop78
+	i32.const	$push79=, 8
+	i32.add 	$4=, $2, $pop79
+	i32.const	$push106=, 0
+	i32.store	gap($pop106), $4
+	f64.load	$push80=, 0($2)
+	f64.const	$push81=, 0x1.1p4
+	f64.ne  	$push82=, $pop80, $pop81
+	br_if   	2, $pop82       # 2: down to label6
+# %bb.13:                               # %lor.lhs.false.i10
+	i32.const	$push108=, 0
+	i32.const	$push83=, 12
+	i32.add 	$push84=, $2, $pop83
+	i32.store	gap($pop108), $pop84
+	i32.load	$push85=, 0($4)
+	i32.const	$push86=, 129
+	i32.eq  	$push87=, $pop85, $pop86
+	br_if   	1, $pop87       # 1: down to label9
+	br      	2               # 2: down to label6
+.LBB4_14:                               # %if.then7.i16
+	end_block                       # label10:
+	i32.const	$push109=, 0
+	i32.load	$2=, pap($pop109)
+	i32.load	$push50=, 0($2)
+	i32.const	$push51=, 7
+	i32.add 	$push52=, $pop50, $pop51
+	i32.const	$push53=, -8
+	i32.and 	$4=, $pop52, $pop53
+	i32.const	$push54=, 8
+	i32.add 	$push55=, $4, $pop54
+	i32.store	0($2), $pop55
+	i64.load	$push56=, 0($4)
+	i64.const	$push57=, 14
+	i64.ne  	$push58=, $pop56, $pop57
+	br_if   	1, $pop58       # 1: down to label6
+# %bb.15:                               # %lor.lhs.false11.i21
+	i32.const	$push110=, 0
+	i32.load	$4=, pap($pop110)
+	i32.load	$push59=, 0($4)
+	i32.const	$push60=, 15
+	i32.add 	$push61=, $pop59, $pop60
+	i32.const	$push62=, -16
+	i32.and 	$2=, $pop61, $pop62
+	i32.const	$push63=, 16
+	i32.add 	$push64=, $2, $pop63
+	i32.store	0($4), $pop64
+	i64.load	$push66=, 0($2)
+	i64.load	$push65=, 8($2)
+	i64.const	$push68=, 0
+	i64.const	$push67=, 4613381465357418496
+	i32.call	$push69=, __netf2@FUNCTION, $pop66, $pop65, $pop68, $pop67
+	br_if   	1, $pop69       # 1: down to label6
+# %bb.16:                               # %lor.lhs.false15.i25
+	i32.const	$push111=, 0
+	i32.load	$2=, pap($pop111)
+	i32.load	$4=, 0($2)
+	i32.const	$push70=, 4
+	i32.add 	$push71=, $4, $pop70
+	i32.store	0($2), $pop71
+	i32.load	$push72=, 0($4)
+	i32.const	$push73=, 17
+	i32.ne  	$push74=, $pop72, $pop73
+	br_if   	1, $pop74       # 1: down to label6
+.LBB4_17:                               # %bar.exit27
+	end_block                       # label9:
+	i32.const	$push88=, 0
+	i32.store	bar_arg($pop88), $1
+	i32.const	$push98=, 0
+	i32.const	$push96=, 16
+	i32.add 	$push97=, $5, $pop96
+	i32.store	__stack_pointer($pop98), $pop97
 	return
-.LBB4_15:                               # %if.then5.i
-	end_block                       # label4:
+.LBB4_18:                               # %if.then5.i
+	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -386,16 +371,15 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$2=, __stack_pointer($pop7)
-	i32.const	$push4=, 0
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push11=, $pop1, $pop2
-	tee_local	$push10=, $1=, $pop11
-	i64.load	$push3=, 0($pop10)
+	i32.and 	$1=, $pop1, $pop2
+	i32.const	$push4=, 0
+	i64.load	$push3=, 0($1)
 	i64.store	d($pop4), $pop3
 	i32.const	$push8=, 16
 	i32.sub 	$push9=, $2, $pop8
@@ -413,43 +397,53 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
-	i32.const	$push10=, 0
-	i32.load	$push9=, __stack_pointer($pop10)
-	i32.const	$push11=, 16
-	i32.sub 	$push22=, $pop9, $pop11
-	tee_local	$push21=, $2=, $pop22
-	i32.store	__stack_pointer($pop12), $pop21
-	i32.const	$push20=, 0
+	.local  	f64, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push11=, 0
+	i32.load	$push10=, __stack_pointer($pop11)
+	i32.const	$push12=, 16
+	i32.sub 	$4=, $pop10, $pop12
+	i32.const	$push13=, 0
+	i32.store	__stack_pointer($pop13), $4
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push19=, $pop1, $pop2
-	tee_local	$push18=, $1=, $pop19
-	f64.load	$push3=, 0($pop18)
-	i32.trunc_s/f64	$push4=, $pop3
-	i32.store	x($pop20), $pop4
-	i32.const	$push5=, 8
-	i32.add 	$push17=, $1, $pop5
-	tee_local	$push16=, $1=, $pop17
-	i32.store	12($2), $pop16
+	i32.and 	$1=, $pop1, $pop2
+	f64.load	$2=, 0($1)
 	block   	
-	i32.const	$push6=, 5
-	i32.ne  	$push7=, $0, $pop6
-	br_if   	0, $pop7        # 0: down to label9
-# BB#1:                                 # %foo.exit
-	i32.const	$push23=, 0
-	i32.load	$push8=, 0($1)
-	i32.store	foo_arg($pop23), $pop8
-	i32.const	$push15=, 0
-	i32.const	$push13=, 16
-	i32.add 	$push14=, $2, $pop13
-	i32.store	__stack_pointer($pop15), $pop14
+	block   	
+	f64.abs 	$push7=, $2
+	f64.const	$push8=, 0x1p31
+	f64.lt  	$push9=, $pop7, $pop8
+	br_if   	0, $pop9        # 0: down to label12
+# %bb.1:                                # %entry
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label11
+.LBB6_2:                                # %entry
+	end_block                       # label12:
+	i32.trunc_s/f64	$3=, $2
+.LBB6_3:                                # %entry
+	end_block                       # label11:
+	i32.const	$push17=, 0
+	i32.store	x($pop17), $3
+	i32.const	$push3=, 8
+	i32.add 	$1=, $1, $pop3
+	i32.store	12($4), $1
+	block   	
+	i32.const	$push4=, 5
+	i32.ne  	$push5=, $0, $pop4
+	br_if   	0, $pop5        # 0: down to label13
+# %bb.4:                                # %foo.exit
+	i32.const	$push18=, 0
+	i32.load	$push6=, 0($1)
+	i32.store	foo_arg($pop18), $pop6
+	i32.const	$push16=, 0
+	i32.const	$push14=, 16
+	i32.add 	$push15=, $4, $pop14
+	i32.store	__stack_pointer($pop16), $pop15
 	return
-.LBB6_2:                                # %sw.default.i
-	end_block                       # label9:
+.LBB6_5:                                # %sw.default.i
+	end_block                       # label13:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -463,14 +457,13 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push46=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop43, $pop45
+	i32.const	$push46=, 0
+	i32.store	__stack_pointer($pop46), $3
 	i32.const	$push50=, 0
 	i32.store	gap($pop50), $1
 	i32.store	12($3), $1
@@ -479,90 +472,82 @@ f5:                                     # @f5
 	block   	
 	i32.const	$push0=, 16392
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label12
-# BB#1:                                 # %entry
+	br_if   	0, $pop1        # 0: down to label16
+# %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)
+	br_if   	1, $pop3        # 1: down to label15
+# %bb.2:                                # %if.then.i
+	i32.const	$push52=, 0
+	i32.load	$push29=, gap($pop52)
 	i32.const	$push30=, 7
 	i32.add 	$push31=, $pop29, $pop30
 	i32.const	$push32=, -8
-	i32.and 	$push56=, $pop31, $pop32
-	tee_local	$push55=, $1=, $pop56
+	i32.and 	$1=, $pop31, $pop32
 	i32.const	$push33=, 8
-	i32.add 	$push54=, $pop55, $pop33
-	tee_local	$push53=, $2=, $pop54
-	i32.store	gap($pop58), $pop53
+	i32.add 	$2=, $1, $pop33
+	i32.const	$push51=, 0
+	i32.store	gap($pop51), $2
 	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
+	br_if   	2, $pop36       # 2: down to label14
+# %bb.3:                                # %lor.lhs.false.i
+	i32.const	$push53=, 0
 	i32.const	$push37=, 12
 	i32.add 	$push38=, $1, $pop37
-	i32.store	gap($pop59), $pop38
+	i32.store	gap($pop53), $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
+	br_if   	1, $pop41       # 1: down to label15
+	br      	2               # 2: down to label14
 .LBB7_4:                                # %if.then7.i
-	end_block                       # label12:
-	i32.const	$push64=, 0
-	i32.load	$push63=, pap($pop64)
-	tee_local	$push62=, $1=, $pop63
+	end_block                       # label16:
+	i32.const	$push54=, 0
+	i32.load	$1=, pap($pop54)
 	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.and 	$2=, $pop6, $pop7
 	i32.const	$push8=, 8
-	i32.add 	$push9=, $pop60, $pop8
-	i32.store	0($pop62), $pop9
-	i64.load	$push10=, 0($1)
+	i32.add 	$push9=, $2, $pop8
+	i32.store	0($1), $pop9
+	i64.load	$push10=, 0($2)
 	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)
+	br_if   	1, $pop12       # 1: down to label14
+# %bb.5:                                # %lor.lhs.false11.i
+	i32.const	$push55=, 0
+	i32.load	$2=, pap($pop55)
+	i32.load	$push13=, 0($2)
 	i32.const	$push14=, 15
 	i32.add 	$push15=, $pop13, $pop14
 	i32.const	$push16=, -16
-	i32.and 	$push66=, $pop15, $pop16
-	tee_local	$push65=, $1=, $pop66
+	i32.and 	$1=, $pop15, $pop16
 	i32.const	$push17=, 16
-	i32.add 	$push18=, $pop65, $pop17
-	i32.store	0($pop67), $pop18
+	i32.add 	$push18=, $1, $pop17
+	i32.store	0($2), $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
+	br_if   	1, $pop23       # 1: down to label14
+# %bb.6:                                # %lor.lhs.false15.i
+	i32.const	$push56=, 0
+	i32.load	$1=, pap($pop56)
+	i32.load	$2=, 0($1)
 	i32.const	$push24=, 4
-	i32.add 	$push25=, $pop70, $pop24
-	i32.store	0($pop72), $pop25
-	i32.load	$push26=, 0($1)
+	i32.add 	$push25=, $2, $pop24
+	i32.store	0($1), $pop25
+	i32.load	$push26=, 0($2)
 	i32.const	$push27=, 17
 	i32.ne  	$push28=, $pop26, $pop27
-	br_if   	1, $pop28       # 1: down to label10
+	br_if   	1, $pop28       # 1: down to label14
 .LBB7_7:                                # %bar.exit
-	end_block                       # label11:
+	end_block                       # label15:
 	i32.const	$push42=, 0
 	i32.store	bar_arg($pop42), $0
 	i32.const	$push49=, 0
@@ -571,7 +556,7 @@ f5:                                     # @f5
 	i32.store	__stack_pointer($pop49), $pop48
 	return
 .LBB7_8:                                # %if.then5.i
-	end_block                       # label10:
+	end_block                       # label14:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -584,217 +569,210 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32
-	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	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
+	.local  	f64, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push93=, 0
+	i32.load	$push92=, __stack_pointer($pop93)
+	i32.const	$push94=, 16
+	i32.sub 	$5=, $pop92, $pop94
+	i32.const	$push95=, 0
+	i32.store	__stack_pointer($pop95), $5
+	i32.store	12($5), $1
+	i32.const	$push0=, 0
+	f64.load	$2=, d($pop0)
+	block   	
+	block   	
+	f64.abs 	$push89=, $2
+	f64.const	$push90=, 0x1p31
+	f64.lt  	$push91=, $pop89, $pop90
+	br_if   	0, $pop91       # 0: down to label18
+# %bb.1:                                # %entry
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label17
+.LBB8_2:                                # %entry
+	end_block                       # label18:
+	i32.trunc_s/f64	$1=, $2
+.LBB8_3:                                # %entry
+	end_block                       # label17:
 	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.eq  	$push2=, $1, $pop1
+	br_if   	0, $pop2        # 0: down to label21
+# %bb.4:                                # %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)
+	br_if   	1, $pop4        # 1: down to label20
+# %bb.5:                                # %if.then.i
+	i32.const	$push100=, 0
+	i32.load	$push31=, gap($pop100)
+	i32.const	$push32=, 7
+	i32.add 	$push33=, $pop31, $pop32
+	i32.const	$push34=, -8
+	i32.and 	$4=, $pop33, $pop34
+	i32.const	$push35=, 8
+	i32.add 	$3=, $4, $pop35
+	i32.const	$push99=, 0
+	i32.store	gap($pop99), $3
+	f64.load	$push36=, 0($4)
+	f64.const	$push37=, 0x1.1p4
+	f64.ne  	$push38=, $pop36, $pop37
+	br_if   	2, $pop38       # 2: down to label19
+# %bb.6:                                # %lor.lhs.false.i
+	i32.const	$push101=, 0
+	i32.const	$push39=, 12
+	i32.add 	$push40=, $4, $pop39
+	i32.store	gap($pop101), $pop40
+	i32.load	$push41=, 0($3)
+	i32.const	$push42=, 129
+	i32.eq  	$push43=, $pop41, $pop42
+	br_if   	1, $pop43       # 1: down to label20
+	br      	2               # 2: down to label19
+.LBB8_7:                                # %if.then7.i
+	end_block                       # label21:
+	i32.const	$push102=, 0
+	i32.load	$4=, pap($pop102)
+	i32.load	$push5=, 0($4)
 	i32.const	$push6=, 7
 	i32.add 	$push7=, $pop5, $pop6
 	i32.const	$push8=, -8
-	i32.and 	$push108=, $pop7, $pop8
-	tee_local	$push107=, $3=, $pop108
+	i32.and 	$3=, $pop7, $pop8
 	i32.const	$push9=, 8
-	i32.add 	$push10=, $pop107, $pop9
-	i32.store	0($pop109), $pop10
+	i32.add 	$push10=, $3, $pop9
+	i32.store	0($4), $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
+	br_if   	1, $pop13       # 1: down to label19
+# %bb.8:                                # %lor.lhs.false11.i
+	i32.const	$push103=, 0
+	i32.load	$3=, pap($pop103)
 	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.and 	$4=, $pop16, $pop17
 	i32.const	$push18=, 16
-	i32.add 	$push19=, $pop112, $pop18
-	i32.store	0($pop114), $pop19
-	i64.load	$push21=, 0($3)
-	i64.load	$push20=, 8($3)
+	i32.add 	$push19=, $4, $pop18
+	i32.store	0($3), $pop19
+	i64.load	$push21=, 0($4)
+	i64.load	$push20=, 8($4)
 	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
+	br_if   	1, $pop24       # 1: down to label19
+# %bb.9:                                # %lor.lhs.false15.i
+	i32.const	$push25=, 0
+	i32.load	$4=, pap($pop25)
+	i32.load	$3=, 0($4)
+	i32.const	$push26=, 4
+	i32.add 	$push27=, $3, $pop26
+	i32.store	0($4), $pop27
+	i32.load	$push28=, 0($3)
+	i32.const	$push29=, 17
+	i32.ne  	$push30=, $pop28, $pop29
+	br_if   	1, $pop30       # 1: down to label19
+.LBB8_10:                               # %bar.exit
+	end_block                       # label20:
+	i32.const	$push105=, 0
+	i32.store	bar_arg($pop105), $1
+	i32.load	$4=, 12($5)
+	i32.load	$1=, 8($4)
+	i32.const	$push104=, 0
+	i32.store	x($pop104), $1
+	i32.const	$push44=, 12
+	i32.add 	$push45=, $4, $pop44
+	i32.store	12($5), $pop45
 	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
+	i32.const	$push46=, 16392
+	i32.eq  	$push47=, $1, $pop46
+	br_if   	0, $pop47       # 0: down to label23
+# %bb.11:                               # %bar.exit
+	i32.const	$push48=, 16390
+	i32.ne  	$push49=, $1, $pop48
+	br_if   	1, $pop49       # 1: down to label22
+# %bb.12:                               # %if.then.i11
+	i32.const	$push107=, 0
+	i32.load	$push75=, gap($pop107)
+	i32.const	$push76=, 7
+	i32.add 	$push77=, $pop75, $pop76
+	i32.const	$push78=, -8
+	i32.and 	$4=, $pop77, $pop78
+	i32.const	$push79=, 8
+	i32.add 	$3=, $4, $pop79
+	i32.const	$push106=, 0
+	i32.store	gap($pop106), $3
+	f64.load	$push80=, 0($4)
+	f64.const	$push81=, 0x1.1p4
+	f64.ne  	$push82=, $pop80, $pop81
+	br_if   	2, $pop82       # 2: down to label19
+# %bb.13:                               # %lor.lhs.false.i14
+	i32.const	$push108=, 0
+	i32.const	$push83=, 12
+	i32.add 	$push84=, $4, $pop83
+	i32.store	gap($pop108), $pop84
+	i32.load	$push85=, 0($3)
+	i32.const	$push86=, 129
+	i32.eq  	$push87=, $pop85, $pop86
+	br_if   	1, $pop87       # 1: down to label22
+	br      	2               # 2: down to label19
+.LBB8_14:                               # %if.then7.i20
+	end_block                       # label23:
+	i32.const	$push109=, 0
+	i32.load	$4=, pap($pop109)
+	i32.load	$push50=, 0($4)
+	i32.const	$push51=, 7
+	i32.add 	$push52=, $pop50, $pop51
+	i32.const	$push53=, -8
+	i32.and 	$3=, $pop52, $pop53
+	i32.const	$push54=, 8
+	i32.add 	$push55=, $3, $pop54
+	i32.store	0($4), $pop55
+	i64.load	$push56=, 0($3)
+	i64.const	$push57=, 14
+	i64.ne  	$push58=, $pop56, $pop57
+	br_if   	1, $pop58       # 1: down to label19
+# %bb.15:                               # %lor.lhs.false11.i25
+	i32.const	$push110=, 0
+	i32.load	$3=, pap($pop110)
+	i32.load	$push59=, 0($3)
+	i32.const	$push60=, 15
+	i32.add 	$push61=, $pop59, $pop60
+	i32.const	$push62=, -16
+	i32.and 	$4=, $pop61, $pop62
+	i32.const	$push63=, 16
+	i32.add 	$push64=, $4, $pop63
+	i32.store	0($3), $pop64
+	i64.load	$push66=, 0($4)
+	i64.load	$push65=, 8($4)
+	i64.const	$push68=, 0
+	i64.const	$push67=, 4613381465357418496
+	i32.call	$push69=, __netf2@FUNCTION, $pop66, $pop65, $pop68, $pop67
+	br_if   	1, $pop69       # 1: down to label19
+# %bb.16:                               # %lor.lhs.false15.i29
+	i32.const	$push111=, 0
+	i32.load	$4=, pap($pop111)
+	i32.load	$3=, 0($4)
+	i32.const	$push70=, 4
+	i32.add 	$push71=, $3, $pop70
+	i32.store	0($4), $pop71
+	i32.load	$push72=, 0($3)
+	i32.const	$push73=, 17
+	i32.ne  	$push74=, $pop72, $pop73
+	br_if   	1, $pop74       # 1: down to label19
+.LBB8_17:                               # %bar.exit31
+	end_block                       # label22:
+	i32.const	$push88=, 0
+	i32.store	bar_arg($pop88), $1
+	i32.const	$push98=, 0
+	i32.const	$push96=, 16
+	i32.add 	$push97=, $5, $pop96
+	i32.store	__stack_pointer($pop98), $pop97
 	return
-.LBB8_15:                               # %if.then5.i
-	end_block                       # label13:
+.LBB8_18:                               # %if.then5.i
+	end_block                       # label19:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -808,14 +786,13 @@ f6:                                     # @f6
 f7:                                     # @f7
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push44=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop41, $pop43
+	i32.const	$push44=, 0
+	i32.store	__stack_pointer($pop44), $3
 	i32.const	$push0=, 0
 	i32.const	$push48=, 12
 	i32.add 	$push49=, $3, $pop48
@@ -826,80 +803,74 @@ f7:                                     # @f7
 	block   	
 	i32.const	$push1=, 16392
 	i32.eq  	$push2=, $0, $pop1
-	br_if   	0, $pop2        # 0: down to label20
-# BB#1:                                 # %entry
+	br_if   	0, $pop2        # 0: down to label26
+# %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)
+	br_if   	1, $pop4        # 1: down to label25
+# %bb.2:                                # %if.then.i
+	i32.const	$push51=, 0
+	i32.load	$push27=, gap($pop51)
 	i32.const	$push28=, 7
 	i32.add 	$push29=, $pop27, $pop28
 	i32.const	$push30=, -8
-	i32.and 	$push55=, $pop29, $pop30
-	tee_local	$push54=, $1=, $pop55
+	i32.and 	$1=, $pop29, $pop30
 	i32.const	$push31=, 8
-	i32.add 	$push53=, $pop54, $pop31
-	tee_local	$push52=, $2=, $pop53
-	i32.store	gap($pop57), $pop52
+	i32.add 	$2=, $1, $pop31
+	i32.const	$push50=, 0
+	i32.store	gap($pop50), $2
 	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
+	br_if   	2, $pop34       # 2: down to label24
+# %bb.3:                                # %lor.lhs.false.i
+	i32.const	$push52=, 0
 	i32.const	$push35=, 12
 	i32.add 	$push36=, $1, $pop35
-	i32.store	gap($pop58), $pop36
+	i32.store	gap($pop52), $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
+	br_if   	1, $pop39       # 1: down to label25
+	br      	2               # 2: down to label24
 .LBB9_4:                                # %if.then7.i
-	end_block                       # label20:
+	end_block                       # label26:
 	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.and 	$1=, $pop7, $pop8
 	i32.const	$push9=, 8
-	i32.add 	$push60=, $pop61, $pop9
-	tee_local	$push59=, $2=, $pop60
-	i32.store	12($3), $pop59
+	i32.add 	$2=, $1, $pop9
+	i32.store	12($3), $2
 	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
+	br_if   	1, $pop12       # 1: down to label24
+# %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.and 	$1=, $pop14, $pop15
 	i32.const	$push16=, 16
-	i32.add 	$push64=, $pop65, $pop16
-	tee_local	$push63=, $2=, $pop64
-	i32.store	12($3), $pop63
+	i32.add 	$2=, $1, $pop16
+	i32.store	12($3), $2
 	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
+	br_if   	1, $pop21       # 1: down to label24
+# %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
+	br_if   	1, $pop26       # 1: down to label24
 .LBB9_7:                                # %bar.exit
-	end_block                       # label19:
+	end_block                       # label25:
 	i32.const	$push40=, 0
 	i32.store	bar_arg($pop40), $0
 	i32.const	$push47=, 0
@@ -908,7 +879,7 @@ f7:                                     # @f7
 	i32.store	__stack_pointer($pop47), $pop46
 	return
 .LBB9_8:                                # %if.then5.i
-	end_block                       # label18:
+	end_block                       # label24:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -922,14 +893,13 @@ f7:                                     # @f7
 f8:                                     # @f8
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push51=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop48, $pop50
+	i32.const	$push51=, 0
+	i32.store	__stack_pointer($pop51), $3
 	i32.const	$push0=, 0
 	i32.const	$push55=, 12
 	i32.add 	$push56=, $3, $pop55
@@ -940,91 +910,84 @@ f8:                                     # @f8
 	block   	
 	i32.const	$push1=, 16392
 	i32.eq  	$push2=, $0, $pop1
-	br_if   	0, $pop2        # 0: down to label23
-# BB#1:                                 # %entry
+	br_if   	0, $pop2        # 0: down to label29
+# %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)
+	br_if   	1, $pop4        # 1: down to label28
+# %bb.2:                                # %if.then.i
+	i32.const	$push58=, 0
+	i32.load	$push27=, gap($pop58)
 	i32.const	$push28=, 7
 	i32.add 	$push29=, $pop27, $pop28
 	i32.const	$push30=, -8
-	i32.and 	$push62=, $pop29, $pop30
-	tee_local	$push61=, $1=, $pop62
+	i32.and 	$1=, $pop29, $pop30
 	i32.const	$push31=, 8
-	i32.add 	$push60=, $pop61, $pop31
-	tee_local	$push59=, $2=, $pop60
-	i32.store	gap($pop64), $pop59
+	i32.add 	$2=, $1, $pop31
+	i32.const	$push57=, 0
+	i32.store	gap($pop57), $2
 	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
+	br_if   	2, $pop34       # 2: down to label27
+# %bb.3:                                # %lor.lhs.false.i
+	i32.const	$push59=, 0
 	i32.const	$push35=, 12
 	i32.add 	$push36=, $1, $pop35
-	i32.store	gap($pop65), $pop36
+	i32.store	gap($pop59), $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
+	br_if   	1, $pop39       # 1: down to label28
+	br      	2               # 2: down to label27
 .LBB10_4:                               # %if.then7.i
-	end_block                       # label23:
+	end_block                       # label29:
 	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.and 	$1=, $pop7, $pop8
 	i32.const	$push9=, 8
-	i32.add 	$push67=, $pop68, $pop9
-	tee_local	$push66=, $2=, $pop67
-	i32.store	12($3), $pop66
+	i32.add 	$2=, $1, $pop9
+	i32.store	12($3), $2
 	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
+	br_if   	1, $pop12       # 1: down to label27
+# %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.and 	$1=, $pop14, $pop15
 	i32.const	$push16=, 16
-	i32.add 	$push71=, $pop72, $pop16
-	tee_local	$push70=, $2=, $pop71
-	i32.store	12($3), $pop70
+	i32.add 	$2=, $1, $pop16
+	i32.store	12($3), $2
 	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
+	br_if   	1, $pop21       # 1: down to label27
+# %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
+	br_if   	1, $pop26       # 1: down to label27
 .LBB10_7:                               # %bar.exit
-	end_block                       # label22:
+	end_block                       # label28:
 	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.and 	$0=, $pop43, $pop44
+	i32.const	$push60=, 0
+	i64.load	$push45=, 0($0)
+	i64.store	d($pop60), $pop45
 	i32.const	$push46=, 8
 	i32.add 	$push47=, $0, $pop46
 	i32.store	12($3), $pop47
@@ -1034,7 +997,7 @@ f8:                                     # @f8
 	i32.store	__stack_pointer($pop54), $pop53
 	return
 .LBB10_8:                               # %if.then5.i
-	end_block                       # label21:
+	end_block                       # label27:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -1048,14 +1011,13 @@ f8:                                     # @f8
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push44=, 0
+# %bb.0:                                # %entry
 	i32.const	$push42=, 0
 	i32.load	$push41=, __stack_pointer($pop42)
 	i32.const	$push43=, 176
-	i32.sub 	$push71=, $pop41, $pop43
-	tee_local	$push70=, $0=, $pop71
-	i32.store	__stack_pointer($pop44), $pop70
+	i32.sub 	$0=, $pop41, $pop43
+	i32.const	$push44=, 0
+	i32.store	__stack_pointer($pop44), $0
 	i32.const	$push69=, 0
 	i64.const	$push1=, 4629418941960159232
 	i64.store	d($pop69), $pop1
@@ -1069,45 +1031,45 @@ main:                                   # @main
 	i32.load	$push2=, bar_arg($pop67)
 	i32.const	$push66=, 28
 	i32.ne  	$push3=, $pop2, $pop66
-	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 label24
-# BB#2:                                 # %if.end
+	br_if   	0, $pop3        # 0: down to label30
+# %bb.1:                                # %entry
+	i32.const	$push71=, 0
+	i32.load	$push0=, x($pop71)
+	i32.const	$push70=, 28
+	i32.ne  	$push4=, $pop0, $pop70
+	br_if   	0, $pop4        # 0: down to label30
+# %bb.2:                                # %if.end
 	i64.const	$push5=, 4638813169307877376
 	i64.store	144($0), $pop5
 	i32.const	$push50=, 144
 	i32.add 	$push51=, $0, $pop50
 	call    	f3@FUNCTION, $0, $pop51
-	i32.const	$push74=, 0
-	f64.load	$push6=, d($pop74)
+	i32.const	$push72=, 0
+	f64.load	$push6=, d($pop72)
 	f64.const	$push7=, 0x1.06p7
 	f64.ne  	$push8=, $pop6, $pop7
-	br_if   	0, $pop8        # 0: down to label24
-# BB#3:                                 # %if.end4
-	i32.const	$push76=, 128
-	i32.store	136($0), $pop76
+	br_if   	0, $pop8        # 0: down to label30
+# %bb.3:                                # %if.end4
+	i32.const	$push74=, 128
+	i32.store	136($0), $pop74
 	i64.const	$push10=, 4625196817309499392
 	i64.store	128($0), $pop10
 	i32.const	$push11=, 5
 	i32.const	$push52=, 128
 	i32.add 	$push53=, $0, $pop52
 	call    	f4@FUNCTION, $pop11, $pop53
-	i32.const	$push75=, 0
-	i32.load	$push12=, x($pop75)
+	i32.const	$push73=, 0
+	i32.load	$push12=, x($pop73)
 	i32.const	$push13=, 16
 	i32.ne  	$push14=, $pop12, $pop13
-	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 label24
-# BB#5:                                 # %if.end9
+	br_if   	0, $pop14       # 0: down to label30
+# %bb.4:                                # %if.end4
+	i32.const	$push76=, 0
+	i32.load	$push9=, foo_arg($pop76)
+	i32.const	$push75=, 128
+	i32.ne  	$push15=, $pop9, $pop75
+	br_if   	0, $pop15       # 0: down to label30
+# %bb.5:                                # %if.end9
 	i32.const	$push16=, 129
 	i32.store	120($0), $pop16
 	i64.const	$push17=, 4625478292286210048
@@ -1116,12 +1078,12 @@ main:                                   # @main
 	i32.const	$push54=, 112
 	i32.add 	$push55=, $0, $pop54
 	call    	f5@FUNCTION, $pop18, $pop55
-	i32.const	$push80=, 0
-	i32.load	$push19=, bar_arg($pop80)
-	i32.const	$push79=, 16390
-	i32.ne  	$push20=, $pop19, $pop79
-	br_if   	0, $pop20       # 0: down to label24
-# BB#6:                                 # %if.end12
+	i32.const	$push78=, 0
+	i32.load	$push19=, bar_arg($pop78)
+	i32.const	$push77=, 16390
+	i32.ne  	$push20=, $pop19, $pop77
+	br_if   	0, $pop20       # 0: down to label30
+# %bb.6:                                # %if.end12
 	i64.const	$push21=, 60129542156
 	i64.store	96($0), $pop21
 	i32.const	$push22=, -31
@@ -1129,74 +1091,74 @@ main:                                   # @main
 	i32.const	$push56=, 96
 	i32.add 	$push57=, $0, $pop56
 	call    	f6@FUNCTION, $0, $pop57
-	i32.const	$push82=, 0
-	i32.load	$push23=, bar_arg($pop82)
-	i32.const	$push81=, -31
-	i32.ne  	$push24=, $pop23, $pop81
-	br_if   	0, $pop24       # 0: down to label24
-# BB#7:                                 # %if.end15
+	i32.const	$push80=, 0
+	i32.load	$push23=, bar_arg($pop80)
+	i32.const	$push79=, -31
+	i32.ne  	$push24=, $pop23, $pop79
+	br_if   	0, $pop24       # 0: down to label30
+# %bb.7:                                # %if.end15
 	i32.const	$push58=, 48
 	i32.add 	$push59=, $0, $pop58
-	i32.const	$push92=, 32
-	i32.add 	$push25=, $pop59, $pop92
+	i32.const	$push90=, 32
+	i32.add 	$push25=, $pop59, $pop90
 	i64.const	$push26=, 4628011567076605952
 	i64.store	0($pop25), $pop26
 	i32.const	$push60=, 48
 	i32.add 	$push61=, $0, $pop60
-	i32.const	$push91=, 24
-	i32.add 	$push27=, $pop61, $pop91
-	i32.const	$push90=, 17
-	i32.store	0($pop27), $pop90
+	i32.const	$push89=, 24
+	i32.add 	$push27=, $pop61, $pop89
+	i32.const	$push88=, 17
+	i32.store	0($pop27), $pop88
 	i32.const	$push62=, 48
 	i32.add 	$push63=, $0, $pop62
-	i32.const	$push89=, 16
-	i32.add 	$push28=, $pop63, $pop89
-	i64.const	$push88=, 4613381465357418496
-	i64.store	0($pop28), $pop88
-	i64.const	$push87=, 0
-	i64.store	56($0), $pop87
-	i64.const	$push86=, 14
-	i64.store	48($0), $pop86
-	i32.const	$push85=, 16392
+	i32.const	$push87=, 16
+	i32.add 	$push28=, $pop63, $pop87
+	i64.const	$push86=, 4613381465357418496
+	i64.store	0($pop28), $pop86
+	i64.const	$push85=, 0
+	i64.store	56($0), $pop85
+	i64.const	$push84=, 14
+	i64.store	48($0), $pop84
+	i32.const	$push83=, 16392
 	i32.const	$push64=, 48
 	i32.add 	$push65=, $0, $pop64
-	call    	f7@FUNCTION, $pop85, $pop65
-	i32.const	$push84=, 0
-	i32.load	$push29=, bar_arg($pop84)
-	i32.const	$push83=, 16392
-	i32.ne  	$push30=, $pop29, $pop83
-	br_if   	0, $pop30       # 0: down to label24
-# BB#8:                                 # %if.end18
-	i32.const	$push102=, 32
-	i32.add 	$push32=, $0, $pop102
+	call    	f7@FUNCTION, $pop83, $pop65
+	i32.const	$push82=, 0
+	i32.load	$push29=, bar_arg($pop82)
+	i32.const	$push81=, 16392
+	i32.ne  	$push30=, $pop29, $pop81
+	br_if   	0, $pop30       # 0: down to label30
+# %bb.8:                                # %if.end18
+	i32.const	$push100=, 32
+	i32.add 	$push32=, $0, $pop100
 	i64.const	$push33=, 4628293042053316608
 	i64.store	0($pop32), $pop33
-	i32.const	$push101=, 24
-	i32.add 	$push34=, $0, $pop101
-	i32.const	$push100=, 17
-	i32.store	0($pop34), $pop100
-	i32.const	$push99=, 16
-	i32.add 	$push35=, $0, $pop99
-	i64.const	$push98=, 4613381465357418496
-	i64.store	0($pop35), $pop98
-	i64.const	$push97=, 0
-	i64.store	8($0), $pop97
-	i64.const	$push96=, 14
-	i64.store	0($0), $pop96
-	i32.const	$push95=, 16392
-	call    	f8@FUNCTION, $pop95, $0
-	i32.const	$push94=, 0
-	i32.load	$push36=, bar_arg($pop94)
+	i32.const	$push99=, 24
+	i32.add 	$push34=, $0, $pop99
+	i32.const	$push98=, 17
+	i32.store	0($pop34), $pop98
+	i32.const	$push97=, 16
+	i32.add 	$push35=, $0, $pop97
+	i64.const	$push96=, 4613381465357418496
+	i64.store	0($pop35), $pop96
+	i64.const	$push95=, 0
+	i64.store	8($0), $pop95
+	i64.const	$push94=, 14
+	i64.store	0($0), $pop94
 	i32.const	$push93=, 16392
-	i32.ne  	$push37=, $pop36, $pop93
-	br_if   	0, $pop37       # 0: down to label24
-# BB#9:                                 # %if.end18
-	i32.const	$push103=, 0
-	f64.load	$push31=, d($pop103)
+	call    	f8@FUNCTION, $pop93, $0
+	i32.const	$push92=, 0
+	i32.load	$push36=, bar_arg($pop92)
+	i32.const	$push91=, 16392
+	i32.ne  	$push37=, $pop36, $pop91
+	br_if   	0, $pop37       # 0: down to label30
+# %bb.9:                                # %if.end18
+	i32.const	$push101=, 0
+	f64.load	$push31=, d($pop101)
 	f64.const	$push38=, 0x1.bp4
 	f64.ne  	$push39=, $pop31, $pop38
-	br_if   	0, $pop39       # 0: down to label24
-# BB#10:                                # %if.end23
+	br_if   	0, $pop39       # 0: down to label30
+# %bb.10:                               # %if.end23
 	i32.const	$push47=, 0
 	i32.const	$push45=, 176
 	i32.add 	$push46=, $0, $pop45
@@ -1204,7 +1166,7 @@ main:                                   # @main
 	i32.const	$push40=, 0
 	return  	$pop40
 .LBB11_11:                              # %if.then
-	end_block                       # label24:
+	end_block                       # label30:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -1266,5 +1228,5 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/stdarg-2.c.s b/test/torture-s/stdarg-2.c.s
index dbaac26d8..c18dd2f15 100644
--- a/test/torture-s/stdarg-2.c.s
+++ b/test/torture-s/stdarg-2.c.s
@@ -6,103 +6,109 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	i32.const	$push41=, 0
-	i32.const	$push39=, 0
-	i32.load	$push38=, __stack_pointer($pop39)
-	i32.const	$push40=, 32
-	i32.sub 	$push50=, $pop38, $pop40
-	tee_local	$push49=, $2=, $pop50
-	i32.store	__stack_pointer($pop41), $pop49
+	i32.load	$push40=, __stack_pointer($pop41)
+	i32.const	$push42=, 32
+	i32.sub 	$4=, $pop40, $pop42
+	i32.const	$push43=, 0
+	i32.store	__stack_pointer($pop43), $4
+	block   	
+	block   	
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 11
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label2
-# BB#1:                                 # %entry
+	br_if   	0, $pop1        # 0: down to label4
+# %bb.1:                                # %entry
 	block   	
 	i32.const	$push2=, 8
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	0, $pop3        # 0: down to label3
-# BB#2:                                 # %entry
+	br_if   	0, $pop3        # 0: down to label5
+# %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.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)
-	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.load	$push34=, 8($0)
-	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.bb9
-	end_block                       # label3:
-	i32.const	$push22=, 0
+	br_if   	5, $pop5        # 5: down to label0
+# %bb.3:                                # %sw.bb
+	i32.const	$push25=, 11
+	i32.add 	$push26=, $1, $pop25
+	i32.const	$push27=, -8
+	i32.and 	$0=, $pop26, $pop27
+	i32.load	$2=, 8($0)
+	f64.load	$push28=, 0($0)
+	i32.load	$push29=, 0($1)
+	f64.convert_s/i32	$push30=, $pop29
+	f64.add 	$3=, $pop28, $pop30
+	f64.abs 	$push32=, $3
+	f64.const	$push33=, 0x1p31
+	f64.lt  	$push34=, $pop32, $pop33
+	br_if   	2, $pop34       # 2: down to label3
+# %bb.4:                                # %sw.bb
+	i32.const	$push36=, -2147483648
+	i32.add 	$0=, $2, $pop36
+	br      	4               # 4: down to label1
+.LBB0_5:                                # %sw.bb9
+	end_block                       # label5:
 	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	$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.and 	$0=, $pop20, $pop21
+	f64.load	$push22=, 8($0)
+	i32.load	$push23=, 0($0)
+	f64.convert_s/i32	$push24=, $pop23
+	f64.add 	$3=, $pop22, $pop24
+	f64.abs 	$push37=, $3
+	f64.const	$push38=, 0x1p31
+	f64.lt  	$push39=, $pop37, $pop38
+	br_if   	2, $pop39       # 2: down to label2
+# %bb.6:                                # %sw.bb9
+	i32.const	$0=, -2147483648
+	br      	3               # 3: down to label1
+.LBB0_7:                                # %sw.bb18
+	end_block                       # label4:
 	i32.const	$push47=, 16
-	i32.add 	$push48=, $2, $pop47
-	i32.const	$push11=, 8
-	i32.add 	$push12=, $pop48, $pop11
-	i64.load	$push13=, 0($pop12)
-	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	$push59=, 8
-	i32.add 	$push16=, $2, $pop59
+	i32.add 	$push48=, $4, $pop47
+	i32.load	$push6=, 0($1)
+	call    	__floatsitf@FUNCTION, $pop48, $pop6
+	i32.const	$push7=, 19
+	i32.add 	$push8=, $1, $pop7
+	i32.const	$push9=, -16
+	i32.and 	$0=, $pop8, $pop9
+	i64.load	$push11=, 0($0)
+	i64.load	$push10=, 8($0)
+	i64.load	$push15=, 16($4)
+	i32.const	$push49=, 16
+	i32.add 	$push50=, $4, $pop49
+	i32.const	$push12=, 8
+	i32.add 	$push13=, $pop50, $pop12
+	i64.load	$push14=, 0($pop13)
+	call    	__addtf3@FUNCTION, $4, $pop11, $pop10, $pop15, $pop14
+	i64.load	$push18=, 0($4)
+	i32.const	$push51=, 8
+	i32.add 	$push16=, $4, $pop51
 	i64.load	$push17=, 0($pop16)
 	i32.call	$0=, __fixtfsi@FUNCTION, $pop18, $pop17
-.LBB0_6:                                # %sw.epilog
+	br      	2               # 2: down to label1
+.LBB0_8:                                # %sw.bb
+	end_block                       # label3:
+	i32.trunc_s/f64	$push35=, $3
+	i32.add 	$0=, $2, $pop35
+	br      	1               # 1: down to label1
+.LBB0_9:                                # %sw.bb9
+	end_block                       # label2:
+	i32.trunc_s/f64	$0=, $3
+.LBB0_10:                               # %sw.epilog
 	end_block                       # label1:
-	i32.const	$push37=, 0
-	i32.store	foo_arg($pop37), $0
-	i32.const	$push44=, 0
-	i32.const	$push42=, 32
-	i32.add 	$push43=, $2, $pop42
-	i32.store	__stack_pointer($pop44), $pop43
+	i32.const	$push31=, 0
+	i32.store	foo_arg($pop31), $0
+	i32.const	$push46=, 0
+	i32.const	$push44=, 32
+	i32.add 	$push45=, $4, $pop44
+	i32.store	__stack_pointer($pop46), $pop45
 	return
-.LBB0_7:                                # %sw.default
+.LBB0_11:                               # %sw.default
 	end_block                       # label0:
 	call    	abort@FUNCTION
 	unreachable
@@ -117,46 +123,43 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push0=, 16386
 	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label5
-# BB#1:                                 # %if.then
-	i32.const	$push20=, 0
-	i32.const	$push19=, 0
-	i32.load	$push18=, gap($pop19)
-	tee_local	$push17=, $2=, $pop18
+	br_if   	0, $pop1        # 0: down to label7
+# %bb.1:                                # %if.then
+	i32.const	$push16=, 0
+	i32.load	$2=, gap($pop16)
 	i32.const	$push2=, 4
-	i32.add 	$push16=, $pop17, $pop2
-	tee_local	$push15=, $1=, $pop16
-	i32.store	gap($pop20), $pop15
+	i32.add 	$1=, $2, $pop2
+	i32.const	$push15=, 0
+	i32.store	gap($pop15), $1
 	i32.load	$push3=, 0($2)
 	i32.const	$push4=, 13
 	i32.ne  	$push5=, $pop3, $pop4
-	br_if   	1, $pop5        # 1: down to label4
-# BB#2:                                 # %lor.lhs.false
-	i32.const	$push23=, 0
+	br_if   	1, $pop5        # 1: down to label6
+# %bb.2:                                # %lor.lhs.false
 	i32.const	$push6=, 7
 	i32.add 	$push7=, $1, $pop6
 	i32.const	$push8=, -8
-	i32.and 	$push22=, $pop7, $pop8
-	tee_local	$push21=, $2=, $pop22
+	i32.and 	$2=, $pop7, $pop8
+	i32.const	$push17=, 0
 	i32.const	$push9=, 8
-	i32.add 	$push10=, $pop21, $pop9
-	i32.store	gap($pop23), $pop10
+	i32.add 	$push10=, $2, $pop9
+	i32.store	gap($pop17), $pop10
 	f64.load	$push11=, 0($2)
 	f64.const	$push12=, -0x1.cp3
 	f64.ne  	$push13=, $pop11, $pop12
-	br_if   	1, $pop13       # 1: down to label4
+	br_if   	1, $pop13       # 1: down to label6
 .LBB1_3:                                # %if.end6
-	end_block                       # label5:
+	end_block                       # label7:
 	i32.const	$push14=, 0
 	i32.store	bar_arg($pop14), $0
 	return
 .LBB1_4:                                # %if.then5
-	end_block                       # label4:
+	end_block                       # label6:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -169,7 +172,7 @@ bar:                                    # @bar
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.const	$push0=, 4
 	i32.add 	$push1=, $1, $pop0
@@ -189,48 +192,45 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push15=, 0
 	i32.store	gap($pop15), $1
 	block   	
 	block   	
 	i32.const	$push0=, 16386
 	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label7
-# BB#1:                                 # %if.then.i
-	i32.const	$push21=, 0
-	i32.const	$push20=, 0
-	i32.load	$push19=, gap($pop20)
-	tee_local	$push18=, $1=, $pop19
+	br_if   	0, $pop1        # 0: down to label9
+# %bb.1:                                # %if.then.i
+	i32.const	$push17=, 0
+	i32.load	$1=, gap($pop17)
 	i32.const	$push2=, 4
-	i32.add 	$push17=, $pop18, $pop2
-	tee_local	$push16=, $2=, $pop17
-	i32.store	gap($pop21), $pop16
+	i32.add 	$2=, $1, $pop2
+	i32.const	$push16=, 0
+	i32.store	gap($pop16), $2
 	i32.load	$push3=, 0($1)
 	i32.const	$push4=, 13
 	i32.ne  	$push5=, $pop3, $pop4
-	br_if   	1, $pop5        # 1: down to label6
-# BB#2:                                 # %lor.lhs.false.i
-	i32.const	$push11=, 0
+	br_if   	1, $pop5        # 1: down to label8
+# %bb.2:                                # %lor.lhs.false.i
 	i32.const	$push6=, 7
 	i32.add 	$push7=, $2, $pop6
 	i32.const	$push8=, -8
-	i32.and 	$push23=, $pop7, $pop8
-	tee_local	$push22=, $1=, $pop23
+	i32.and 	$1=, $pop7, $pop8
+	i32.const	$push11=, 0
 	i32.const	$push9=, 8
-	i32.add 	$push10=, $pop22, $pop9
+	i32.add 	$push10=, $1, $pop9
 	i32.store	gap($pop11), $pop10
 	f64.load	$push12=, 0($1)
 	f64.const	$push13=, -0x1.cp3
 	f64.ne  	$push14=, $pop12, $pop13
-	br_if   	1, $pop14       # 1: down to label6
+	br_if   	1, $pop14       # 1: down to label8
 .LBB3_3:                                # %bar.exit
-	end_block                       # label7:
-	i32.const	$push24=, 0
-	i32.store	bar_arg($pop24), $0
+	end_block                       # label9:
+	i32.const	$push18=, 0
+	i32.store	bar_arg($pop18), $0
 	return
 .LBB3_4:                                # %if.then5.i
-	end_block                       # label6:
+	end_block                       # label8:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -243,7 +243,7 @@ f2:                                     # @f2
 	.type	f3,@function
 f3:                                     # @f3
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 48
@@ -266,49 +266,45 @@ f3:                                     # @f3
 f4:                                     # @f4
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 48
-	i32.sub 	$push23=, $pop15, $pop17
-	tee_local	$push22=, $3=, $pop23
-	i32.store	__stack_pointer($pop18), $pop22
+	i32.sub 	$3=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $3
 	i32.store	16($3), $1
 	block   	
 	block   	
 	i32.const	$push0=, 16386
 	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label9
-# BB#1:                                 # %if.then.i
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i32.load	$push27=, gap($pop28)
-	tee_local	$push26=, $1=, $pop27
+	br_if   	0, $pop1        # 0: down to label11
+# %bb.1:                                # %if.then.i
+	i32.const	$push23=, 0
+	i32.load	$1=, gap($pop23)
 	i32.const	$push2=, 4
-	i32.add 	$push25=, $pop26, $pop2
-	tee_local	$push24=, $2=, $pop25
-	i32.store	gap($pop29), $pop24
+	i32.add 	$2=, $1, $pop2
+	i32.const	$push22=, 0
+	i32.store	gap($pop22), $2
 	i32.load	$push3=, 0($1)
 	i32.const	$push4=, 13
 	i32.ne  	$push5=, $pop3, $pop4
-	br_if   	1, $pop5        # 1: down to label8
-# BB#2:                                 # %lor.lhs.false.i
-	i32.const	$push32=, 0
+	br_if   	1, $pop5        # 1: down to label10
+# %bb.2:                                # %lor.lhs.false.i
 	i32.const	$push6=, 7
 	i32.add 	$push7=, $2, $pop6
 	i32.const	$push8=, -8
-	i32.and 	$push31=, $pop7, $pop8
-	tee_local	$push30=, $1=, $pop31
+	i32.and 	$1=, $pop7, $pop8
+	i32.const	$push24=, 0
 	i32.const	$push9=, 8
-	i32.add 	$push10=, $pop30, $pop9
-	i32.store	gap($pop32), $pop10
+	i32.add 	$push10=, $1, $pop9
+	i32.store	gap($pop24), $pop10
 	f64.load	$push11=, 0($1)
 	f64.const	$push12=, -0x1.cp3
 	f64.ne  	$push13=, $pop11, $pop12
-	br_if   	1, $pop13       # 1: down to label8
+	br_if   	1, $pop13       # 1: down to label10
 .LBB5_3:                                # %bar.exit
-	end_block                       # label9:
+	end_block                       # label11:
 	i32.const	$push14=, 0
 	i32.store	bar_arg($pop14), $0
 	i32.const	$push21=, 0
@@ -317,7 +313,7 @@ f4:                                     # @f4
 	i32.store	__stack_pointer($pop21), $pop20
 	return
 .LBB5_4:                                # %if.then5.i
-	end_block                       # label8:
+	end_block                       # label10:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -330,105 +326,111 @@ f4:                                     # @f4
 	.type	f5,@function
 f5:                                     # @f5
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	i32.const	$push41=, 0
-	i32.const	$push39=, 0
-	i32.load	$push38=, __stack_pointer($pop39)
-	i32.const	$push40=, 80
-	i32.sub 	$push50=, $pop38, $pop40
-	tee_local	$push49=, $2=, $pop50
-	i32.store	__stack_pointer($pop41), $pop49
-	i32.store	48($2), $1
+	i32.load	$push40=, __stack_pointer($pop41)
+	i32.const	$push42=, 80
+	i32.sub 	$4=, $pop40, $pop42
+	i32.const	$push43=, 0
+	i32.store	__stack_pointer($pop43), $4
+	i32.store	48($4), $1
+	block   	
+	block   	
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 11
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label12
-# BB#1:                                 # %entry
+	br_if   	0, $pop1        # 0: down to label16
+# %bb.1:                                # %entry
 	block   	
 	i32.const	$push2=, 8
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	0, $pop3        # 0: down to label13
-# BB#2:                                 # %entry
+	br_if   	0, $pop3        # 0: down to label17
+# %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.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)
-	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.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.bb9.i
-	end_block                       # label13:
-	i32.const	$push22=, 0
+	br_if   	5, $pop5        # 5: down to label12
+# %bb.3:                                # %sw.bb.i
+	i32.const	$push25=, 11
+	i32.add 	$push26=, $1, $pop25
+	i32.const	$push27=, -8
+	i32.and 	$0=, $pop26, $pop27
+	i32.load	$2=, 8($0)
+	f64.load	$push28=, 0($0)
+	i32.load	$push29=, 0($1)
+	f64.convert_s/i32	$push30=, $pop29
+	f64.add 	$3=, $pop28, $pop30
+	f64.abs 	$push32=, $3
+	f64.const	$push33=, 0x1p31
+	f64.lt  	$push34=, $pop32, $pop33
+	br_if   	2, $pop34       # 2: down to label15
+# %bb.4:                                # %sw.bb.i
+	i32.const	$push36=, -2147483648
+	i32.add 	$1=, $2, $pop36
+	br      	4               # 4: down to label13
+.LBB6_5:                                # %sw.bb9.i
+	end_block                       # label17:
 	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	$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.and 	$1=, $pop20, $pop21
+	f64.load	$push22=, 8($1)
+	i32.load	$push23=, 0($1)
+	f64.convert_s/i32	$push24=, $pop23
+	f64.add 	$3=, $pop22, $pop24
+	f64.abs 	$push37=, $3
+	f64.const	$push38=, 0x1p31
+	f64.lt  	$push39=, $pop37, $pop38
+	br_if   	2, $pop39       # 2: down to label14
+# %bb.6:                                # %sw.bb9.i
+	i32.const	$1=, -2147483648
+	br      	3               # 3: down to label13
+.LBB6_7:                                # %sw.bb18.i
+	end_block                       # label16:
 	i32.const	$push47=, 16
-	i32.add 	$push48=, $2, $pop47
-	i32.const	$push11=, 8
-	i32.add 	$push12=, $pop48, $pop11
-	i64.load	$push13=, 0($pop12)
-	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	$push59=, 8
-	i32.add 	$push16=, $2, $pop59
+	i32.add 	$push48=, $4, $pop47
+	i32.load	$push6=, 0($1)
+	call    	__floatsitf@FUNCTION, $pop48, $pop6
+	i32.const	$push7=, 19
+	i32.add 	$push8=, $1, $pop7
+	i32.const	$push9=, -16
+	i32.and 	$1=, $pop8, $pop9
+	i64.load	$push11=, 0($1)
+	i64.load	$push10=, 8($1)
+	i64.load	$push15=, 16($4)
+	i32.const	$push49=, 16
+	i32.add 	$push50=, $4, $pop49
+	i32.const	$push12=, 8
+	i32.add 	$push13=, $pop50, $pop12
+	i64.load	$push14=, 0($pop13)
+	call    	__addtf3@FUNCTION, $4, $pop11, $pop10, $pop15, $pop14
+	i64.load	$push18=, 0($4)
+	i32.const	$push51=, 8
+	i32.add 	$push16=, $4, $pop51
 	i64.load	$push17=, 0($pop16)
 	i32.call	$1=, __fixtfsi@FUNCTION, $pop18, $pop17
-.LBB6_6:                                # %foo.exit
-	end_block                       # label11:
-	i32.const	$push37=, 0
-	i32.store	foo_arg($pop37), $1
-	i32.const	$push44=, 0
-	i32.const	$push42=, 80
-	i32.add 	$push43=, $2, $pop42
-	i32.store	__stack_pointer($pop44), $pop43
+	br      	2               # 2: down to label13
+.LBB6_8:                                # %sw.bb.i
+	end_block                       # label15:
+	i32.trunc_s/f64	$push35=, $3
+	i32.add 	$1=, $2, $pop35
+	br      	1               # 1: down to label13
+.LBB6_9:                                # %sw.bb9.i
+	end_block                       # label14:
+	i32.trunc_s/f64	$1=, $3
+.LBB6_10:                               # %foo.exit
+	end_block                       # label13:
+	i32.const	$push31=, 0
+	i32.store	foo_arg($pop31), $1
+	i32.const	$push46=, 0
+	i32.const	$push44=, 80
+	i32.add 	$push45=, $4, $pop44
+	i32.store	__stack_pointer($pop46), $pop45
 	return
-.LBB6_7:                                # %sw.default.i
-	end_block                       # label10:
+.LBB6_11:                               # %sw.default.i
+	end_block                       # label12:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -441,7 +443,7 @@ f5:                                     # @f5
 	.type	f6,@function
 f6:                                     # @f6
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
@@ -464,49 +466,45 @@ f6:                                     # @f6
 f7:                                     # @f7
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
-	i32.sub 	$push23=, $pop15, $pop17
-	tee_local	$push22=, $3=, $pop23
-	i32.store	__stack_pointer($pop18), $pop22
+	i32.sub 	$3=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $3
 	i32.store	4($3), $1
 	block   	
 	block   	
 	i32.const	$push0=, 16386
 	i32.ne  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label15
-# BB#1:                                 # %if.then.i
-	i32.const	$push29=, 0
-	i32.const	$push28=, 0
-	i32.load	$push27=, gap($pop28)
-	tee_local	$push26=, $1=, $pop27
+	br_if   	0, $pop1        # 0: down to label19
+# %bb.1:                                # %if.then.i
+	i32.const	$push23=, 0
+	i32.load	$1=, gap($pop23)
 	i32.const	$push2=, 4
-	i32.add 	$push25=, $pop26, $pop2
-	tee_local	$push24=, $2=, $pop25
-	i32.store	gap($pop29), $pop24
+	i32.add 	$2=, $1, $pop2
+	i32.const	$push22=, 0
+	i32.store	gap($pop22), $2
 	i32.load	$push3=, 0($1)
 	i32.const	$push4=, 13
 	i32.ne  	$push5=, $pop3, $pop4
-	br_if   	1, $pop5        # 1: down to label14
-# BB#2:                                 # %lor.lhs.false.i
-	i32.const	$push32=, 0
+	br_if   	1, $pop5        # 1: down to label18
+# %bb.2:                                # %lor.lhs.false.i
 	i32.const	$push6=, 7
 	i32.add 	$push7=, $2, $pop6
 	i32.const	$push8=, -8
-	i32.and 	$push31=, $pop7, $pop8
-	tee_local	$push30=, $1=, $pop31
+	i32.and 	$1=, $pop7, $pop8
+	i32.const	$push24=, 0
 	i32.const	$push9=, 8
-	i32.add 	$push10=, $pop30, $pop9
-	i32.store	gap($pop32), $pop10
+	i32.add 	$push10=, $1, $pop9
+	i32.store	gap($pop24), $pop10
 	f64.load	$push11=, 0($1)
 	f64.const	$push12=, -0x1.cp3
 	f64.ne  	$push13=, $pop11, $pop12
-	br_if   	1, $pop13       # 1: down to label14
+	br_if   	1, $pop13       # 1: down to label18
 .LBB8_3:                                # %bar.exit
-	end_block                       # label15:
+	end_block                       # label19:
 	i32.const	$push14=, 0
 	i32.store	bar_arg($pop14), $0
 	i32.const	$push21=, 0
@@ -515,7 +513,7 @@ f7:                                     # @f7
 	i32.store	__stack_pointer($pop21), $pop20
 	return
 .LBB8_4:                                # %if.then5.i
-	end_block                       # label14:
+	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -528,105 +526,111 @@ f7:                                     # @f7
 	.type	f8,@function
 f8:                                     # @f8
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	i32.const	$push41=, 0
-	i32.const	$push39=, 0
-	i32.load	$push38=, __stack_pointer($pop39)
-	i32.const	$push40=, 48
-	i32.sub 	$push50=, $pop38, $pop40
-	tee_local	$push49=, $2=, $pop50
-	i32.store	__stack_pointer($pop41), $pop49
-	i32.store	36($2), $1
+	i32.load	$push40=, __stack_pointer($pop41)
+	i32.const	$push42=, 48
+	i32.sub 	$4=, $pop40, $pop42
+	i32.const	$push43=, 0
+	i32.store	__stack_pointer($pop43), $4
+	i32.store	36($4), $1
+	block   	
+	block   	
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 11
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label18
-# BB#1:                                 # %entry
+	br_if   	0, $pop1        # 0: down to label24
+# %bb.1:                                # %entry
 	block   	
 	i32.const	$push2=, 8
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	0, $pop3        # 0: down to label19
-# BB#2:                                 # %entry
+	br_if   	0, $pop3        # 0: down to label25
+# %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.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)
-	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.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.bb9.i
-	end_block                       # label19:
-	i32.const	$push22=, 0
+	br_if   	5, $pop5        # 5: down to label20
+# %bb.3:                                # %sw.bb.i
+	i32.const	$push25=, 11
+	i32.add 	$push26=, $1, $pop25
+	i32.const	$push27=, -8
+	i32.and 	$0=, $pop26, $pop27
+	i32.load	$2=, 8($0)
+	f64.load	$push28=, 0($0)
+	i32.load	$push29=, 0($1)
+	f64.convert_s/i32	$push30=, $pop29
+	f64.add 	$3=, $pop28, $pop30
+	f64.abs 	$push32=, $3
+	f64.const	$push33=, 0x1p31
+	f64.lt  	$push34=, $pop32, $pop33
+	br_if   	2, $pop34       # 2: down to label23
+# %bb.4:                                # %sw.bb.i
+	i32.const	$push36=, -2147483648
+	i32.add 	$1=, $2, $pop36
+	br      	4               # 4: down to label21
+.LBB9_5:                                # %sw.bb9.i
+	end_block                       # label25:
 	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	$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.and 	$1=, $pop20, $pop21
+	f64.load	$push22=, 8($1)
+	i32.load	$push23=, 0($1)
+	f64.convert_s/i32	$push24=, $pop23
+	f64.add 	$3=, $pop22, $pop24
+	f64.abs 	$push37=, $3
+	f64.const	$push38=, 0x1p31
+	f64.lt  	$push39=, $pop37, $pop38
+	br_if   	2, $pop39       # 2: down to label22
+# %bb.6:                                # %sw.bb9.i
+	i32.const	$1=, -2147483648
+	br      	3               # 3: down to label21
+.LBB9_7:                                # %sw.bb18.i
+	end_block                       # label24:
 	i32.const	$push47=, 16
-	i32.add 	$push48=, $2, $pop47
-	i32.const	$push11=, 8
-	i32.add 	$push12=, $pop48, $pop11
-	i64.load	$push13=, 0($pop12)
-	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	$push59=, 8
-	i32.add 	$push16=, $2, $pop59
+	i32.add 	$push48=, $4, $pop47
+	i32.load	$push6=, 0($1)
+	call    	__floatsitf@FUNCTION, $pop48, $pop6
+	i32.const	$push7=, 19
+	i32.add 	$push8=, $1, $pop7
+	i32.const	$push9=, -16
+	i32.and 	$1=, $pop8, $pop9
+	i64.load	$push11=, 0($1)
+	i64.load	$push10=, 8($1)
+	i64.load	$push15=, 16($4)
+	i32.const	$push49=, 16
+	i32.add 	$push50=, $4, $pop49
+	i32.const	$push12=, 8
+	i32.add 	$push13=, $pop50, $pop12
+	i64.load	$push14=, 0($pop13)
+	call    	__addtf3@FUNCTION, $4, $pop11, $pop10, $pop15, $pop14
+	i64.load	$push18=, 0($4)
+	i32.const	$push51=, 8
+	i32.add 	$push16=, $4, $pop51
 	i64.load	$push17=, 0($pop16)
 	i32.call	$1=, __fixtfsi@FUNCTION, $pop18, $pop17
-.LBB9_6:                                # %foo.exit
-	end_block                       # label17:
-	i32.const	$push37=, 0
-	i32.store	foo_arg($pop37), $1
-	i32.const	$push44=, 0
-	i32.const	$push42=, 48
-	i32.add 	$push43=, $2, $pop42
-	i32.store	__stack_pointer($pop44), $pop43
+	br      	2               # 2: down to label21
+.LBB9_8:                                # %sw.bb.i
+	end_block                       # label23:
+	i32.trunc_s/f64	$push35=, $3
+	i32.add 	$1=, $2, $pop35
+	br      	1               # 1: down to label21
+.LBB9_9:                                # %sw.bb9.i
+	end_block                       # label22:
+	i32.trunc_s/f64	$1=, $3
+.LBB9_10:                               # %foo.exit
+	end_block                       # label21:
+	i32.const	$push31=, 0
+	i32.store	foo_arg($pop31), $1
+	i32.const	$push46=, 0
+	i32.const	$push44=, 48
+	i32.add 	$push45=, $4, $pop44
+	i32.store	__stack_pointer($pop46), $pop45
 	return
-.LBB9_7:                                # %sw.default.i
-	end_block                       # label16:
+.LBB9_11:                               # %sw.default.i
+	end_block                       # label20:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -639,7 +643,7 @@ f8:                                     # @f8
 	.type	f10,@function
 f10:                                    # @f10
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
@@ -664,14 +668,13 @@ f10:                                    # @f10
 f11:                                    # @f11
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	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.sub 	$3=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $3
 	i32.const	$push1=, 12
 	i32.add 	$push0=, $3, $pop1
 	i32.store	0($pop0), $1
@@ -679,36 +682,33 @@ f11:                                    # @f11
 	block   	
 	i32.const	$push2=, 16386
 	i32.ne  	$push3=, $0, $pop2
-	br_if   	0, $pop3        # 0: down to label21
-# BB#1:                                 # %if.then.i
-	i32.const	$push31=, 0
-	i32.const	$push30=, 0
-	i32.load	$push29=, gap($pop30)
-	tee_local	$push28=, $1=, $pop29
+	br_if   	0, $pop3        # 0: down to label27
+# %bb.1:                                # %if.then.i
+	i32.const	$push25=, 0
+	i32.load	$1=, gap($pop25)
 	i32.const	$push4=, 4
-	i32.add 	$push27=, $pop28, $pop4
-	tee_local	$push26=, $2=, $pop27
-	i32.store	gap($pop31), $pop26
+	i32.add 	$2=, $1, $pop4
+	i32.const	$push24=, 0
+	i32.store	gap($pop24), $2
 	i32.load	$push5=, 0($1)
 	i32.const	$push6=, 13
 	i32.ne  	$push7=, $pop5, $pop6
-	br_if   	1, $pop7        # 1: down to label20
-# BB#2:                                 # %lor.lhs.false.i
-	i32.const	$push34=, 0
+	br_if   	1, $pop7        # 1: down to label26
+# %bb.2:                                # %lor.lhs.false.i
 	i32.const	$push8=, 7
 	i32.add 	$push9=, $2, $pop8
 	i32.const	$push10=, -8
-	i32.and 	$push33=, $pop9, $pop10
-	tee_local	$push32=, $1=, $pop33
+	i32.and 	$1=, $pop9, $pop10
+	i32.const	$push26=, 0
 	i32.const	$push11=, 8
-	i32.add 	$push12=, $pop32, $pop11
-	i32.store	gap($pop34), $pop12
+	i32.add 	$push12=, $1, $pop11
+	i32.store	gap($pop26), $pop12
 	f64.load	$push13=, 0($1)
 	f64.const	$push14=, -0x1.cp3
 	f64.ne  	$push15=, $pop13, $pop14
-	br_if   	1, $pop15       # 1: down to label20
+	br_if   	1, $pop15       # 1: down to label26
 .LBB11_3:                               # %bar.exit
-	end_block                       # label21:
+	end_block                       # label27:
 	i32.const	$push16=, 0
 	i32.store	bar_arg($pop16), $0
 	i32.const	$push23=, 0
@@ -717,7 +717,7 @@ f11:                                    # @f11
 	i32.store	__stack_pointer($pop23), $pop22
 	return
 .LBB11_4:                               # %if.then5.i
-	end_block                       # label20:
+	end_block                       # label26:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -730,107 +730,113 @@ f11:                                    # @f11
 	.type	f12,@function
 f12:                                    # @f12
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	i32.const	$push43=, 0
-	i32.const	$push41=, 0
-	i32.load	$push40=, __stack_pointer($pop41)
-	i32.const	$push42=, 48
-	i32.sub 	$push52=, $pop40, $pop42
-	tee_local	$push51=, $2=, $pop52
-	i32.store	__stack_pointer($pop43), $pop51
+	i32.load	$push42=, __stack_pointer($pop43)
+	i32.const	$push44=, 48
+	i32.sub 	$4=, $pop42, $pop44
+	i32.const	$push45=, 0
+	i32.store	__stack_pointer($pop45), $4
 	i32.const	$push1=, 44
-	i32.add 	$push0=, $2, $pop1
+	i32.add 	$push0=, $4, $pop1
 	i32.store	0($pop0), $1
 	block   	
 	block   	
 	block   	
+	block   	
+	block   	
 	i32.const	$push2=, 11
 	i32.eq  	$push3=, $0, $pop2
-	br_if   	0, $pop3        # 0: down to label24
-# BB#1:                                 # %entry
+	br_if   	0, $pop3        # 0: down to label32
+# %bb.1:                                # %entry
 	block   	
 	i32.const	$push4=, 8
 	i32.eq  	$push5=, $0, $pop4
-	br_if   	0, $pop5        # 0: down to label25
-# BB#2:                                 # %entry
+	br_if   	0, $pop5        # 0: down to label33
+# %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.const	$push28=, 11
-	i32.add 	$push29=, $1, $pop28
-	i32.const	$push30=, -8
-	i32.and 	$push56=, $pop29, $pop30
-	tee_local	$push55=, $0=, $pop56
-	f64.load	$push31=, 0($pop55)
-	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=, $1=, $pop54
-	i32.store	foo_arg($pop35), $pop53
-	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.bb9.i
-	end_block                       # label25:
-	i32.const	$push24=, 0
+	br_if   	5, $pop7        # 5: down to label28
+# %bb.3:                                # %sw.bb.i
+	i32.const	$push27=, 11
+	i32.add 	$push28=, $1, $pop27
+	i32.const	$push29=, -8
+	i32.and 	$0=, $pop28, $pop29
+	i32.load	$2=, 8($0)
+	f64.load	$push30=, 0($0)
+	i32.load	$push31=, 0($1)
+	f64.convert_s/i32	$push32=, $pop31
+	f64.add 	$3=, $pop30, $pop32
+	f64.abs 	$push34=, $3
+	f64.const	$push35=, 0x1p31
+	f64.lt  	$push36=, $pop34, $pop35
+	br_if   	2, $pop36       # 2: down to label31
+# %bb.4:                                # %sw.bb.i
+	i32.const	$push38=, -2147483648
+	i32.add 	$1=, $2, $pop38
+	br      	4               # 4: down to label29
+.LBB12_5:                               # %sw.bb9.i
+	end_block                       # label33:
 	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	$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.and 	$1=, $pop22, $pop23
+	f64.load	$push24=, 8($1)
+	i32.load	$push25=, 0($1)
+	f64.convert_s/i32	$push26=, $pop25
+	f64.add 	$3=, $pop24, $pop26
+	f64.abs 	$push39=, $3
+	f64.const	$push40=, 0x1p31
+	f64.lt  	$push41=, $pop39, $pop40
+	br_if   	2, $pop41       # 2: down to label30
+# %bb.6:                                # %sw.bb9.i
+	i32.const	$1=, -2147483648
+	br      	3               # 3: down to label29
+.LBB12_7:                               # %sw.bb18.i
+	end_block                       # label32:
 	i32.const	$push49=, 16
-	i32.add 	$push50=, $2, $pop49
-	i32.const	$push13=, 8
-	i32.add 	$push14=, $pop50, $pop13
-	i64.load	$push15=, 0($pop14)
-	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	$push61=, 8
-	i32.add 	$push18=, $2, $pop61
+	i32.add 	$push50=, $4, $pop49
+	i32.load	$push8=, 0($1)
+	call    	__floatsitf@FUNCTION, $pop50, $pop8
+	i32.const	$push9=, 19
+	i32.add 	$push10=, $1, $pop9
+	i32.const	$push11=, -16
+	i32.and 	$1=, $pop10, $pop11
+	i64.load	$push13=, 0($1)
+	i64.load	$push12=, 8($1)
+	i64.load	$push17=, 16($4)
+	i32.const	$push51=, 16
+	i32.add 	$push52=, $4, $pop51
+	i32.const	$push14=, 8
+	i32.add 	$push15=, $pop52, $pop14
+	i64.load	$push16=, 0($pop15)
+	call    	__addtf3@FUNCTION, $4, $pop13, $pop12, $pop17, $pop16
+	i64.load	$push20=, 0($4)
+	i32.const	$push53=, 8
+	i32.add 	$push18=, $4, $pop53
 	i64.load	$push19=, 0($pop18)
 	i32.call	$1=, __fixtfsi@FUNCTION, $pop20, $pop19
-.LBB12_6:                               # %foo.exit
-	end_block                       # label23:
-	i32.const	$push39=, 0
-	i32.store	foo_arg($pop39), $1
-	i32.const	$push46=, 0
-	i32.const	$push44=, 48
-	i32.add 	$push45=, $2, $pop44
-	i32.store	__stack_pointer($pop46), $pop45
+	br      	2               # 2: down to label29
+.LBB12_8:                               # %sw.bb.i
+	end_block                       # label31:
+	i32.trunc_s/f64	$push37=, $3
+	i32.add 	$1=, $2, $pop37
+	br      	1               # 1: down to label29
+.LBB12_9:                               # %sw.bb9.i
+	end_block                       # label30:
+	i32.trunc_s/f64	$1=, $3
+.LBB12_10:                              # %foo.exit
+	end_block                       # label29:
+	i32.const	$push33=, 0
+	i32.store	foo_arg($pop33), $1
+	i32.const	$push48=, 0
+	i32.const	$push46=, 48
+	i32.add 	$push47=, $4, $pop46
+	i32.store	__stack_pointer($pop48), $pop47
 	return
-.LBB12_7:                               # %sw.default.i
-	end_block                       # label22:
+.LBB12_11:                              # %sw.default.i
+	end_block                       # label28:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -844,14 +850,13 @@ f12:                                    # @f12
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push54=, 0
+# %bb.0:                                # %entry
 	i32.const	$push52=, 0
 	i32.load	$push51=, __stack_pointer($pop52)
 	i32.const	$push53=, 176
-	i32.sub 	$push77=, $pop51, $pop53
-	tee_local	$push76=, $0=, $pop77
-	i32.store	__stack_pointer($pop54), $pop76
+	i32.sub 	$0=, $pop51, $pop53
+	i32.const	$push54=, 0
+	i32.store	__stack_pointer($pop54), $0
 	i32.const	$push0=, 79
 	i32.store	160($0), $pop0
 	i32.const	$push58=, 160
@@ -862,8 +867,8 @@ main:                                   # @main
 	i32.load	$push1=, x($pop75)
 	i32.const	$push74=, 79
 	i32.ne  	$push2=, $pop1, $pop74
-	br_if   	0, $pop2        # 0: down to label26
-# BB#1:                                 # %if.end
+	br_if   	0, $pop2        # 0: down to label34
+# %bb.1:                                # %if.end
 	i64.const	$push3=, -4599301119452119040
 	i64.store	152($0), $pop3
 	i32.const	$push4=, 13
@@ -872,35 +877,35 @@ main:                                   # @main
 	i32.const	$push60=, 144
 	i32.add 	$push61=, $0, $pop60
 	call    	f2@FUNCTION, $pop5, $pop61
-	i32.const	$push79=, 0
-	i32.load	$push6=, bar_arg($pop79)
-	i32.const	$push78=, 16386
-	i32.ne  	$push7=, $pop6, $pop78
-	br_if   	0, $pop7        # 0: down to label26
-# BB#2:                                 # %if.end3
+	i32.const	$push77=, 0
+	i32.load	$push6=, bar_arg($pop77)
+	i32.const	$push76=, 16386
+	i32.ne  	$push7=, $pop6, $pop76
+	br_if   	0, $pop7        # 0: down to label34
+# %bb.2:                                # %if.end3
 	i32.const	$push8=, 2031
 	i32.store	128($0), $pop8
 	i32.const	$push62=, 128
 	i32.add 	$push63=, $0, $pop62
 	call    	f3@FUNCTION, $0, $pop63
-	i32.const	$push81=, 0
-	i32.load	$push9=, x($pop81)
-	i32.const	$push80=, 2031
-	i32.ne  	$push10=, $pop9, $pop80
-	br_if   	0, $pop10       # 0: down to label26
-# BB#3:                                 # %if.end6
+	i32.const	$push79=, 0
+	i32.load	$push9=, x($pop79)
+	i32.const	$push78=, 2031
+	i32.ne  	$push10=, $pop9, $pop78
+	br_if   	0, $pop10       # 0: down to label34
+# %bb.3:                                # %if.end6
 	i32.const	$push11=, 18
 	i32.store	112($0), $pop11
 	i32.const	$push12=, 4
 	i32.const	$push64=, 112
 	i32.add 	$push65=, $0, $pop64
 	call    	f4@FUNCTION, $pop12, $pop65
-	i32.const	$push83=, 0
-	i32.load	$push13=, bar_arg($pop83)
-	i32.const	$push82=, 4
-	i32.ne  	$push14=, $pop13, $pop82
-	br_if   	0, $pop14       # 0: down to label26
-# BB#4:                                 # %if.end9
+	i32.const	$push81=, 0
+	i32.load	$push13=, bar_arg($pop81)
+	i32.const	$push80=, 4
+	i32.ne  	$push14=, $pop13, $pop80
+	br_if   	0, $pop14       # 0: down to label34
+# %bb.4:                                # %if.end9
 	i32.const	$push15=, 96
 	i32.add 	$push16=, $0, $pop15
 	i64.const	$push17=, 18
@@ -913,32 +918,32 @@ main:                                   # @main
 	i32.const	$push66=, 80
 	i32.add 	$push67=, $0, $pop66
 	call    	f5@FUNCTION, $pop20, $pop67
-	i32.const	$push84=, 0
-	i32.load	$push21=, foo_arg($pop84)
+	i32.const	$push82=, 0
+	i32.load	$push21=, foo_arg($pop82)
 	i32.const	$push22=, 38
 	i32.ne  	$push23=, $pop21, $pop22
-	br_if   	0, $pop23       # 0: down to label26
-# BB#5:                                 # %if.end12
+	br_if   	0, $pop23       # 0: down to label34
+# %bb.5:                                # %if.end12
 	i32.const	$push24=, 18
 	i32.store	64($0), $pop24
 	i32.const	$push68=, 64
 	i32.add 	$push69=, $0, $pop68
 	call    	f6@FUNCTION, $0, $pop69
-	i32.const	$push86=, 0
-	i32.load	$push25=, x($pop86)
-	i32.const	$push85=, 18
-	i32.ne  	$push26=, $pop25, $pop85
-	br_if   	0, $pop26       # 0: down to label26
-# BB#6:                                 # %if.end15
+	i32.const	$push84=, 0
+	i32.load	$push25=, x($pop84)
+	i32.const	$push83=, 18
+	i32.ne  	$push26=, $pop25, $pop83
+	br_if   	0, $pop26       # 0: down to label34
+# %bb.6:                                # %if.end15
 	i32.const	$push27=, 7
-	i32.const	$push89=, 0
-	call    	f7@FUNCTION, $pop27, $pop89
-	i32.const	$push88=, 0
-	i32.load	$push28=, bar_arg($pop88)
-	i32.const	$push87=, 7
-	i32.ne  	$push29=, $pop28, $pop87
-	br_if   	0, $pop29       # 0: down to label26
-# BB#7:                                 # %if.end18
+	i32.const	$push87=, 0
+	call    	f7@FUNCTION, $pop27, $pop87
+	i32.const	$push86=, 0
+	i32.load	$push28=, bar_arg($pop86)
+	i32.const	$push85=, 7
+	i32.ne  	$push29=, $pop28, $pop85
+	br_if   	0, $pop29       # 0: down to label34
+# %bb.7:                                # %if.end18
 	i64.const	$push30=, 4623507967449235456
 	i64.store	56($0), $pop30
 	i64.const	$push31=, 2031
@@ -947,32 +952,32 @@ main:                                   # @main
 	i32.const	$push70=, 48
 	i32.add 	$push71=, $0, $pop70
 	call    	f8@FUNCTION, $pop32, $pop71
-	i32.const	$push90=, 0
-	i32.load	$push33=, foo_arg($pop90)
+	i32.const	$push88=, 0
+	i32.load	$push33=, foo_arg($pop88)
 	i32.const	$push34=, 2044
 	i32.ne  	$push35=, $pop33, $pop34
-	br_if   	0, $pop35       # 0: down to label26
-# BB#8:                                 # %if.end21
+	br_if   	0, $pop35       # 0: down to label34
+# %bb.8:                                # %if.end21
 	i32.const	$push36=, 180
 	i32.store	32($0), $pop36
 	i32.const	$push72=, 32
 	i32.add 	$push73=, $0, $pop72
 	call    	f10@FUNCTION, $0, $pop73
-	i32.const	$push92=, 0
-	i32.load	$push37=, x($pop92)
-	i32.const	$push91=, 180
-	i32.ne  	$push38=, $pop37, $pop91
-	br_if   	0, $pop38       # 0: down to label26
-# BB#9:                                 # %if.end24
+	i32.const	$push90=, 0
+	i32.load	$push37=, x($pop90)
+	i32.const	$push89=, 180
+	i32.ne  	$push38=, $pop37, $pop89
+	br_if   	0, $pop38       # 0: down to label34
+# %bb.9:                                # %if.end24
 	i32.const	$push39=, 10
-	i32.const	$push95=, 0
-	call    	f11@FUNCTION, $pop39, $pop95
-	i32.const	$push94=, 0
-	i32.load	$push40=, bar_arg($pop94)
-	i32.const	$push93=, 10
-	i32.ne  	$push41=, $pop40, $pop93
-	br_if   	0, $pop41       # 0: down to label26
-# BB#10:                                # %if.end27
+	i32.const	$push93=, 0
+	call    	f11@FUNCTION, $pop39, $pop93
+	i32.const	$push92=, 0
+	i32.load	$push40=, bar_arg($pop92)
+	i32.const	$push91=, 10
+	i32.ne  	$push41=, $pop40, $pop91
+	br_if   	0, $pop41       # 0: down to label34
+# %bb.10:                               # %if.end27
 	i32.const	$push42=, 16
 	i32.add 	$push43=, $0, $pop42
 	i64.const	$push44=, 4612389705869164544
@@ -983,20 +988,20 @@ main:                                   # @main
 	i32.store	0($0), $pop46
 	i32.const	$push47=, 11
 	call    	f12@FUNCTION, $pop47, $0
-	i32.const	$push96=, 0
-	i32.load	$push48=, foo_arg($pop96)
+	i32.const	$push94=, 0
+	i32.load	$push48=, foo_arg($pop94)
 	i32.const	$push49=, 2042
 	i32.ne  	$push50=, $pop48, $pop49
-	br_if   	0, $pop50       # 0: down to label26
-# BB#11:                                # %if.end30
+	br_if   	0, $pop50       # 0: down to label34
+# %bb.11:                               # %if.end30
 	i32.const	$push57=, 0
 	i32.const	$push55=, 176
 	i32.add 	$push56=, $0, $pop55
 	i32.store	__stack_pointer($pop57), $pop56
-	i32.const	$push97=, 0
-	return  	$pop97
+	i32.const	$push95=, 0
+	return  	$pop95
 .LBB13_12:                              # %if.then
-	end_block                       # label26:
+	end_block                       # label34:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -1049,5 +1054,5 @@ d:
 	.size	d, 8
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/stdarg-3.c.s b/test/torture-s/stdarg-3.c.s
index 5070c18df..324cff7ad 100644
--- a/test/torture-s/stdarg-3.c.s
+++ b/test/torture-s/stdarg-3.c.s
@@ -6,7 +6,7 @@
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	bar_arg($pop0), $0
                                         # fallthrough-return
@@ -21,37 +21,34 @@ bar:                                    # @bar
 f1:                                     # @f1
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $3=, $pop8
-	i32.store	12($pop7), $1
+	i32.sub 	$3=, $pop3, $pop5
+	i32.store	12($3), $1
 	block   	
 	i32.const	$push6=, 1
 	i32.lt_s	$push0=, $0, $pop6
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push9=, 1
-	i32.add 	$1=, $0, $pop9
-	i32.load	$0=, 12($3)
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push7=, 1
+	i32.add 	$0=, $0, $pop7
+	i32.load	$1=, 12($3)
 .LBB1_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label1:
-	i32.const	$push17=, 4
-	i32.add 	$push16=, $0, $pop17
-	tee_local	$push15=, $2=, $pop16
-	i32.store	12($3), $pop15
-	i32.const	$push14=, 0
-	i32.load	$push1=, 0($0)
-	i32.store	x($pop14), $pop1
-	copy_local	$0=, $2
-	i32.const	$push13=, -1
-	i32.add 	$push12=, $1, $pop13
-	tee_local	$push11=, $1=, $pop12
-	i32.const	$push10=, 1
-	i32.gt_s	$push2=, $pop11, $pop10
+	i32.const	$push11=, 4
+	i32.add 	$2=, $1, $pop11
+	i32.store	12($3), $2
+	i32.const	$push10=, 0
+	i32.load	$push1=, 0($1)
+	i32.store	x($pop10), $pop1
+	i32.const	$push9=, -1
+	i32.add 	$0=, $0, $pop9
+	copy_local	$1=, $2
+	i32.const	$push8=, 1
+	i32.gt_s	$push2=, $0, $pop8
 	br_if   	0, $pop2        # 0: up to label1
 .LBB1_3:                                # %while.end
 	end_loop
@@ -68,43 +65,40 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push9=, $pop4, $pop6
-	tee_local	$push8=, $2=, $pop9
-	i32.store	12($pop8), $1
+	i32.sub 	$2=, $pop4, $pop6
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push7=, 1
 	i32.lt_s	$push0=, $0, $pop7
 	br_if   	0, $pop0        # 0: down to label2
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push10=, 1
-	i32.add 	$1=, $0, $pop10
-	i32.load	$0=, 12($2)
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push8=, 1
+	i32.add 	$0=, $0, $pop8
+	i32.load	$1=, 12($2)
 .LBB2_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.const	$push20=, 0
-	i32.const	$push19=, 7
-	i32.add 	$push1=, $0, $pop19
-	i32.const	$push18=, -8
-	i32.and 	$push17=, $pop1, $pop18
-	tee_local	$push16=, $0=, $pop17
-	i64.load	$push2=, 0($pop16)
-	i64.store	d($pop20), $pop2
-	i32.const	$push15=, 8
-	i32.add 	$0=, $0, $pop15
-	i32.const	$push14=, -1
-	i32.add 	$push13=, $1, $pop14
-	tee_local	$push12=, $1=, $pop13
-	i32.const	$push11=, 1
-	i32.gt_s	$push3=, $pop12, $pop11
+	i32.const	$push14=, 7
+	i32.add 	$push1=, $1, $pop14
+	i32.const	$push13=, -8
+	i32.and 	$1=, $pop1, $pop13
+	i32.const	$push12=, 0
+	i64.load	$push2=, 0($1)
+	i64.store	d($pop12), $pop2
+	i32.const	$push11=, 8
+	i32.add 	$1=, $1, $pop11
+	i32.const	$push10=, -1
+	i32.add 	$0=, $0, $pop10
+	i32.const	$push9=, 1
+	i32.gt_s	$push3=, $0, $pop9
 	br_if   	0, $pop3        # 0: up to label3
-# BB#3:                                 # %while.end.loopexit
+# %bb.3:                                # %while.end.loopexit
 	end_loop
-	i32.store	12($2), $0
+	i32.store	12($2), $1
 .LBB2_4:                                # %while.end
 	end_block                       # label2:
                                         # fallthrough-return
@@ -119,7 +113,7 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
@@ -128,7 +122,7 @@ f3:                                     # @f3
 	i32.const	$push6=, 1
 	i32.lt_s	$push0=, $0, $pop6
 	br_if   	0, $pop0        # 0: down to label4
-# BB#1:                                 # %while.body.preheader
+# %bb.1:                                # %while.body.preheader
 	i32.const	$push7=, 1
 	i32.add 	$0=, $0, $pop7
 	i32.const	$push1=, 4
@@ -137,17 +131,15 @@ f3:                                     # @f3
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label5:
 	i32.store	12($4), $2
-	i32.const	$push15=, 0
-	i32.load	$push14=, 0($1)
-	tee_local	$push13=, $3=, $pop14
-	i32.store	bar_arg($pop15), $pop13
-	i32.const	$push12=, 0
-	i32.store	x($pop12), $3
-	i32.const	$push11=, -1
-	i32.add 	$push10=, $0, $pop11
-	tee_local	$push9=, $0=, $pop10
+	i32.load	$3=, 0($1)
+	i32.const	$push11=, 0
+	i32.store	bar_arg($pop11), $3
+	i32.const	$push10=, 0
+	i32.store	x($pop10), $3
+	i32.const	$push9=, -1
+	i32.add 	$0=, $0, $pop9
 	i32.const	$push8=, 1
-	i32.gt_s	$push2=, $pop9, $pop8
+	i32.gt_s	$push2=, $0, $pop8
 	br_if   	0, $pop2        # 0: up to label5
 .LBB3_3:                                # %while.end
 	end_loop
@@ -163,47 +155,61 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32, i32
-	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push11=, 0
-	i32.load	$push10=, __stack_pointer($pop11)
-	i32.const	$push12=, 16
-	i32.sub 	$3=, $pop10, $pop12
+	.local  	i32, f64, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push12=, 0
+	i32.load	$push11=, __stack_pointer($pop12)
+	i32.const	$push13=, 16
+	i32.sub 	$5=, $pop11, $pop13
 	block   	
-	i32.const	$push13=, 1
-	i32.lt_s	$push0=, $0, $pop13
+	i32.const	$push14=, 1
+	i32.lt_s	$push0=, $0, $pop14
 	br_if   	0, $pop0        # 0: down to label6
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push16=, 1
-	i32.add 	$0=, $0, $pop16
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push15=, 1
+	i32.add 	$0=, $0, $pop15
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
-	i32.and 	$push15=, $pop2, $pop3
-	tee_local	$push14=, $1=, $pop15
-	i32.const	$push8=, 8
-	i32.add 	$2=, $pop14, $pop8
+	i32.and 	$2=, $pop2, $pop3
+	i32.const	$push6=, 8
+	i32.add 	$4=, $2, $pop6
 .LBB4_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label7:
-	i32.const	$push24=, 0
-	i64.load	$push4=, 0($1)
-	i64.store	d($pop24), $pop4
-	i32.const	$push23=, 0
-	i32.const	$push22=, 0
-	f64.load	$push5=, d($pop22)
-	f64.const	$push21=, 0x1p2
-	f64.add 	$push6=, $pop5, $pop21
-	i32.trunc_s/f64	$push7=, $pop6
-	i32.store	bar_arg($pop23), $pop7
-	i32.store	12($3), $2
+	i32.const	$push18=, 0
+	i64.load	$push4=, 0($2)
+	i64.store	d($pop18), $pop4
+	i32.const	$push17=, 0
+	f64.load	$push5=, d($pop17)
+	f64.const	$push16=, 0x1p2
+	f64.add 	$3=, $pop5, $pop16
+	block   	
+	block   	
+	f64.abs 	$push8=, $3
+	f64.const	$push9=, 0x1p31
+	f64.lt  	$push10=, $pop8, $pop9
+	br_if   	0, $pop10       # 0: down to label9
+# %bb.3:                                # %while.body
+                                        #   in Loop: Header=BB4_2 Depth=1
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label8
+.LBB4_4:                                # %while.body
+                                        #   in Loop: Header=BB4_2 Depth=1
+	end_block                       # label9:
+	i32.trunc_s/f64	$1=, $3
+.LBB4_5:                                # %while.body
+                                        #   in Loop: Header=BB4_2 Depth=1
+	end_block                       # label8:
+	i32.const	$push21=, 0
+	i32.store	bar_arg($pop21), $1
+	i32.store	12($5), $4
 	i32.const	$push20=, -1
-	i32.add 	$push19=, $0, $pop20
-	tee_local	$push18=, $0=, $pop19
-	i32.const	$push17=, 1
-	i32.gt_s	$push9=, $pop18, $pop17
-	br_if   	0, $pop9        # 0: up to label7
-.LBB4_3:                                # %while.end
+	i32.add 	$0=, $0, $pop20
+	i32.const	$push19=, 1
+	i32.gt_s	$push7=, $0, $pop19
+	br_if   	0, $pop7        # 0: up to label7
+.LBB4_6:                                # %while.end
 	end_loop
 	end_block                       # label6:
                                         # fallthrough-return
@@ -218,60 +224,57 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push10=, __stack_pointer($pop11)
 	i32.const	$push12=, 16
-	i32.sub 	$push15=, $pop10, $pop12
-	tee_local	$push14=, $2=, $pop15
-	i32.store	12($pop14), $1
+	i32.sub 	$2=, $pop10, $pop12
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push13=, 1
 	i32.lt_s	$push0=, $0, $pop13
-	br_if   	0, $pop0        # 0: down to label8
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push16=, 1
-	i32.add 	$1=, $0, $pop16
+	br_if   	0, $pop0        # 0: down to label10
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push14=, 1
+	i32.add 	$1=, $0, $pop14
 	i32.load	$0=, 12($2)
 .LBB5_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label9:
-	i32.const	$push32=, 0
-	i32.const	$push31=, 7
-	i32.add 	$push1=, $0, $pop31
-	i32.const	$push30=, -8
-	i32.and 	$push29=, $pop1, $pop30
-	tee_local	$push28=, $0=, $pop29
-	i64.load	$push2=, 0($pop28)
-	i64.store	s1($pop32), $pop2
-	i32.const	$push27=, 0
-	i32.const	$push26=, 24
-	i32.add 	$push3=, $0, $pop26
+	loop    	                # label11:
+	i32.const	$push26=, 7
+	i32.add 	$push1=, $0, $pop26
+	i32.const	$push25=, -8
+	i32.and 	$0=, $pop1, $pop25
+	i32.const	$push24=, 0
+	i64.load	$push2=, 0($0)
+	i64.store	s1($pop24), $pop2
+	i32.const	$push23=, 0
+	i32.const	$push22=, 24
+	i32.add 	$push3=, $0, $pop22
 	i64.load	$push4=, 0($pop3)
-	i64.store	s1+24($pop27), $pop4
-	i32.const	$push25=, 0
-	i32.const	$push24=, 16
-	i32.add 	$push5=, $0, $pop24
+	i64.store	s1+24($pop23), $pop4
+	i32.const	$push21=, 0
+	i32.const	$push20=, 16
+	i32.add 	$push5=, $0, $pop20
 	i64.load	$push6=, 0($pop5)
-	i64.store	s1+16($pop25), $pop6
-	i32.const	$push23=, 0
-	i32.const	$push22=, 8
-	i32.add 	$push7=, $0, $pop22
+	i64.store	s1+16($pop21), $pop6
+	i32.const	$push19=, 0
+	i32.const	$push18=, 8
+	i32.add 	$push7=, $0, $pop18
 	i64.load	$push8=, 0($pop7)
-	i64.store	s1+8($pop23), $pop8
-	i32.const	$push21=, 32
-	i32.add 	$0=, $0, $pop21
-	i32.const	$push20=, -1
-	i32.add 	$push19=, $1, $pop20
-	tee_local	$push18=, $1=, $pop19
-	i32.const	$push17=, 1
-	i32.gt_s	$push9=, $pop18, $pop17
-	br_if   	0, $pop9        # 0: up to label9
-# BB#3:                                 # %while.end.loopexit
+	i64.store	s1+8($pop19), $pop8
+	i32.const	$push17=, 32
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push16=, -1
+	i32.add 	$1=, $1, $pop16
+	i32.const	$push15=, 1
+	i32.gt_s	$push9=, $1, $pop15
+	br_if   	0, $pop9        # 0: up to label11
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i32.store	12($2), $0
 .LBB5_4:                                # %while.end
-	end_block                       # label8:
+	end_block                       # label10:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -284,50 +287,47 @@ f5:                                     # @f5
 f6:                                     # @f6
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
-	i32.sub 	$push11=, $pop6, $pop8
-	tee_local	$push10=, $2=, $pop11
-	i32.store	12($pop10), $1
+	i32.sub 	$2=, $pop6, $pop8
+	i32.store	12($2), $1
 	block   	
 	i32.const	$push9=, 1
 	i32.lt_s	$push0=, $0, $pop9
-	br_if   	0, $pop0        # 0: down to label10
-# BB#1:                                 # %while.body.lr.ph
-	i32.const	$push12=, 1
-	i32.add 	$1=, $0, $pop12
+	br_if   	0, $pop0        # 0: down to label12
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push10=, 1
+	i32.add 	$1=, $0, $pop10
 	i32.load	$0=, 12($2)
 .LBB6_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label11:
-	i32.const	$push24=, 0
-	i32.const	$push23=, 7
-	i32.add 	$push1=, $0, $pop23
-	i32.const	$push22=, -8
-	i32.and 	$push21=, $pop1, $pop22
-	tee_local	$push20=, $0=, $pop21
-	i64.load	$push2=, 0($pop20)
-	i64.store	s2($pop24), $pop2
-	i32.const	$push19=, 0
-	i32.const	$push18=, 8
-	i32.add 	$push3=, $0, $pop18
+	loop    	                # label13:
+	i32.const	$push18=, 7
+	i32.add 	$push1=, $0, $pop18
+	i32.const	$push17=, -8
+	i32.and 	$0=, $pop1, $pop17
+	i32.const	$push16=, 0
+	i64.load	$push2=, 0($0)
+	i64.store	s2($pop16), $pop2
+	i32.const	$push15=, 0
+	i32.const	$push14=, 8
+	i32.add 	$push3=, $0, $pop14
 	i64.load	$push4=, 0($pop3)
-	i64.store	s2+8($pop19), $pop4
-	i32.const	$push17=, 16
-	i32.add 	$0=, $0, $pop17
-	i32.const	$push16=, -1
-	i32.add 	$push15=, $1, $pop16
-	tee_local	$push14=, $1=, $pop15
-	i32.const	$push13=, 1
-	i32.gt_s	$push5=, $pop14, $pop13
-	br_if   	0, $pop5        # 0: up to label11
-# BB#3:                                 # %while.end.loopexit
+	i64.store	s2+8($pop15), $pop4
+	i32.const	$push13=, 16
+	i32.add 	$0=, $0, $pop13
+	i32.const	$push12=, -1
+	i32.add 	$1=, $1, $pop12
+	i32.const	$push11=, 1
+	i32.gt_s	$push5=, $1, $pop11
+	br_if   	0, $pop5        # 0: up to label13
+# %bb.3:                                # %while.end.loopexit
 	end_loop
 	i32.store	12($2), $0
 .LBB6_4:                                # %while.end
-	end_block                       # label10:
+	end_block                       # label12:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -340,7 +340,7 @@ f6:                                     # @f6
 f7:                                     # @f7
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push15=, 0
 	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
@@ -348,17 +348,16 @@ f7:                                     # @f7
 	block   	
 	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	$push20=, 1
-	i32.add 	$0=, $0, $pop20
+	br_if   	0, $pop0        # 0: down to label14
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push18=, 1
+	i32.add 	$0=, $0, $pop18
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
-	i32.and 	$push19=, $pop2, $pop3
-	tee_local	$push18=, $1=, $pop19
+	i32.and 	$1=, $pop2, $pop3
 	i32.const	$push5=, 8
-	i32.add 	$2=, $pop18, $pop5
+	i32.add 	$2=, $1, $pop5
 	i32.const	$push7=, 16
 	i32.add 	$3=, $1, $pop7
 	i32.const	$push9=, 24
@@ -367,33 +366,32 @@ f7:                                     # @f7
 	i32.add 	$5=, $1, $pop12
 .LBB7_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label13:
-	i32.const	$push30=, 0
+	loop    	                # label15:
+	i32.const	$push26=, 0
 	i64.load	$push4=, 0($1)
-	i64.store	s1($pop30), $pop4
-	i32.const	$push29=, 0
+	i64.store	s1($pop26), $pop4
+	i32.const	$push25=, 0
 	i64.load	$push6=, 0($2)
-	i64.store	s1+8($pop29), $pop6
-	i32.const	$push28=, 0
+	i64.store	s1+8($pop25), $pop6
+	i32.const	$push24=, 0
 	i64.load	$push8=, 0($3)
-	i64.store	s1+16($pop28), $pop8
-	i32.const	$push27=, 0
+	i64.store	s1+16($pop24), $pop8
+	i32.const	$push23=, 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
+	i64.store	s1+24($pop23), $pop10
+	i32.const	$push22=, 0
+	i32.const	$push21=, 0
+	i32.load	$push11=, s1($pop21)
+	i32.store	bar_arg($pop22), $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
+	i32.const	$push20=, -1
+	i32.add 	$0=, $0, $pop20
+	i32.const	$push19=, 1
+	i32.gt_s	$push13=, $0, $pop19
+	br_if   	0, $pop13       # 0: up to label15
 .LBB7_3:                                # %while.end
 	end_loop
-	end_block                       # label12:
+	end_block                       # label14:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end7:
@@ -406,7 +404,7 @@ f7:                                     # @f7
 f8:                                     # @f8
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
@@ -414,45 +412,43 @@ f8:                                     # @f8
 	block   	
 	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	$push17=, 1
-	i32.add 	$3=, $0, $pop17
+	br_if   	0, $pop0        # 0: down to label16
+# %bb.1:                                # %while.body.lr.ph
+	i32.const	$push15=, 1
+	i32.add 	$0=, $0, $pop15
 	i32.const	$push1=, 7
 	i32.add 	$push2=, $1, $pop1
 	i32.const	$push3=, -8
-	i32.and 	$push16=, $pop2, $pop3
-	tee_local	$push15=, $0=, $pop16
+	i32.and 	$1=, $pop2, $pop3
 	i32.const	$push4=, 8
-	i32.add 	$1=, $pop15, $pop4
+	i32.add 	$2=, $1, $pop4
 	i32.const	$push9=, 20
-	i32.add 	$2=, $0, $pop9
+	i32.add 	$3=, $1, $pop9
 .LBB8_2:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
-	loop    	                # label15:
-	i32.const	$push26=, 0
-	i64.load	$push5=, 0($1)
-	i64.store	s2+8($pop26), $pop5
-	i32.const	$push25=, 0
-	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
+	loop    	                # label17:
 	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
+	i64.load	$push5=, 0($2)
+	i64.store	s2+8($pop22), $pop5
+	i32.const	$push21=, 0
+	i64.load	$push6=, 0($1)
+	i64.store	s2($pop21), $pop6
+	i32.const	$push20=, 0
+	i32.load	$push7=, 16($1)
+	i32.store	y($pop20), $pop7
+	i32.const	$push19=, 0
+	i32.const	$push18=, 0
+	i32.load	$push8=, s2+8($pop18)
+	i32.store	bar_arg($pop19), $pop8
+	i32.store	12($4), $3
+	i32.const	$push17=, -1
+	i32.add 	$0=, $0, $pop17
+	i32.const	$push16=, 1
+	i32.gt_s	$push10=, $0, $pop16
+	br_if   	0, $pop10       # 0: up to label17
 .LBB8_3:                                # %while.end
 	end_loop
-	end_block                       # label14:
+	end_block                       # label16:
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end8:
@@ -465,14 +461,13 @@ f8:                                     # @f8
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push200=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop197, $pop199
+	i32.const	$push200=, 0
+	i32.store	__stack_pointer($pop200), $4
 	i32.const	$push204=, 624
 	i32.add 	$push205=, $4, $pop204
 	i32.const	$push376=, 24
@@ -498,8 +493,8 @@ main:                                   # @main
 	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
+	br_if   	0, $pop9        # 0: down to label18
+# %bb.1:                                # %if.end
 	i32.const	$push10=, 608
 	i32.add 	$push11=, $4, $pop10
 	i64.const	$push12=, 4634204016564240384
@@ -514,14 +509,14 @@ main:                                   # @main
 	i64.store	0($pop17), $pop18
 	i32.const	$push210=, 560
 	i32.add 	$push211=, $4, $pop210
-	i32.const	$push381=, 24
-	i32.add 	$push19=, $pop211, $pop381
+	i32.const	$push379=, 24
+	i32.add 	$push19=, $pop211, $pop379
 	i64.const	$push20=, 4620693217682128896
 	i64.store	0($pop19), $pop20
 	i32.const	$push212=, 560
 	i32.add 	$push213=, $4, $pop212
-	i32.const	$push380=, 16
-	i32.add 	$push21=, $pop213, $pop380
+	i32.const	$push378=, 16
+	i32.add 	$push21=, $pop213, $pop378
 	i64.const	$push22=, 4616189618054758400
 	i64.store	0($pop21), $pop22
 	i64.const	$push23=, 4611686018427387904
@@ -532,30 +527,30 @@ main:                                   # @main
 	i32.const	$push214=, 560
 	i32.add 	$push215=, $4, $pop214
 	call    	f2@FUNCTION, $pop25, $pop215
-	i32.const	$push379=, 0
-	f64.load	$push26=, d($pop379)
+	i32.const	$push377=, 0
+	f64.load	$push26=, d($pop377)
 	f64.const	$push27=, 0x1p5
 	f64.ne  	$push28=, $pop26, $pop27
-	br_if   	0, $pop28       # 0: down to label16
-# BB#2:                                 # %if.end3
+	br_if   	0, $pop28       # 0: down to label18
+# %bb.2:                                # %if.end3
 	i64.const	$push30=, 12884901889
 	i64.store	544($4), $pop30
 	i32.const	$push31=, 2
 	i32.const	$push216=, 544
 	i32.add 	$push217=, $4, $pop216
 	call    	f3@FUNCTION, $pop31, $pop217
+	i32.const	$push381=, 0
+	i32.load	$push32=, bar_arg($pop381)
+	i32.const	$push380=, 1
+	i32.ne  	$push33=, $pop32, $pop380
+	br_if   	0, $pop33       # 0: down to label18
+# %bb.3:                                # %if.end3
 	i32.const	$push383=, 0
-	i32.load	$push32=, bar_arg($pop383)
+	i32.load	$push29=, x($pop383)
 	i32.const	$push382=, 1
-	i32.ne  	$push33=, $pop32, $pop382
-	br_if   	0, $pop33       # 0: down to label16
-# BB#3:                                 # %if.end3
-	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
+	i32.ne  	$push34=, $pop29, $pop382
+	br_if   	0, $pop34       # 0: down to label18
+# %bb.4:                                # %if.end7
 	i64.const	$push36=, 4626041242239631360
 	i64.store	536($4), $pop36
 	i64.const	$push37=, 4625478292286210048
@@ -564,30 +559,28 @@ main:                                   # @main
 	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	$push384=, 0
+	i32.load	$push39=, bar_arg($pop384)
 	i32.const	$push40=, 21
 	i32.ne  	$push41=, $pop39, $pop40
-	br_if   	0, $pop41       # 0: down to label16
-# BB#5:                                 # %if.end7
-	i32.const	$push387=, 0
-	f64.load	$push35=, d($pop387)
+	br_if   	0, $pop41       # 0: down to label18
+# %bb.5:                                # %if.end7
+	i32.const	$push385=, 0
+	f64.load	$push35=, d($pop385)
 	f64.const	$push42=, 0x1.1p4
 	f64.ne  	$push43=, $pop35, $pop42
-	br_if   	0, $pop43       # 0: down to label16
-# BB#6:                                 # %if.end12
+	br_if   	0, $pop43       # 0: down to label18
+# %bb.6:                                # %if.end12
 	i32.const	$push47=, 251
 	i32.store	736($4), $pop47
 	i32.const	$push220=, 688
 	i32.add 	$push221=, $4, $pop220
 	i32.const	$push48=, 16
-	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.add 	$0=, $pop221, $pop48
+	i64.load	$1=, 736($4)
+	i64.store	0($0), $1
+	i32.const	$push401=, 254
+	i32.store	0($0), $pop401
 	i32.const	$push222=, 688
 	i32.add 	$push223=, $4, $pop222
 	i32.const	$push49=, 8
@@ -596,10 +589,10 @@ main:                                   # @main
 	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	$push400=, 8
+	i32.add 	$push52=, $pop225, $pop400
+	i64.const	$push399=, 4624633867356078080
+	i64.store	0($pop52), $pop399
 	i32.const	$push226=, 496
 	i32.add 	$push227=, $4, $pop226
 	i32.const	$push53=, 24
@@ -608,56 +601,55 @@ main:                                   # @main
 	i64.store	0($pop54), $pop55
 	i32.const	$push228=, 464
 	i32.add 	$push229=, $4, $pop228
-	i32.const	$push402=, 24
-	i32.add 	$push56=, $pop229, $pop402
+	i32.const	$push398=, 24
+	i32.add 	$push56=, $pop229, $pop398
 	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	$push397=, 8
+	i32.add 	$push58=, $pop231, $pop397
+	i64.const	$push396=, 4624633867356078080
+	i64.store	0($pop58), $pop396
 	i32.const	$push232=, 496
 	i32.add 	$push233=, $4, $pop232
-	i32.const	$push399=, 16
-	i32.add 	$push59=, $pop233, $pop399
+	i32.const	$push395=, 16
+	i32.add 	$push59=, $pop233, $pop395
 	i64.store	0($pop59), $1
 	i32.const	$push234=, 464
 	i32.add 	$push235=, $4, $pop234
-	i32.const	$push398=, 16
-	i32.add 	$push60=, $pop235, $pop398
+	i32.const	$push394=, 16
+	i32.add 	$push60=, $pop235, $pop394
 	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
+	i64.const	$push393=, 4624633867356078080
+	i64.store	728($4), $pop393
+	i64.const	$push392=, 4640924231633207296
+	i64.store	744($4), $pop392
+	i64.const	$push391=, 4640466834796052480
+	i64.store	712($4), $pop391
 	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.load	$1=, 720($4)
+	i64.store	496($4), $1
 	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
+	i32.const	$push390=, 24
+	i32.add 	$push63=, $pop237, $pop390
 	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
+	i32.const	$push389=, 16
+	i32.add 	$push65=, $pop239, $pop389
 	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
+	i32.const	$push388=, 8
+	i32.add 	$push67=, $pop241, $pop388
 	i64.load	$push68=, 728($4)
 	i64.store	0($pop67), $pop68
 	i64.load	$push69=, 720($4)
@@ -675,111 +667,107 @@ main:                                   # @main
 	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	$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	$push412=, 0
-	f64.load	$push45=, s1+8($pop412)
+	i32.const	$push387=, 0
+	i32.load	$push71=, s1($pop387)
+	i32.const	$push386=, 131
+	i32.ne  	$push72=, $pop71, $pop386
+	br_if   	0, $pop72       # 0: down to label18
+# %bb.7:                                # %if.end12
+	i32.const	$push403=, 0
+	i32.load	$push44=, s1+16($pop403)
+	i32.const	$push402=, 254
+	i32.ne  	$push73=, $pop44, $pop402
+	br_if   	0, $pop73       # 0: down to label18
+# %bb.8:                                # %if.end12
+	i32.const	$push404=, 0
+	f64.load	$push45=, s1+8($pop404)
 	f64.const	$push74=, 0x1.ep3
 	f64.ne  	$push75=, $pop45, $pop74
-	br_if   	0, $pop75       # 0: down to label16
-# BB#9:                                 # %if.end12
-	i32.const	$push413=, 0
-	f64.load	$push46=, s1+24($pop413)
+	br_if   	0, $pop75       # 0: down to label18
+# %bb.9:                                # %if.end12
+	i32.const	$push405=, 0
+	f64.load	$push46=, s1+24($pop405)
 	f64.const	$push76=, 0x1.64p7
 	f64.ne  	$push77=, $pop46, $pop76
-	br_if   	0, $pop77       # 0: down to label16
-# BB#10:                                # %if.end23
-	i32.const	$push250=, 384
-	i32.add 	$push251=, $4, $pop250
-	i32.const	$push81=, 24
-	i32.add 	$push82=, $pop251, $pop81
+	br_if   	0, $pop77       # 0: down to label18
+# %bb.10:                               # %if.end23
 	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	$push81=, 24
+	i32.add 	$push83=, $pop253, $pop81
+	i64.load	$1=, 0($pop83)
+	i32.const	$push250=, 384
+	i32.add 	$push251=, $4, $pop250
+	i32.const	$push418=, 24
+	i32.add 	$push82=, $pop251, $pop418
+	i64.store	0($pop82), $1
 	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	$push84=, 16
+	i32.add 	$push86=, $pop257, $pop84
+	i64.load	$2=, 0($pop86)
+	i32.const	$push254=, 384
+	i32.add 	$push255=, $4, $pop254
+	i32.const	$push417=, 16
+	i32.add 	$push85=, $pop255, $pop417
+	i64.store	0($pop85), $2
 	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	$push87=, 8
+	i32.add 	$push89=, $pop261, $pop87
+	i64.load	$3=, 0($pop89)
+	i32.const	$push258=, 384
+	i32.add 	$push259=, $4, $pop258
+	i32.const	$push416=, 8
+	i32.add 	$push88=, $pop259, $pop416
+	i64.store	0($pop88), $3
 	i32.const	$push262=, 352
 	i32.add 	$push263=, $4, $pop262
-	i32.const	$push425=, 8
-	i32.add 	$push90=, $pop263, $pop425
+	i32.const	$push415=, 8
+	i32.add 	$push90=, $pop263, $pop415
 	i32.const	$push264=, 688
 	i32.add 	$push265=, $4, $pop264
-	i32.const	$push424=, 8
-	i32.add 	$push91=, $pop265, $pop424
+	i32.const	$push414=, 8
+	i32.add 	$push91=, $pop265, $pop414
 	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	$push413=, 16
+	i32.add 	$push93=, $pop267, $pop413
 	i32.const	$push268=, 688
 	i32.add 	$push269=, $4, $pop268
-	i32.const	$push422=, 16
-	i32.add 	$push94=, $pop269, $pop422
+	i32.const	$push412=, 16
+	i32.add 	$push94=, $pop269, $pop412
 	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	$push411=, 24
+	i32.add 	$push96=, $pop271, $pop411
 	i32.const	$push272=, 688
 	i32.add 	$push273=, $4, $pop272
-	i32.const	$push420=, 24
-	i32.add 	$push97=, $pop273, $pop420
+	i32.const	$push410=, 24
+	i32.add 	$push97=, $pop273, $pop410
 	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
+	i32.const	$push409=, 8
+	i32.add 	$push99=, $pop275, $pop409
 	i64.store	0($pop99), $3
 	i32.const	$push276=, 320
 	i32.add 	$push277=, $4, $pop276
-	i32.const	$push418=, 16
-	i32.add 	$push100=, $pop277, $pop418
+	i32.const	$push408=, 16
+	i32.add 	$push100=, $pop277, $pop408
 	i64.store	0($pop100), $2
 	i32.const	$push278=, 320
 	i32.add 	$push279=, $4, $pop278
-	i32.const	$push417=, 24
-	i32.add 	$push101=, $pop279, $pop417
+	i32.const	$push407=, 24
+	i32.add 	$push101=, $pop279, $pop407
 	i64.store	0($pop101), $1
-	i64.load	$push416=, 720($4)
-	tee_local	$push415=, $1=, $pop416
-	i64.store	384($4), $pop415
+	i64.load	$1=, 720($4)
+	i64.store	384($4), $1
 	i64.load	$push102=, 688($4)
 	i64.store	352($4), $pop102
 	i64.store	320($4), $1
@@ -796,62 +784,61 @@ main:                                   # @main
 	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	$push406=, 0
+	i32.load	$push104=, s1($pop406)
 	i32.const	$push105=, 131
 	i32.ne  	$push106=, $pop104, $pop105
-	br_if   	0, $pop106      # 0: down to label16
-# BB#11:                                # %if.end23
-	i32.const	$push435=, 0
-	i32.load	$push78=, s1+16($pop435)
+	br_if   	0, $pop106      # 0: down to label18
+# %bb.11:                               # %if.end23
+	i32.const	$push419=, 0
+	i32.load	$push78=, s1+16($pop419)
 	i32.const	$push107=, 251
 	i32.ne  	$push108=, $pop78, $pop107
-	br_if   	0, $pop108      # 0: down to label16
-# BB#12:                                # %if.end23
-	i32.const	$push436=, 0
-	f64.load	$push79=, s1+8($pop436)
+	br_if   	0, $pop108      # 0: down to label18
+# %bb.12:                               # %if.end23
+	i32.const	$push420=, 0
+	f64.load	$push79=, s1+8($pop420)
 	f64.const	$push109=, 0x1.ep3
 	f64.ne  	$push110=, $pop79, $pop109
-	br_if   	0, $pop110      # 0: down to label16
-# BB#13:                                # %if.end23
-	i32.const	$push437=, 0
-	f64.load	$push80=, s1+24($pop437)
+	br_if   	0, $pop110      # 0: down to label18
+# %bb.13:                               # %if.end23
+	i32.const	$push421=, 0
+	f64.load	$push80=, s1+24($pop421)
 	f64.const	$push111=, 0x1.7ep7
 	f64.ne  	$push112=, $pop80, $pop111
-	br_if   	0, $pop112      # 0: down to label16
-# BB#14:                                # %if.end32
+	br_if   	0, $pop112      # 0: down to label18
+# %bb.14:                               # %if.end32
 	i32.const	$push114=, 138
 	i32.store	680($4), $pop114
+	i64.load	$1=, 680($4)
 	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
+	i64.store	0($pop116), $1
 	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
+	i32.const	$push428=, 8
+	i32.add 	$push118=, $pop291, $pop428
 	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
+	i32.const	$push427=, 8
+	i32.add 	$push120=, $pop293, $pop427
 	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
+	i64.const	$push426=, 4625196817309499392
+	i64.store	288($4), $pop426
+	i64.const	$push425=, 4640396466051874816
+	i64.store	272($4), $pop425
+	i64.const	$push424=, 4625196817309499392
+	i64.store	256($4), $pop424
 	i32.const	$push294=, 256
 	i32.add 	$push295=, $4, $pop294
 	i32.store	248($4), $pop295
@@ -865,47 +852,45 @@ main:                                   # @main
 	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	$push447=, 0
-	f64.load	$push113=, s2($pop447)
+	i32.const	$push423=, 0
+	i32.load	$push124=, s2+8($pop423)
+	i32.const	$push422=, 257
+	i32.ne  	$push125=, $pop124, $pop422
+	br_if   	0, $pop125      # 0: down to label18
+# %bb.15:                               # %if.end32
+	i32.const	$push429=, 0
+	f64.load	$push113=, s2($pop429)
 	f64.const	$push126=, 0x1.6p7
 	f64.ne  	$push127=, $pop113, $pop126
-	br_if   	0, $pop127      # 0: down to label16
-# BB#16:                                # %if.end41
-	i32.const	$push302=, 224
-	i32.add 	$push303=, $4, $pop302
-	i32.const	$push129=, 8
-	i32.add 	$push130=, $pop303, $pop129
+	br_if   	0, $pop127      # 0: down to label18
+# %bb.16:                               # %if.end41
 	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	$push129=, 8
+	i32.add 	$push131=, $pop305, $pop129
+	i64.load	$1=, 0($pop131)
+	i32.const	$push302=, 224
+	i32.add 	$push303=, $4, $pop302
+	i32.const	$push434=, 8
+	i32.add 	$push130=, $pop303, $pop434
+	i64.store	0($pop130), $1
 	i32.const	$push306=, 208
 	i32.add 	$push307=, $4, $pop306
-	i32.const	$push453=, 8
-	i32.add 	$push132=, $pop307, $pop453
+	i32.const	$push433=, 8
+	i32.add 	$push132=, $pop307, $pop433
 	i32.const	$push308=, 656
 	i32.add 	$push309=, $4, $pop308
-	i32.const	$push452=, 8
-	i32.add 	$push133=, $pop309, $pop452
+	i32.const	$push432=, 8
+	i32.add 	$push133=, $pop309, $pop432
 	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
+	i32.const	$push431=, 8
+	i32.add 	$push135=, $pop311, $pop431
 	i64.store	0($pop135), $1
-	i64.load	$push450=, 672($4)
-	tee_local	$push449=, $1=, $pop450
-	i64.store	224($4), $pop449
+	i64.load	$1=, 672($4)
+	i64.store	224($4), $1
 	i64.load	$push136=, 656($4)
 	i64.store	208($4), $pop136
 	i64.store	192($4), $1
@@ -922,26 +907,26 @@ main:                                   # @main
 	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	$push430=, 0
+	i32.load	$push138=, s2+8($pop430)
 	i32.const	$push139=, 138
 	i32.ne  	$push140=, $pop138, $pop139
-	br_if   	0, $pop140      # 0: down to label16
-# BB#17:                                # %if.end41
-	i32.const	$push457=, 0
-	f64.load	$push128=, s2($pop457)
+	br_if   	0, $pop140      # 0: down to label18
+# %bb.17:                               # %if.end41
+	i32.const	$push435=, 0
+	f64.load	$push128=, s2($pop435)
 	f64.const	$push141=, 0x1p4
 	f64.ne  	$push142=, $pop128, $pop141
-	br_if   	0, $pop142      # 0: down to label16
-# BB#18:                                # %if.end46
+	br_if   	0, $pop142      # 0: down to label18
+# %bb.18:                               # %if.end46
 	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
+	i32.const	$push448=, 24
+	i32.add 	$push148=, $pop323, $pop448
 	i64.load	$push149=, 0($pop148)
 	i64.store	0($pop147), $pop149
 	i32.const	$push324=, 144
@@ -950,8 +935,8 @@ main:                                   # @main
 	i32.add 	$push151=, $pop325, $pop150
 	i32.const	$push326=, 688
 	i32.add 	$push327=, $4, $pop326
-	i32.const	$push477=, 16
-	i32.add 	$push152=, $pop327, $pop477
+	i32.const	$push447=, 16
+	i32.add 	$push152=, $pop327, $pop447
 	i64.load	$push153=, 0($pop152)
 	i64.store	0($pop151), $pop153
 	i32.const	$push328=, 144
@@ -960,63 +945,59 @@ main:                                   # @main
 	i32.add 	$push155=, $pop329, $pop154
 	i32.const	$push330=, 688
 	i32.add 	$push331=, $4, $pop330
-	i32.const	$push476=, 8
-	i32.add 	$push156=, $pop331, $pop476
+	i32.const	$push446=, 8
+	i32.add 	$push156=, $pop331, $pop446
 	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	$push445=, 8
+	i32.add 	$push159=, $pop335, $pop445
+	i64.load	$1=, 0($pop159)
+	i32.const	$push332=, 112
+	i32.add 	$push333=, $4, $pop332
+	i32.const	$push444=, 8
+	i32.add 	$push158=, $pop333, $pop444
+	i64.store	0($pop158), $1
 	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	$push443=, 16
+	i32.add 	$push161=, $pop339, $pop443
+	i64.load	$2=, 0($pop161)
+	i32.const	$push336=, 112
+	i32.add 	$push337=, $4, $pop336
+	i32.const	$push442=, 16
+	i32.add 	$push160=, $pop337, $pop442
+	i64.store	0($pop160), $2
 	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	$push441=, 24
+	i32.add 	$push163=, $pop343, $pop441
+	i64.load	$3=, 0($pop163)
+	i32.const	$push340=, 112
+	i32.add 	$push341=, $4, $pop340
+	i32.const	$push440=, 24
+	i32.add 	$push162=, $pop341, $pop440
+	i64.store	0($pop162), $3
 	i32.const	$push344=, 80
 	i32.add 	$push345=, $4, $pop344
-	i32.const	$push463=, 8
-	i32.add 	$push164=, $pop345, $pop463
+	i32.const	$push439=, 8
+	i32.add 	$push164=, $pop345, $pop439
 	i64.store	0($pop164), $1
 	i32.const	$push346=, 80
 	i32.add 	$push347=, $4, $pop346
-	i32.const	$push462=, 16
-	i32.add 	$push165=, $pop347, $pop462
+	i32.const	$push438=, 16
+	i32.add 	$push165=, $pop347, $pop438
 	i64.store	0($pop165), $2
 	i32.const	$push348=, 80
 	i32.add 	$push349=, $4, $pop348
-	i32.const	$push461=, 24
-	i32.add 	$push166=, $pop349, $pop461
+	i32.const	$push437=, 24
+	i32.add 	$push166=, $pop349, $pop437
 	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.load	$1=, 720($4)
+	i64.store	112($4), $1
 	i64.store	80($4), $1
 	i32.const	$push350=, 80
 	i32.add 	$push351=, $4, $pop350
@@ -1031,67 +1012,65 @@ main:                                   # @main
 	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	$push436=, 0
+	i32.load	$push169=, s1($pop436)
 	i32.const	$push170=, 131
 	i32.ne  	$push171=, $pop169, $pop170
-	br_if   	0, $pop171      # 0: down to label16
-# BB#19:                                # %if.end46
-	i32.const	$push479=, 0
-	i32.load	$push143=, s1+16($pop479)
+	br_if   	0, $pop171      # 0: down to label18
+# %bb.19:                               # %if.end46
+	i32.const	$push449=, 0
+	i32.load	$push143=, s1+16($pop449)
 	i32.const	$push172=, 254
 	i32.ne  	$push173=, $pop143, $pop172
-	br_if   	0, $pop173      # 0: down to label16
-# BB#20:                                # %if.end46
-	i32.const	$push480=, 0
-	f64.load	$push144=, s1+8($pop480)
+	br_if   	0, $pop173      # 0: down to label18
+# %bb.20:                               # %if.end46
+	i32.const	$push450=, 0
+	f64.load	$push144=, s1+8($pop450)
 	f64.const	$push174=, 0x1.ep3
 	f64.ne  	$push175=, $pop144, $pop174
-	br_if   	0, $pop175      # 0: down to label16
-# BB#21:                                # %if.end46
-	i32.const	$push481=, 0
-	f64.load	$push145=, s1+24($pop481)
+	br_if   	0, $pop175      # 0: down to label18
+# %bb.21:                               # %if.end46
+	i32.const	$push451=, 0
+	f64.load	$push145=, s1+24($pop451)
 	f64.const	$push176=, 0x1.64p7
 	f64.ne  	$push177=, $pop145, $pop176
-	br_if   	0, $pop177      # 0: down to label16
-# BB#22:                                # %if.end55
-	i32.const	$push482=, 0
-	i32.load	$push178=, bar_arg($pop482)
+	br_if   	0, $pop177      # 0: down to label18
+# %bb.22:                               # %if.end55
+	i32.const	$push452=, 0
+	i32.load	$push178=, bar_arg($pop452)
 	i32.const	$push179=, 131
 	i32.ne  	$push180=, $pop178, $pop179
-	br_if   	0, $pop180      # 0: down to label16
-# BB#23:                                # %if.end58
+	br_if   	0, $pop180      # 0: down to label18
+# %bb.23:                               # %if.end58
 	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
+	i32.const	$push457=, 8
+	i32.add 	$push184=, $pop361, $pop457
 	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	$push456=, 8
+	i32.add 	$push187=, $pop365, $pop456
+	i64.load	$1=, 0($pop187)
+	i32.const	$push362=, 32
+	i32.add 	$push363=, $4, $pop362
+	i32.const	$push455=, 8
+	i32.add 	$push186=, $pop363, $pop455
+	i64.store	0($pop186), $1
 	i32.const	$push366=, 16
 	i32.add 	$push367=, $4, $pop366
-	i32.const	$push486=, 8
-	i32.add 	$push188=, $pop367, $pop486
+	i32.const	$push454=, 8
+	i32.add 	$push188=, $pop367, $pop454
 	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.load	$1=, 672($4)
+	i64.store	32($4), $1
 	i64.store	16($4), $1
 	i32.const	$push368=, 16
 	i32.add 	$push369=, $4, $pop368
@@ -1104,18 +1083,18 @@ main:                                   # @main
 	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	$push453=, 0
+	i32.load	$push191=, s2+8($pop453)
 	i32.const	$push192=, 257
 	i32.ne  	$push193=, $pop191, $pop192
-	br_if   	0, $pop193      # 0: down to label16
-# BB#24:                                # %if.end58
-	i32.const	$push492=, 0
-	f64.load	$push181=, s2($pop492)
+	br_if   	0, $pop193      # 0: down to label18
+# %bb.24:                               # %if.end58
+	i32.const	$push458=, 0
+	f64.load	$push181=, s2($pop458)
 	f64.const	$push194=, 0x1.6p7
 	f64.ne  	$push195=, $pop181, $pop194
-	br_if   	0, $pop195      # 0: down to label16
-# BB#25:                                # %if.end63
+	br_if   	0, $pop195      # 0: down to label18
+# %bb.25:                               # %if.end63
 	i32.const	$push203=, 0
 	i32.const	$push201=, 752
 	i32.add 	$push202=, $4, $pop201
@@ -1123,7 +1102,7 @@ main:                                   # @main
 	i32.const	$push196=, 0
 	return  	$pop196
 .LBB9_26:                               # %if.then
-	end_block                       # label16:
+	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -1203,5 +1182,5 @@ gap:
 	.size	gap, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/stdarg-4.c.s b/test/torture-s/stdarg-4.c.s
index f3e80636f..a473fd6f1 100644
--- a/test/torture-s/stdarg-4.c.s
+++ b/test/torture-s/stdarg-4.c.s
@@ -6,26 +6,52 @@
 	.type	f1i,@function
 f1i:                                    # @f1i
 	.param  	i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $0, $pop0
-	i32.const	$push2=, -8
-	i32.and 	$push17=, $pop1, $pop2
-	tee_local	$push16=, $0=, $pop17
-	i32.const	$push8=, 19
-	i32.add 	$push9=, $pop16, $pop8
 	i32.const	$push15=, -8
-	i32.and 	$push10=, $pop9, $pop15
-	f64.load	$push11=, 0($pop10)
-	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
+	i32.and 	$0=, $pop1, $pop15
+	i32.load	$1=, 8($0)
+	f64.load	$2=, 0($0)
+	block   	
+	block   	
+	f64.abs 	$push9=, $2
+	f64.const	$push10=, 0x1p31
+	f64.lt  	$push11=, $pop9, $pop10
+	br_if   	0, $pop11       # 0: down to label1
+# %bb.1:                                # %entry
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label0
+.LBB0_2:                                # %entry
+	end_block                       # label1:
+	i32.trunc_s/f64	$3=, $2
+.LBB0_3:                                # %entry
+	end_block                       # label0:
+	i32.const	$push4=, 19
+	i32.add 	$push5=, $0, $pop4
+	i32.const	$push16=, -8
+	i32.and 	$push6=, $pop5, $pop16
+	f64.load	$push7=, 0($pop6)
+	i32.add 	$push2=, $1, $3
+	f64.convert_s/i32	$push3=, $pop2
+	f64.add 	$2=, $pop7, $pop3
+	block   	
+	block   	
+	f64.abs 	$push12=, $2
+	f64.const	$push13=, 0x1p31
+	f64.lt  	$push14=, $pop12, $pop13
+	br_if   	0, $pop14       # 0: down to label3
+# %bb.4:                                # %entry
+	i32.const	$0=, -2147483648
+	br      	1               # 1: down to label2
+.LBB0_5:                                # %entry
+	end_block                       # label3:
+	i32.trunc_s/f64	$0=, $2
+.LBB0_6:                                # %entry
+	end_block                       # label2:
+	i32.const	$push8=, 0
+	i32.store	x($pop8), $0
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -37,31 +63,57 @@ f1i:                                    # @f1i
 	.type	f1,@function
 f1:                                     # @f1
 	.param  	i32, i32
-# BB#0:                                 # %entry
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	i32.const	$push16=, 0
 	i32.load	$push15=, __stack_pointer($pop16)
 	i32.const	$push17=, 16
 	i32.sub 	$push18=, $pop15, $pop17
 	i32.store	12($pop18), $1
-	i32.const	$push14=, 0
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
-	i32.const	$push2=, -8
-	i32.and 	$push21=, $pop1, $pop2
-	tee_local	$push20=, $1=, $pop21
-	i32.const	$push8=, 19
-	i32.add 	$push9=, $pop20, $pop8
 	i32.const	$push19=, -8
-	i32.and 	$push10=, $pop9, $pop19
-	f64.load	$push11=, 0($pop10)
-	i32.load	$push3=, 8($1)
-	f64.load	$push4=, 0($1)
-	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
+	i32.and 	$1=, $pop1, $pop19
+	i32.load	$2=, 8($1)
+	f64.load	$3=, 0($1)
+	block   	
+	block   	
+	f64.abs 	$push9=, $3
+	f64.const	$push10=, 0x1p31
+	f64.lt  	$push11=, $pop9, $pop10
+	br_if   	0, $pop11       # 0: down to label5
+# %bb.1:                                # %entry
+	i32.const	$4=, -2147483648
+	br      	1               # 1: down to label4
+.LBB1_2:                                # %entry
+	end_block                       # label5:
+	i32.trunc_s/f64	$4=, $3
+.LBB1_3:                                # %entry
+	end_block                       # label4:
+	i32.const	$push4=, 19
+	i32.add 	$push5=, $1, $pop4
+	i32.const	$push20=, -8
+	i32.and 	$push6=, $pop5, $pop20
+	f64.load	$push7=, 0($pop6)
+	i32.add 	$push2=, $2, $4
+	f64.convert_s/i32	$push3=, $pop2
+	f64.add 	$3=, $pop7, $pop3
+	block   	
+	block   	
+	f64.abs 	$push12=, $3
+	f64.const	$push13=, 0x1p31
+	f64.lt  	$push14=, $pop12, $pop13
+	br_if   	0, $pop14       # 0: down to label7
+# %bb.4:                                # %entry
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label6
+.LBB1_5:                                # %entry
+	end_block                       # label7:
+	i32.trunc_s/f64	$1=, $3
+.LBB1_6:                                # %entry
+	end_block                       # label6:
+	i32.const	$push8=, 0
+	i32.store	x($pop8), $1
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end1:
@@ -73,36 +125,73 @@ f1:                                     # @f1
 	.type	f2i,@function
 f2i:                                    # @f2i
 	.param  	i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
 	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.const	$push24=, -8
+	i32.and 	$1=, $pop5, $pop24
+	f64.load	$push6=, 0($1)
 	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=, $1, $pop16
-	i32.const	$push22=, -8
-	i32.and 	$push18=, $pop17, $pop22
-	f64.load	$push19=, 0($pop18)
-	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
-	f64.add 	$push20=, $pop19, $pop15
-	i32.trunc_s/f64	$push21=, $pop20
-	i32.store	x($pop23), $pop21
+	f64.add 	$2=, $pop6, $pop3
+	block   	
+	block   	
+	f64.abs 	$push13=, $2
+	f64.const	$push14=, 0x1p31
+	f64.lt  	$push15=, $pop13, $pop14
+	br_if   	0, $pop15       # 0: down to label9
+# %bb.1:                                # %entry
+	i32.const	$0=, -2147483648
+	br      	1               # 1: down to label8
+.LBB2_2:                                # %entry
+	end_block                       # label9:
+	i32.trunc_s/f64	$0=, $2
+.LBB2_3:                                # %entry
+	end_block                       # label8:
+	i32.const	$push25=, 0
+	i32.store	y($pop25), $0
+	i32.load	$0=, 16($1)
+	f64.load	$2=, 8($1)
+	block   	
+	block   	
+	f64.abs 	$push16=, $2
+	f64.const	$push17=, 0x1p31
+	f64.lt  	$push18=, $pop16, $pop17
+	br_if   	0, $pop18       # 0: down to label11
+# %bb.4:                                # %entry
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label10
+.LBB2_5:                                # %entry
+	end_block                       # label11:
+	i32.trunc_s/f64	$3=, $2
+.LBB2_6:                                # %entry
+	end_block                       # label10:
+	i32.const	$push9=, 27
+	i32.add 	$push10=, $1, $pop9
+	i32.const	$push26=, -8
+	i32.and 	$push11=, $pop10, $pop26
+	f64.load	$push12=, 0($pop11)
+	i32.add 	$push7=, $0, $3
+	f64.convert_s/i32	$push8=, $pop7
+	f64.add 	$2=, $pop12, $pop8
+	block   	
+	f64.abs 	$push19=, $2
+	f64.const	$push20=, 0x1p31
+	f64.lt  	$push21=, $pop19, $pop20
+	br_if   	0, $pop21       # 0: down to label12
+# %bb.7:                                # %entry
+	i32.const	$push27=, 0
+	i32.const	$push22=, -2147483648
+	i32.store	x($pop27), $pop22
+	return
+.LBB2_8:                                # %entry
+	end_block                       # label12:
+	i32.const	$push28=, 0
+	i32.trunc_s/f64	$push23=, $2
+	i32.store	x($pop28), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -114,41 +203,78 @@ f2i:                                    # @f2i
 	.type	f2,@function
 f2:                                     # @f2
 	.param  	i32, i32
-	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
-	i32.load	$push22=, __stack_pointer($pop23)
-	i32.const	$push24=, 16
-	i32.sub 	$push25=, $pop22, $pop24
-	i32.store	12($pop25), $1
-	i32.const	$push10=, 0
+	.local  	i32, f64, i32
+# %bb.0:                                # %entry
+	i32.const	$push25=, 0
+	i32.load	$push24=, __stack_pointer($pop25)
+	i32.const	$push26=, 16
+	i32.sub 	$push27=, $pop24, $pop26
+	i32.store	12($pop27), $1
 	i32.const	$push4=, 15
 	i32.add 	$push5=, $1, $pop4
-	i32.const	$push6=, -8
-	i32.and 	$push29=, $pop5, $pop6
-	tee_local	$push28=, $2=, $pop29
-	f64.load	$push7=, 0($pop28)
+	i32.const	$push28=, -8
+	i32.and 	$2=, $pop5, $pop28
+	f64.load	$push6=, 0($2)
 	i32.load	$push1=, 4($1)
 	i32.load	$push0=, 0($1)
 	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	$push27=, 0
-	i32.const	$push16=, 27
-	i32.add 	$push17=, $2, $pop16
-	i32.const	$push26=, -8
-	i32.and 	$push18=, $pop17, $pop26
-	f64.load	$push19=, 0($pop18)
-	i32.load	$push11=, 16($2)
-	f64.load	$push12=, 8($2)
-	i32.trunc_s/f64	$push13=, $pop12
-	i32.add 	$push14=, $pop11, $pop13
-	f64.convert_s/i32	$push15=, $pop14
-	f64.add 	$push20=, $pop19, $pop15
-	i32.trunc_s/f64	$push21=, $pop20
-	i32.store	x($pop27), $pop21
+	f64.add 	$3=, $pop6, $pop3
+	block   	
+	block   	
+	f64.abs 	$push13=, $3
+	f64.const	$push14=, 0x1p31
+	f64.lt  	$push15=, $pop13, $pop14
+	br_if   	0, $pop15       # 0: down to label14
+# %bb.1:                                # %entry
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label13
+.LBB3_2:                                # %entry
+	end_block                       # label14:
+	i32.trunc_s/f64	$1=, $3
+.LBB3_3:                                # %entry
+	end_block                       # label13:
+	i32.const	$push29=, 0
+	i32.store	y($pop29), $1
+	i32.load	$1=, 16($2)
+	f64.load	$3=, 8($2)
+	block   	
+	block   	
+	f64.abs 	$push16=, $3
+	f64.const	$push17=, 0x1p31
+	f64.lt  	$push18=, $pop16, $pop17
+	br_if   	0, $pop18       # 0: down to label16
+# %bb.4:                                # %entry
+	i32.const	$4=, -2147483648
+	br      	1               # 1: down to label15
+.LBB3_5:                                # %entry
+	end_block                       # label16:
+	i32.trunc_s/f64	$4=, $3
+.LBB3_6:                                # %entry
+	end_block                       # label15:
+	i32.const	$push9=, 27
+	i32.add 	$push10=, $2, $pop9
+	i32.const	$push30=, -8
+	i32.and 	$push11=, $pop10, $pop30
+	f64.load	$push12=, 0($pop11)
+	i32.add 	$push7=, $1, $4
+	f64.convert_s/i32	$push8=, $pop7
+	f64.add 	$3=, $pop12, $pop8
+	block   	
+	f64.abs 	$push19=, $3
+	f64.const	$push20=, 0x1p31
+	f64.lt  	$push21=, $pop19, $pop20
+	br_if   	0, $pop21       # 0: down to label17
+# %bb.7:                                # %entry
+	i32.const	$push31=, 0
+	i32.const	$push22=, -2147483648
+	i32.store	x($pop31), $pop22
+	return
+.LBB3_8:                                # %entry
+	end_block                       # label17:
+	i32.const	$push32=, 0
+	i32.trunc_s/f64	$push23=, $3
+	i32.store	x($pop32), $pop23
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -161,7 +287,7 @@ f2:                                     # @f2
 f3h:                                    # @f3h
 	.param  	i32, i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.add 	$push0=, $1, $0
 	i32.add 	$push1=, $pop0, $2
 	i32.add 	$push2=, $pop1, $3
@@ -179,48 +305,44 @@ f3:                                     # @f3
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push35=, 0
+# %bb.0:                                # %entry
 	i32.const	$push33=, 0
 	i32.load	$push32=, __stack_pointer($pop33)
 	i32.const	$push34=, 16
-	i32.sub 	$push40=, $pop32, $pop34
-	tee_local	$push39=, $2=, $pop40
-	i32.store	__stack_pointer($pop35), $pop39
+	i32.sub 	$2=, $pop32, $pop34
+	i32.const	$push35=, 0
+	i32.store	__stack_pointer($pop35), $2
 	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 4
 	i32.gt_u	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
-	i32.const	$1=, 0
+	br_if   	0, $pop1        # 0: down to label18
+# %bb.1:                                # %entry
 	block   	
 	block   	
 	block   	
 	block   	
 	block   	
-	br_table 	$0, 4, 0, 2, 3, 1, 4 # 4: down to label1
-                                        # 0: down to label5
-                                        # 2: down to label3
-                                        # 3: down to label2
-                                        # 1: down to label4
+	br_table 	$0, 4, 0, 2, 3, 1, 4 # 4: down to label19
+                                        # 0: down to label23
+                                        # 2: down to label21
+                                        # 3: down to label20
+                                        # 1: down to label22
 .LBB5_2:                                # %sw.bb2
-	end_block                       # label5:
-	i32.load	$push42=, 12($2)
-	tee_local	$push41=, $0=, $pop42
+	end_block                       # label23:
+	i32.load	$0=, 12($2)
 	i32.const	$push28=, 4
-	i32.add 	$push29=, $pop41, $pop28
+	i32.add 	$push29=, $0, $pop28
 	i32.store	12($2), $pop29
 	i32.load	$push30=, 0($0)
 	i32.const	$push31=, 1
-	i32.add 	$1=, $pop30, $pop31
-	br      	3               # 3: down to label1
+	i32.add 	$0=, $pop30, $pop31
+	br      	3               # 3: down to label19
 .LBB5_3:                                # %sw.bb18
-	end_block                       # label4:
-	i32.load	$push45=, 12($2)
-	tee_local	$push44=, $0=, $pop45
+	end_block                       # label22:
+	i32.load	$0=, 12($2)
 	i32.const	$push2=, 4
-	i32.add 	$push3=, $pop44, $pop2
+	i32.add 	$push3=, $0, $pop2
 	i32.store	12($2), $pop3
 	i32.load	$1=, 0($0)
 	i32.const	$push4=, 16
@@ -232,15 +354,14 @@ f3:                                     # @f3
 	i32.add 	$push9=, $pop7, $pop8
 	i32.load	$push10=, 12($0)
 	i32.add 	$push11=, $pop9, $pop10
-	i32.const	$push43=, 4
-	i32.add 	$1=, $pop11, $pop43
-	br      	2               # 2: down to label1
+	i32.const	$push39=, 4
+	i32.add 	$0=, $pop11, $pop39
+	br      	2               # 2: down to label19
 .LBB5_4:                                # %sw.bb4
-	end_block                       # label3:
-	i32.load	$push47=, 12($2)
-	tee_local	$push46=, $0=, $pop47
+	end_block                       # label21:
+	i32.load	$0=, 12($2)
 	i32.const	$push21=, 4
-	i32.add 	$push22=, $pop46, $pop21
+	i32.add 	$push22=, $0, $pop21
 	i32.store	12($2), $pop22
 	i32.load	$1=, 0($0)
 	i32.const	$push23=, 8
@@ -249,14 +370,13 @@ f3:                                     # @f3
 	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
+	i32.add 	$0=, $pop26, $pop27
+	br      	1               # 1: down to label19
 .LBB5_5:                                # %sw.bb10
-	end_block                       # label2:
-	i32.load	$push49=, 12($2)
-	tee_local	$push48=, $0=, $pop49
+	end_block                       # label20:
+	i32.load	$0=, 12($2)
 	i32.const	$push12=, 4
-	i32.add 	$push13=, $pop48, $pop12
+	i32.add 	$push13=, $0, $pop12
 	i32.store	12($2), $pop13
 	i32.load	$1=, 0($0)
 	i32.const	$push14=, 12
@@ -267,16 +387,16 @@ f3:                                     # @f3
 	i32.load	$push18=, 8($0)
 	i32.add 	$push19=, $pop17, $pop18
 	i32.const	$push20=, 3
-	i32.add 	$1=, $pop19, $pop20
+	i32.add 	$0=, $pop19, $pop20
 .LBB5_6:                                # %sw.epilog
-	end_block                       # label1:
+	end_block                       # label19:
 	i32.const	$push38=, 0
 	i32.const	$push36=, 16
 	i32.add 	$push37=, $2, $pop36
 	i32.store	__stack_pointer($pop38), $pop37
-	return  	$1
+	return  	$0
 .LBB5_7:                                # %sw.default
-	end_block                       # label0:
+	end_block                       # label18:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -289,90 +409,135 @@ f3:                                     # @f3
 	.type	f4,@function
 f4:                                     # @f4
 	.param  	i32, i32
-	.local  	i32, f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push37=, 0
-	i32.const	$push35=, 0
-	i32.load	$push34=, __stack_pointer($pop35)
-	i32.const	$push36=, 16
-	i32.sub 	$push42=, $pop34, $pop36
-	tee_local	$push41=, $4=, $pop42
-	i32.store	__stack_pointer($pop37), $pop41
+	.local  	f64, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push38=, 0
+	i32.load	$push37=, __stack_pointer($pop38)
+	i32.const	$push39=, 16
+	i32.sub 	$4=, $pop37, $pop39
+	i32.const	$push40=, 0
+	i32.store	__stack_pointer($pop40), $4
 	i32.store	12($4), $1
 	block   	
 	block   	
 	block   	
 	i32.const	$push0=, 5
 	i32.eq  	$push1=, $0, $pop0
-	br_if   	0, $pop1        # 0: down to label8
-# BB#1:                                 # %entry
+	br_if   	0, $pop1        # 0: down to label26
+# %bb.1:                                # %entry
 	i32.const	$push2=, 4
 	i32.ne  	$push3=, $0, $pop2
-	br_if   	2, $pop3        # 2: down to label6
-# BB#2:                                 # %sw.bb
-	i32.load	$push14=, 12($4)
-	i32.const	$push13=, 7
-	i32.add 	$push15=, $pop14, $pop13
-	i32.const	$push16=, -8
-	i32.and 	$push46=, $pop15, $pop16
-	tee_local	$push45=, $1=, $pop46
-	i32.const	$push17=, 8
-	i32.add 	$push44=, $pop45, $pop17
-	tee_local	$push43=, $0=, $pop44
-	i32.store	12($4), $pop43
-	f64.load	$3=, 0($1)
-	br      	1               # 1: down to label7
+	br_if   	2, $pop3        # 2: down to label24
+# %bb.2:                                # %sw.bb
+	i32.load	$push13=, 12($4)
+	i32.const	$push12=, 7
+	i32.add 	$push14=, $pop13, $pop12
+	i32.const	$push15=, -8
+	i32.and 	$1=, $pop14, $pop15
+	i32.const	$push16=, 8
+	i32.add 	$0=, $1, $pop16
+	i32.store	12($4), $0
+	f64.load	$2=, 0($1)
+	br      	1               # 1: down to label25
 .LBB6_3:                                # %sw.bb2
-	end_block                       # label8:
-	i32.const	$push9=, 0
+	end_block                       # label26:
 	i32.load	$push5=, 12($4)
 	i32.const	$push4=, 7
 	i32.add 	$push6=, $pop5, $pop4
 	i32.const	$push7=, -8
-	i32.and 	$push52=, $pop6, $pop7
-	tee_local	$push51=, $1=, $pop52
-	f64.load	$push8=, 0($pop51)
-	i32.trunc_s/f64	$push50=, $pop8
-	tee_local	$push49=, $2=, $pop50
-	i32.store	y($pop9), $pop49
-	i32.const	$push10=, 16
-	i32.add 	$push48=, $1, $pop10
-	tee_local	$push47=, $0=, $pop48
-	i32.store	12($4), $pop47
-	f64.load	$push11=, 8($1)
-	f64.convert_s/i32	$push12=, $2
-	f64.add 	$3=, $pop11, $pop12
-.LBB6_4:                                # %sw.epilog
-	end_block                       # label7:
-	i32.const	$push19=, 0
-	i32.trunc_s/f64	$push18=, $3
-	i32.store	y($pop19), $pop18
-	i32.const	$push56=, 0
-	i32.const	$push20=, 7
-	i32.add 	$push21=, $0, $pop20
-	i32.const	$push22=, -8
-	i32.and 	$push55=, $pop21, $pop22
-	tee_local	$push54=, $0=, $pop55
-	i32.const	$push28=, 19
-	i32.add 	$push29=, $pop54, $pop28
-	i32.const	$push53=, -8
-	i32.and 	$push30=, $pop29, $pop53
-	f64.load	$push31=, 0($pop30)
-	i32.load	$push23=, 8($0)
-	f64.load	$push24=, 0($0)
-	i32.trunc_s/f64	$push25=, $pop24
-	i32.add 	$push26=, $pop23, $pop25
-	f64.convert_s/i32	$push27=, $pop26
-	f64.add 	$push32=, $pop31, $pop27
-	i32.trunc_s/f64	$push33=, $pop32
-	i32.store	x($pop56), $pop33
-	i32.const	$push40=, 0
-	i32.const	$push38=, 16
-	i32.add 	$push39=, $4, $pop38
-	i32.store	__stack_pointer($pop40), $pop39
+	i32.and 	$1=, $pop6, $pop7
+	f64.load	$2=, 0($1)
+	block   	
+	block   	
+	f64.abs 	$push25=, $2
+	f64.const	$push26=, 0x1p31
+	f64.lt  	$push27=, $pop25, $pop26
+	br_if   	0, $pop27       # 0: down to label28
+# %bb.4:                                # %sw.bb2
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label27
+.LBB6_5:                                # %sw.bb2
+	end_block                       # label28:
+	i32.trunc_s/f64	$3=, $2
+.LBB6_6:                                # %sw.bb2
+	end_block                       # label27:
+	i32.const	$push8=, 0
+	i32.store	y($pop8), $3
+	i32.const	$push9=, 16
+	i32.add 	$0=, $1, $pop9
+	i32.store	12($4), $0
+	f64.load	$push10=, 8($1)
+	f64.convert_s/i32	$push11=, $3
+	f64.add 	$2=, $pop10, $pop11
+.LBB6_7:                                # %sw.epilog
+	end_block                       # label25:
+	block   	
+	block   	
+	f64.abs 	$push28=, $2
+	f64.const	$push29=, 0x1p31
+	f64.lt  	$push30=, $pop28, $pop29
+	br_if   	0, $pop30       # 0: down to label30
+# %bb.8:                                # %sw.epilog
+	i32.const	$1=, -2147483648
+	br      	1               # 1: down to label29
+.LBB6_9:                                # %sw.epilog
+	end_block                       # label30:
+	i32.trunc_s/f64	$1=, $2
+.LBB6_10:                               # %sw.epilog
+	end_block                       # label29:
+	i32.const	$push45=, 0
+	i32.store	y($pop45), $1
+	i32.const	$push17=, 7
+	i32.add 	$push18=, $0, $pop17
+	i32.const	$push44=, -8
+	i32.and 	$0=, $pop18, $pop44
+	i32.load	$1=, 8($0)
+	f64.load	$2=, 0($0)
+	block   	
+	block   	
+	f64.abs 	$push31=, $2
+	f64.const	$push32=, 0x1p31
+	f64.lt  	$push33=, $pop31, $pop32
+	br_if   	0, $pop33       # 0: down to label32
+# %bb.11:                               # %sw.epilog
+	i32.const	$3=, -2147483648
+	br      	1               # 1: down to label31
+.LBB6_12:                               # %sw.epilog
+	end_block                       # label32:
+	i32.trunc_s/f64	$3=, $2
+.LBB6_13:                               # %sw.epilog
+	end_block                       # label31:
+	i32.const	$push21=, 19
+	i32.add 	$push22=, $0, $pop21
+	i32.const	$push46=, -8
+	i32.and 	$push23=, $pop22, $pop46
+	f64.load	$push24=, 0($pop23)
+	i32.add 	$push19=, $1, $3
+	f64.convert_s/i32	$push20=, $pop19
+	f64.add 	$2=, $pop24, $pop20
+	block   	
+	block   	
+	f64.abs 	$push34=, $2
+	f64.const	$push35=, 0x1p31
+	f64.lt  	$push36=, $pop34, $pop35
+	br_if   	0, $pop36       # 0: down to label34
+# %bb.14:                               # %sw.epilog
+	i32.const	$0=, -2147483648
+	br      	1               # 1: down to label33
+.LBB6_15:                               # %sw.epilog
+	end_block                       # label34:
+	i32.trunc_s/f64	$0=, $2
+.LBB6_16:                               # %sw.epilog
+	end_block                       # label33:
+	i32.const	$push47=, 0
+	i32.store	x($pop47), $0
+	i32.const	$push43=, 0
+	i32.const	$push41=, 16
+	i32.add 	$push42=, $4, $pop41
+	i32.store	__stack_pointer($pop43), $pop42
 	return
-.LBB6_5:                                # %sw.default
-	end_block                       # label6:
+.LBB6_17:                               # %sw.default
+	end_block                       # label24:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -386,14 +551,13 @@ f4:                                     # @f4
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push79=, 0
+# %bb.0:                                # %entry
 	i32.const	$push77=, 0
 	i32.load	$push76=, __stack_pointer($pop77)
 	i32.const	$push78=, 224
-	i32.sub 	$push106=, $pop76, $pop78
-	tee_local	$push105=, $0=, $pop106
-	i32.store	__stack_pointer($pop79), $pop105
+	i32.sub 	$0=, $pop76, $pop78
+	i32.const	$push79=, 0
+	i32.store	__stack_pointer($pop79), $0
 	i32.const	$push83=, 192
 	i32.add 	$push84=, $0, $pop83
 	i32.const	$push104=, 16
@@ -412,8 +576,8 @@ main:                                   # @main
 	i32.load	$push4=, x($pop103)
 	i32.const	$push5=, 176
 	i32.ne  	$push6=, $pop4, $pop5
-	br_if   	0, $pop6        # 0: down to label9
-# BB#1:                                 # %if.end
+	br_if   	0, $pop6        # 0: down to label35
+# %bb.1:                                # %if.end
 	i32.const	$push8=, 176
 	i32.add 	$push9=, $0, $pop8
 	i64.const	$push10=, 4634204016564240384
@@ -424,8 +588,8 @@ main:                                   # @main
 	i32.store	0($pop12), $pop13
 	i32.const	$push87=, 144
 	i32.add 	$push88=, $0, $pop87
-	i32.const	$push108=, 16
-	i32.add 	$push14=, $pop88, $pop108
+	i32.const	$push106=, 16
+	i32.add 	$push14=, $pop88, $pop106
 	i64.const	$push15=, 4626041242239631360
 	i64.store	0($pop14), $pop15
 	i64.const	$push16=, 4625759767262920704
@@ -435,23 +599,23 @@ main:                                   # @main
 	i32.const	$push89=, 144
 	i32.add 	$push90=, $0, $pop89
 	call    	f2@FUNCTION, $0, $pop90
-	i32.const	$push107=, 0
-	i32.load	$push18=, x($pop107)
+	i32.const	$push105=, 0
+	i32.load	$push18=, x($pop105)
 	i32.const	$push19=, 100
 	i32.ne  	$push20=, $pop18, $pop19
-	br_if   	0, $pop20       # 0: down to label9
-# BB#2:                                 # %if.end
-	i32.const	$push109=, 0
-	i32.load	$push7=, y($pop109)
+	br_if   	0, $pop20       # 0: down to label35
+# %bb.2:                                # %if.end
+	i32.const	$push107=, 0
+	i32.load	$push7=, y($pop107)
 	i32.const	$push21=, 30
 	i32.ne  	$push22=, $pop7, $pop21
-	br_if   	0, $pop22       # 0: down to label9
-# BB#3:                                 # %if.end4
+	br_if   	0, $pop22       # 0: down to label35
+# %bb.3:                                # %if.end4
 	i32.const	$push23=, 0
-	i32.const	$push110=, 0
-	i32.call	$push24=, f3@FUNCTION, $pop23, $pop110
-	br_if   	0, $pop24       # 0: down to label9
-# BB#4:                                 # %if.end7
+	i32.const	$push108=, 0
+	i32.call	$push24=, f3@FUNCTION, $pop23, $pop108
+	br_if   	0, $pop24       # 0: down to label35
+# %bb.4:                                # %if.end7
 	i32.const	$push25=, 18
 	i32.store	128($0), $pop25
 	i32.const	$push26=, 1
@@ -460,42 +624,42 @@ main:                                   # @main
 	i32.call	$push27=, f3@FUNCTION, $pop26, $pop92
 	i32.const	$push28=, 19
 	i32.ne  	$push29=, $pop27, $pop28
-	br_if   	0, $pop29       # 0: down to label9
-# BB#5:                                 # %if.end11
-	i64.const	$push111=, 429496729618
-	i64.store	112($0), $pop111
+	br_if   	0, $pop29       # 0: down to label35
+# %bb.5:                                # %if.end11
+	i64.const	$push109=, 429496729618
+	i64.store	112($0), $pop109
 	i32.const	$push30=, 2
 	i32.const	$push93=, 112
 	i32.add 	$push94=, $0, $pop93
 	i32.call	$push31=, f3@FUNCTION, $pop30, $pop94
 	i32.const	$push32=, 120
 	i32.ne  	$push33=, $pop31, $pop32
-	br_if   	0, $pop33       # 0: down to label9
-# BB#6:                                 # %if.end15
+	br_if   	0, $pop33       # 0: down to label35
+# %bb.6:                                # %if.end15
 	i32.const	$push34=, 300
 	i32.store	104($0), $pop34
-	i64.const	$push112=, 429496729618
-	i64.store	96($0), $pop112
+	i64.const	$push110=, 429496729618
+	i64.store	96($0), $pop110
 	i32.const	$push35=, 3
 	i32.const	$push95=, 96
 	i32.add 	$push96=, $0, $pop95
 	i32.call	$push36=, f3@FUNCTION, $pop35, $pop96
 	i32.const	$push37=, 421
 	i32.ne  	$push38=, $pop36, $pop37
-	br_if   	0, $pop38       # 0: down to label9
-# BB#7:                                 # %if.end19
+	br_if   	0, $pop38       # 0: down to label35
+# %bb.7:                                # %if.end19
 	i64.const	$push39=, 369367187520
 	i64.store	88($0), $pop39
 	i64.const	$push40=, 304942678034
 	i64.store	80($0), $pop40
-	i32.const	$push113=, 4
+	i32.const	$push111=, 4
 	i32.const	$push97=, 80
 	i32.add 	$push98=, $0, $pop97
-	i32.call	$push41=, f3@FUNCTION, $pop113, $pop98
+	i32.call	$push41=, f3@FUNCTION, $pop111, $pop98
 	i32.const	$push42=, 243
 	i32.ne  	$push43=, $pop41, $pop42
-	br_if   	0, $pop43       # 0: down to label9
-# BB#8:                                 # %if.end23
+	br_if   	0, $pop43       # 0: down to label35
+# %bb.8:                                # %if.end23
 	i32.const	$push45=, 72
 	i32.add 	$push46=, $0, $pop45
 	i64.const	$push47=, 4625759767262920704
@@ -504,28 +668,28 @@ main:                                   # @main
 	i32.add 	$push100=, $0, $pop99
 	i32.const	$push48=, 16
 	i32.add 	$push49=, $pop100, $pop48
-	i32.const	$push116=, 16
-	i32.store	0($pop49), $pop116
+	i32.const	$push114=, 16
+	i32.store	0($pop49), $pop114
 	i64.const	$push50=, 4621256167635550208
 	i64.store	56($0), $pop50
 	i64.const	$push51=, 4618441417868443648
 	i64.store	48($0), $pop51
-	i32.const	$push115=, 4
+	i32.const	$push113=, 4
 	i32.const	$push101=, 48
 	i32.add 	$push102=, $0, $pop101
-	call    	f4@FUNCTION, $pop115, $pop102
-	i32.const	$push114=, 0
-	i32.load	$push52=, x($pop114)
+	call    	f4@FUNCTION, $pop113, $pop102
+	i32.const	$push112=, 0
+	i32.load	$push52=, x($pop112)
 	i32.const	$push53=, 43
 	i32.ne  	$push54=, $pop52, $pop53
-	br_if   	0, $pop54       # 0: down to label9
-# BB#9:                                 # %if.end23
-	i32.const	$push117=, 0
-	i32.load	$push44=, y($pop117)
+	br_if   	0, $pop54       # 0: down to label35
+# %bb.9:                                # %if.end23
+	i32.const	$push115=, 0
+	i32.load	$push44=, y($pop115)
 	i32.const	$push55=, 6
 	i32.ne  	$push56=, $pop44, $pop55
-	br_if   	0, $pop56       # 0: down to label9
-# BB#10:                                # %if.end28
+	br_if   	0, $pop56       # 0: down to label35
+# %bb.10:                               # %if.end28
 	i32.const	$push58=, 32
 	i32.add 	$push59=, $0, $pop58
 	i64.const	$push60=, 4638566878703255552
@@ -544,18 +708,18 @@ main:                                   # @main
 	i64.store	0($0), $pop68
 	i32.const	$push69=, 5
 	call    	f4@FUNCTION, $pop69, $0
-	i32.const	$push118=, 0
-	i32.load	$push70=, x($pop118)
+	i32.const	$push116=, 0
+	i32.load	$push70=, x($pop116)
 	i32.const	$push71=, 144
 	i32.ne  	$push72=, $pop70, $pop71
-	br_if   	0, $pop72       # 0: down to label9
-# BB#11:                                # %if.end28
-	i32.const	$push119=, 0
-	i32.load	$push57=, y($pop119)
+	br_if   	0, $pop72       # 0: down to label35
+# %bb.11:                               # %if.end28
+	i32.const	$push117=, 0
+	i32.load	$push57=, y($pop117)
 	i32.const	$push73=, 28
 	i32.ne  	$push74=, $pop57, $pop73
-	br_if   	0, $pop74       # 0: down to label9
-# BB#12:                                # %if.end33
+	br_if   	0, $pop74       # 0: down to label35
+# %bb.12:                               # %if.end33
 	i32.const	$push82=, 0
 	i32.const	$push80=, 224
 	i32.add 	$push81=, $0, $pop80
@@ -563,7 +727,7 @@ main:                                   # @main
 	i32.const	$push75=, 0
 	return  	$pop75
 .LBB7_13:                               # %if.then
-	end_block                       # label9:
+	end_block                       # label35:
 	call    	abort@FUNCTION
 	unreachable
 	.endfunc
@@ -589,5 +753,5 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/strcmp-1.c.s b/test/torture-s/strcmp-1.c.s
index 1f7036bbc..f15f5515f 100644
--- a/test/torture-s/strcmp-1.c.s
+++ b/test/torture-s/strcmp-1.c.s
@@ -6,14 +6,14 @@
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$0=, strcmp@FUNCTION, $0, $1
 	block   	
 	block   	
 	i32.const	$push0=, -1
 	i32.gt_s	$push1=, $2, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 0
 	i32.ge_s	$push3=, $0, $pop2
 	br_if   	1, $pop3        # 1: down to label0
@@ -21,7 +21,7 @@ test:                                   # @test
 	end_block                       # label1:
 	block   	
 	br_if   	0, $2           # 0: down to label2
-# BB#3:                                 # %if.else
+# %bb.3:                                # %if.else
 	br_if   	1, $0           # 1: down to label0
 .LBB0_4:                                # %if.else6
 	end_block                       # label2:
@@ -29,7 +29,7 @@ test:                                   # @test
 	i32.const	$push4=, 1
 	i32.lt_s	$push5=, $2, $pop4
 	br_if   	0, $pop5        # 0: down to label3
-# BB#5:                                 # %if.else6
+# %bb.5:                                # %if.else6
 	i32.const	$push6=, 0
 	i32.le_s	$push7=, $0, $pop6
 	br_if   	1, $pop7        # 1: down to label0
@@ -51,17 +51,17 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$0=, 0
-	i32.const	$1=, u1
+# %bb.0:                                # %entry
+	i32.const	$0=, u1
+	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_2 Depth 2
                                         #       Child Loop BB1_3 Depth 3
 	block   	
 	loop    	                # label5:
-	i32.const	$2=, 0
-	i32.const	$3=, u2
+	i32.const	$2=, u2
+	i32.const	$3=, 0
 .LBB1_2:                                # %for.body3
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Loop Header: Depth=2
@@ -76,8 +76,8 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	br_if   	0, $0           # 0: down to label10
-# BB#4:                                 #   in Loop: Header=BB1_3 Depth=3
+	br_if   	0, $1           # 0: down to label10
+# %bb.4:                                #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$5=, u1
 	i32.const	$push25=, u1
 	copy_local	$6=, $pop25
@@ -86,34 +86,33 @@ main:                                   # @main
 .LBB1_5:                                # %for.body9.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label10:
-	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
+	i32.const	$push28=, u1
+	i32.const	$push27=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop28, $pop27, $1
+	copy_local	$5=, $0
+	copy_local	$6=, $5
+	i32.eqz 	$push73=, $4
+	br_if   	1, $pop73       # 1: down to label8
 .LBB1_6:                                # %for.body12.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label9:
-	i32.const	$push31=, 97
-	i32.call	$push0=, memset@FUNCTION, $5, $pop31, $4
+	i32.const	$push29=, 97
+	i32.call	$push0=, memset@FUNCTION, $5, $pop29, $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
+	i64.const	$push32=, 8680820740569200760
+	i64.store	0($6):p2align=0, $pop32
+	i32.const	$push31=, 8
+	i32.add 	$push2=, $6, $pop31
+	i32.const	$push30=, 30840
+	i32.store16	0($pop2):p2align=0, $pop30
 	block   	
 	block   	
 	block   	
-	br_if   	0, $2           # 0: down to label13
-# BB#8:                                 #   in Loop: Header=BB1_3 Depth=3
+	br_if   	0, $3           # 0: down to label13
+# %bb.8:                                #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$7=, u2
 	i32.const	$push26=, u2
 	copy_local	$8=, $pop26
@@ -122,146 +121,142 @@ main:                                   # @main
 .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
+	i32.const	$push34=, u2
+	i32.const	$push33=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop34, $pop33, $3
+	copy_local	$7=, $2
+	copy_local	$8=, $7
+	i32.eqz 	$push74=, $4
+	br_if   	1, $pop74       # 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.const	$push35=, 97
+	i32.call	$push1=, memset@FUNCTION, $7, $pop35, $4
 	i32.add 	$8=, $pop1, $4
 .LBB1_11:                               # %for.end37
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label11:
-	i64.const	$push44=, 8680820740569200760
-	i64.store	1($8):p2align=0, $pop44
-	i32.const	$push43=, 9
-	i32.add 	$push3=, $8, $pop43
-	i32.const	$push42=, 120
-	i32.store8	0($pop3), $pop42
-	i32.const	$push41=, 0
-	i32.store8	0($6), $pop41
-	i32.const	$push40=, 0
-	i32.store8	0($8), $pop40
+	i64.const	$push40=, 8680820740569200760
+	i64.store	1($8):p2align=0, $pop40
+	i32.const	$push39=, 9
+	i32.add 	$push3=, $8, $pop39
+	i32.const	$push38=, 120
+	i32.store8	0($pop3), $pop38
+	i32.const	$push37=, 0
+	i32.store8	0($6), $pop37
+	i32.const	$push36=, 0
+	i32.store8	0($8), $pop36
 	i32.call	$push4=, strcmp@FUNCTION, $5, $7
 	br_if   	3, $pop4        # 3: down to label4
-# BB#12:                                # %test.exit
+# %bb.12:                               # %test.exit
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push47=, 97
-	i32.store16	0($6):p2align=0, $pop47
-	i32.const	$push46=, 0
-	i32.store8	0($8), $pop46
+	i32.const	$push43=, 97
+	i32.store16	0($6):p2align=0, $pop43
+	i32.const	$push42=, 0
+	i32.store8	0($8), $pop42
 	i32.call	$push5=, strcmp@FUNCTION, $5, $7
-	i32.const	$push45=, 0
-	i32.le_s	$push6=, $pop5, $pop45
+	i32.const	$push41=, 0
+	i32.le_s	$push6=, $pop5, $pop41
 	br_if   	3, $pop6        # 3: down to label4
-# BB#13:                                # %test.exit157
+# %bb.13:                               # %test.exit157
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push50=, 0
-	i32.store8	0($6), $pop50
-	i32.const	$push49=, 97
-	i32.store16	0($8):p2align=0, $pop49
+	i32.const	$push46=, 0
+	i32.store8	0($6), $pop46
+	i32.const	$push45=, 97
+	i32.store16	0($8):p2align=0, $pop45
 	i32.call	$push7=, strcmp@FUNCTION, $5, $7
-	i32.const	$push48=, 0
-	i32.ge_s	$push8=, $pop7, $pop48
+	i32.const	$push44=, 0
+	i32.ge_s	$push8=, $pop7, $pop44
 	br_if   	3, $pop8        # 3: down to label4
-# BB#14:                                # %test.exit162
+# %bb.14:                               # %test.exit162
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push53=, 98
-	i32.store16	0($6):p2align=0, $pop53
-	i32.const	$push52=, 99
-	i32.store16	0($8):p2align=0, $pop52
+	i32.const	$push49=, 98
+	i32.store16	0($6):p2align=0, $pop49
+	i32.const	$push48=, 99
+	i32.store16	0($8):p2align=0, $pop48
 	i32.call	$push9=, strcmp@FUNCTION, $5, $7
-	i32.const	$push51=, 0
-	i32.ge_s	$push10=, $pop9, $pop51
+	i32.const	$push47=, 0
+	i32.ge_s	$push10=, $pop9, $pop47
 	br_if   	3, $pop10       # 3: down to label4
-# BB#15:                                # %test.exit168
+# %bb.15:                               # %test.exit168
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push56=, 99
-	i32.store16	0($6):p2align=0, $pop56
-	i32.const	$push55=, 98
-	i32.store16	0($8):p2align=0, $pop55
+	i32.const	$push52=, 99
+	i32.store16	0($6):p2align=0, $pop52
+	i32.const	$push51=, 98
+	i32.store16	0($8):p2align=0, $pop51
 	i32.call	$push11=, strcmp@FUNCTION, $5, $7
-	i32.const	$push54=, 0
-	i32.le_s	$push12=, $pop11, $pop54
+	i32.const	$push50=, 0
+	i32.le_s	$push12=, $pop11, $pop50
 	br_if   	3, $pop12       # 3: down to label4
-# BB#16:                                # %test.exit174
+# %bb.16:                               # %test.exit174
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push59=, 98
-	i32.store16	0($6):p2align=0, $pop59
-	i32.const	$push58=, 169
-	i32.store16	0($8):p2align=0, $pop58
+	i32.const	$push55=, 98
+	i32.store16	0($6):p2align=0, $pop55
+	i32.const	$push54=, 169
+	i32.store16	0($8):p2align=0, $pop54
 	i32.call	$push13=, strcmp@FUNCTION, $5, $7
-	i32.const	$push57=, 0
-	i32.ge_s	$push14=, $pop13, $pop57
+	i32.const	$push53=, 0
+	i32.ge_s	$push14=, $pop13, $pop53
 	br_if   	3, $pop14       # 3: down to label4
-# BB#17:                                # %test.exit180
+# %bb.17:                               # %test.exit180
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push62=, 169
-	i32.store16	0($6):p2align=0, $pop62
-	i32.const	$push61=, 98
-	i32.store16	0($8):p2align=0, $pop61
+	i32.const	$push58=, 169
+	i32.store16	0($6):p2align=0, $pop58
+	i32.const	$push57=, 98
+	i32.store16	0($8):p2align=0, $pop57
 	i32.call	$push15=, strcmp@FUNCTION, $5, $7
-	i32.const	$push60=, 0
-	i32.le_s	$push16=, $pop15, $pop60
+	i32.const	$push56=, 0
+	i32.le_s	$push16=, $pop15, $pop56
 	br_if   	3, $pop16       # 3: down to label4
-# BB#18:                                # %test.exit186
+# %bb.18:                               # %test.exit186
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push65=, 169
-	i32.store16	0($6):p2align=0, $pop65
-	i32.const	$push64=, 170
-	i32.store16	0($8):p2align=0, $pop64
+	i32.const	$push61=, 169
+	i32.store16	0($6):p2align=0, $pop61
+	i32.const	$push60=, 170
+	i32.store16	0($8):p2align=0, $pop60
 	i32.call	$push17=, strcmp@FUNCTION, $5, $7
-	i32.const	$push63=, 0
-	i32.ge_s	$push18=, $pop17, $pop63
+	i32.const	$push59=, 0
+	i32.ge_s	$push18=, $pop17, $pop59
 	br_if   	3, $pop18       # 3: down to label4
-# BB#19:                                # %test.exit192
+# %bb.19:                               # %test.exit192
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push68=, 170
-	i32.store16	0($6):p2align=0, $pop68
-	i32.const	$push67=, 169
-	i32.store16	0($8):p2align=0, $pop67
+	i32.const	$push64=, 170
+	i32.store16	0($6):p2align=0, $pop64
+	i32.const	$push63=, 169
+	i32.store16	0($8):p2align=0, $pop63
 	i32.call	$push19=, strcmp@FUNCTION, $5, $7
-	i32.const	$push66=, 0
-	i32.le_s	$push20=, $pop19, $pop66
+	i32.const	$push62=, 0
+	i32.le_s	$push20=, $pop19, $pop62
 	br_if   	3, $pop20       # 3: down to label4
-# BB#20:                                # %for.cond4
+# %bb.20:                               # %for.cond4
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push72=, 1
-	i32.add 	$push71=, $4, $pop72
-	tee_local	$push70=, $4=, $pop71
-	i32.const	$push69=, 63
-	i32.le_u	$push21=, $pop70, $pop69
+	i32.const	$push66=, 1
+	i32.add 	$4=, $4, $pop66
+	i32.const	$push65=, 63
+	i32.le_u	$push21=, $4, $pop65
 	br_if   	0, $pop21       # 0: up to label7
-# BB#21:                                # %for.inc79
+# %bb.21:                               # %for.inc79
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
-	i32.const	$push77=, 1
-	i32.add 	$3=, $3, $pop77
-	i32.const	$push76=, 1
-	i32.add 	$push75=, $2, $pop76
-	tee_local	$push74=, $2=, $pop75
-	i32.const	$push73=, 8
-	i32.lt_u	$push22=, $pop74, $pop73
+	i32.const	$push69=, 1
+	i32.add 	$2=, $2, $pop69
+	i32.const	$push68=, 1
+	i32.add 	$3=, $3, $pop68
+	i32.const	$push67=, 8
+	i32.lt_u	$push22=, $3, $pop67
 	br_if   	0, $pop22       # 0: up to label6
-# BB#22:                                # %for.inc82
+# %bb.22:                               # %for.inc82
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
-	i32.const	$push82=, 1
-	i32.add 	$1=, $1, $pop82
-	i32.const	$push81=, 1
-	i32.add 	$push80=, $0, $pop81
-	tee_local	$push79=, $0=, $pop80
-	i32.const	$push78=, 8
-	i32.lt_u	$push23=, $pop79, $pop78
+	i32.const	$push72=, 1
+	i32.add 	$0=, $0, $pop72
+	i32.const	$push71=, 1
+	i32.add 	$1=, $1, $pop71
+	i32.const	$push70=, 8
+	i32.lt_u	$push23=, $1, $pop70
 	br_if   	0, $pop23       # 0: up to label5
-# BB#23:                                # %for.end84
+# %bb.23:                               # %for.end84
 	end_loop
 	i32.const	$push24=, 0
 	call    	exit@FUNCTION, $pop24
@@ -289,7 +284,7 @@ u2:
 	.size	u2, 96
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 41a0f9397..89f3a0807 100644
--- a/test/torture-s/strcpy-1.c.s
+++ b/test/torture-s/strcpy-1.c.s
@@ -7,7 +7,7 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$0=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
@@ -46,50 +46,48 @@ main:                                   # @main
 	i32.const	$push53=, 97
 	i32.const	$push52=, 97
 	i32.call	$7=, memset@FUNCTION, $pop54, $pop53, $pop52
-	i32.const	$8=, 65
-	i32.const	$6=, -97
+	i32.const	$6=, 65
+	i32.const	$8=, -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    	                # 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
+	i32.const	$push61=, 65
+	i32.const	$push60=, 24
+	i32.shl 	$push0=, $6, $pop60
+	i32.const	$push59=, 24
+	i32.shr_s	$push1=, $pop0, $pop59
+	i32.const	$push58=, 95
+	i32.gt_s	$push2=, $pop1, $pop58
+	i32.select	$6=, $pop61, $6, $pop2
+	i32.const	$push57=, u2+97
+	i32.add 	$push3=, $8, $pop57
+	i32.store8	0($pop3), $6
+	i32.const	$push56=, 1
+	i32.add 	$8=, $8, $pop56
+	i32.const	$push55=, 1
+	i32.add 	$6=, $6, $pop55
+	br_if   	0, $8           # 0: up to label4
+# %bb.5:                                # %for.end
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
 	i32.add 	$push4=, $5, $2
-	i32.const	$push67=, u2
-	i32.add 	$push5=, $pop4, $pop67
-	i32.const	$push66=, 0
-	i32.store8	0($pop5), $pop66
+	i32.const	$push63=, u2
+	i32.add 	$push5=, $pop4, $pop63
+	i32.const	$push62=, 0
+	i32.store8	0($pop5), $pop62
 	i32.call	$push6=, strcpy@FUNCTION, $1, $3
 	i32.ne  	$push7=, $pop6, $1
 	br_if   	3, $pop7        # 3: down to label0
-# BB#6:                                 # %if.end20
+# %bb.6:                                # %if.end20
                                         #   in Loop: Header=BB0_3 Depth=3
 	block   	
 	block   	
-	i32.eqz 	$push113=, $0
-	br_if   	0, $pop113      # 0: down to label6
-# BB#7:                                 # %for.body24.preheader
+	i32.eqz 	$push95=, $0
+	br_if   	0, $pop95       # 0: down to label6
+# %bb.7:                                # %for.body24.preheader
                                         #   in Loop: Header=BB0_3 Depth=3
 	i32.const	$8=, 0
 .LBB0_8:                                # %for.body24
@@ -100,17 +98,16 @@ main:                                   # @main
 	loop    	                # label7:
 	i32.add 	$push8=, $8, $7
 	i32.load8_u	$push9=, 0($pop8)
-	i32.const	$push68=, 97
-	i32.ne  	$push10=, $pop9, $pop68
+	i32.const	$push64=, 97
+	i32.ne  	$push10=, $pop9, $pop64
 	br_if   	6, $pop10       # 6: down to label0
-# BB#9:                                 # %for.inc30
+# %bb.9:                                # %for.inc30
                                         #   in Loop: Header=BB0_8 Depth=4
-	i32.const	$push71=, 1
-	i32.add 	$push70=, $8, $pop71
-	tee_local	$push69=, $8=, $pop70
-	i32.lt_u	$push11=, $pop69, $0
+	i32.const	$push65=, 1
+	i32.add 	$8=, $8, $pop65
+	i32.lt_u	$push11=, $8, $0
 	br_if   	0, $pop11       # 0: up to label7
-# BB#10:                                # %for.body38.preheader.loopexit
+# %bb.10:                               # %for.body38.preheader.loopexit
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
 	i32.add 	$7=, $8, $7
@@ -129,128 +126,122 @@ main:                                   # @main
                                         #       Parent Loop BB0_3 Depth=3
                                         # =>      This Inner Loop Header: Depth=4
 	loop    	                # label8:
+	i32.const	$push70=, 65
+	i32.const	$push69=, 24
+	i32.shl 	$push12=, $6, $pop69
+	i32.const	$push68=, 24
+	i32.shr_s	$push13=, $pop12, $pop68
+	i32.const	$push67=, 95
+	i32.gt_s	$push14=, $pop13, $pop67
+	i32.select	$6=, $pop70, $6, $pop14
 	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.const	$push66=, 255
+	i32.and 	$push15=, $6, $pop66
 	i32.ne  	$push18=, $pop17, $pop15
 	br_if   	4, $pop18       # 4: down to label0
-# BB#14:                                # %for.inc50
+# %bb.14:                               # %for.inc50
                                         #   in Loop: Header=BB0_13 Depth=4
-	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
+	i32.const	$push72=, 1
+	i32.add 	$6=, $6, $pop72
+	i32.const	$push71=, 1
+	i32.add 	$8=, $8, $pop71
+	i32.lt_u	$push19=, $8, $5
 	br_if   	0, $pop19       # 0: up to label8
-# BB#15:                                # %for.end54
+# %bb.15:                               # %for.end54
                                         #   in Loop: Header=BB0_3 Depth=3
 	end_loop
-	i32.add 	$push84=, $7, $8
-	tee_local	$push83=, $8=, $pop84
-	i32.load8_u	$push20=, 0($pop83)
+	i32.add 	$8=, $7, $8
+	i32.load8_u	$push20=, 0($8)
 	br_if   	3, $pop20       # 3: down to label0
-# BB#16:                                # %if.end60
+# %bb.16:                               # %if.end60
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push86=, 1
-	i32.add 	$push21=, $8, $pop86
+	i32.const	$push74=, 1
+	i32.add 	$push21=, $8, $pop74
 	i32.load8_u	$push22=, 0($pop21)
-	i32.const	$push85=, 97
-	i32.ne  	$push23=, $pop22, $pop85
+	i32.const	$push73=, 97
+	i32.ne  	$push23=, $pop22, $pop73
 	br_if   	3, $pop23       # 3: down to label0
-# BB#17:                                # %for.cond61
+# %bb.17:                               # %for.cond61
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push88=, 2
-	i32.add 	$push24=, $8, $pop88
+	i32.const	$push76=, 2
+	i32.add 	$push24=, $8, $pop76
 	i32.load8_u	$push25=, 0($pop24)
-	i32.const	$push87=, 97
-	i32.ne  	$push26=, $pop25, $pop87
+	i32.const	$push75=, 97
+	i32.ne  	$push26=, $pop25, $pop75
 	br_if   	3, $pop26       # 3: down to label0
-# BB#18:                                # %for.cond61.1
+# %bb.18:                               # %for.cond61.1
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push90=, 3
-	i32.add 	$push27=, $8, $pop90
+	i32.const	$push78=, 3
+	i32.add 	$push27=, $8, $pop78
 	i32.load8_u	$push28=, 0($pop27)
-	i32.const	$push89=, 97
-	i32.ne  	$push29=, $pop28, $pop89
+	i32.const	$push77=, 97
+	i32.ne  	$push29=, $pop28, $pop77
 	br_if   	3, $pop29       # 3: down to label0
-# BB#19:                                # %for.cond61.2
+# %bb.19:                               # %for.cond61.2
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push92=, 4
-	i32.add 	$push30=, $8, $pop92
+	i32.const	$push80=, 4
+	i32.add 	$push30=, $8, $pop80
 	i32.load8_u	$push31=, 0($pop30)
-	i32.const	$push91=, 97
-	i32.ne  	$push32=, $pop31, $pop91
+	i32.const	$push79=, 97
+	i32.ne  	$push32=, $pop31, $pop79
 	br_if   	3, $pop32       # 3: down to label0
-# BB#20:                                # %for.cond61.3
+# %bb.20:                               # %for.cond61.3
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push94=, 5
-	i32.add 	$push33=, $8, $pop94
+	i32.const	$push82=, 5
+	i32.add 	$push33=, $8, $pop82
 	i32.load8_u	$push34=, 0($pop33)
-	i32.const	$push93=, 97
-	i32.ne  	$push35=, $pop34, $pop93
+	i32.const	$push81=, 97
+	i32.ne  	$push35=, $pop34, $pop81
 	br_if   	3, $pop35       # 3: down to label0
-# BB#21:                                # %for.cond61.4
+# %bb.21:                               # %for.cond61.4
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push96=, 6
-	i32.add 	$push36=, $8, $pop96
+	i32.const	$push84=, 6
+	i32.add 	$push36=, $8, $pop84
 	i32.load8_u	$push37=, 0($pop36)
-	i32.const	$push95=, 97
-	i32.ne  	$push38=, $pop37, $pop95
+	i32.const	$push83=, 97
+	i32.ne  	$push38=, $pop37, $pop83
 	br_if   	3, $pop38       # 3: down to label0
-# BB#22:                                # %for.cond61.5
+# %bb.22:                               # %for.cond61.5
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push98=, 7
-	i32.add 	$push39=, $8, $pop98
+	i32.const	$push86=, 7
+	i32.add 	$push39=, $8, $pop86
 	i32.load8_u	$push40=, 0($pop39)
-	i32.const	$push97=, 97
-	i32.ne  	$push41=, $pop40, $pop97
+	i32.const	$push85=, 97
+	i32.ne  	$push41=, $pop40, $pop85
 	br_if   	3, $pop41       # 3: down to label0
-# BB#23:                                # %for.cond61.6
+# %bb.23:                               # %for.cond61.6
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push100=, 8
-	i32.add 	$push42=, $8, $pop100
+	i32.const	$push88=, 8
+	i32.add 	$push42=, $8, $pop88
 	i32.load8_u	$push43=, 0($pop42)
-	i32.const	$push99=, 97
-	i32.ne  	$push44=, $pop43, $pop99
+	i32.const	$push87=, 97
+	i32.ne  	$push44=, $pop43, $pop87
 	br_if   	3, $pop44       # 3: down to label0
-# BB#24:                                # %for.cond61.7
+# %bb.24:                               # %for.cond61.7
                                         #   in Loop: Header=BB0_3 Depth=3
-	i32.const	$push104=, 1
-	i32.add 	$push103=, $5, $pop104
-	tee_local	$push102=, $5=, $pop103
-	i32.const	$push101=, 80
-	i32.lt_u	$push45=, $pop102, $pop101
+	i32.const	$push90=, 1
+	i32.add 	$5=, $5, $pop90
+	i32.const	$push89=, 80
+	i32.lt_u	$push45=, $5, $pop89
 	br_if   	0, $pop45       # 0: up to label3
-# BB#25:                                # %for.inc77
+# %bb.25:                               # %for.inc77
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_loop
-	i32.const	$push108=, 1
-	i32.add 	$push107=, $2, $pop108
-	tee_local	$push106=, $2=, $pop107
-	i32.const	$push105=, 8
-	i32.lt_u	$push46=, $pop106, $pop105
+	i32.const	$push92=, 1
+	i32.add 	$2=, $2, $pop92
+	i32.const	$push91=, 8
+	i32.lt_u	$push46=, $2, $pop91
 	br_if   	0, $pop46       # 0: up to label2
-# BB#26:                                # %for.inc80
+# %bb.26:                               # %for.inc80
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push112=, 1
-	i32.add 	$push111=, $0, $pop112
-	tee_local	$push110=, $0=, $pop111
-	i32.const	$push109=, 8
-	i32.lt_u	$push47=, $pop110, $pop109
+	i32.const	$push94=, 1
+	i32.add 	$0=, $0, $pop94
+	i32.const	$push93=, 8
+	i32.lt_u	$push47=, $0, $pop93
 	br_if   	0, $pop47       # 0: up to label1
-# BB#27:                                # %for.end82
+# %bb.27:                               # %for.end82
 	end_loop
 	i32.const	$push48=, 0
 	call    	exit@FUNCTION, $pop48
@@ -278,7 +269,7 @@ u2:
 	.size	u2, 112
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 efc34d803..14bc7be78 100644
--- a/test/torture-s/strct-pack-1.c.s
+++ b/test/torture-s/strct-pack-1.c.s
@@ -7,14 +7,14 @@
 check:                                  # @check
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.load16_u	$push0=, 0($0)
 	i32.const	$push6=, 1
 	i32.ne  	$push1=, $pop0, $pop6
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	f64.load	$push2=, 2($0):p2align=1
 	f64.const	$push3=, 0x1p4
 	f64.eq  	$push4=, $pop2, $pop3
@@ -37,7 +37,7 @@ check:                                  # @check
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -46,5 +46,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d9409e3dc..2cd216513 100644
--- a/test/torture-s/strct-pack-2.c.s
+++ b/test/torture-s/strct-pack-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3954ac497..31b9c16b2 100644
--- a/test/torture-s/strct-pack-3.c.s
+++ b/test/torture-s/strct-pack-3.c.s
@@ -8,13 +8,12 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 6
 	i32.add 	$push4=, $0, $pop3
-	i32.load	$push14=, 0($pop4):p2align=1
-	tee_local	$push13=, $1=, $pop14
+	i32.load	$1=, 0($pop4):p2align=1
 	i32.const	$push1=, 16
-	i32.shl 	$push8=, $pop13, $pop1
+	i32.shl 	$push8=, $1, $pop1
 	i32.load	$push0=, 2($0):p2align=1
 	i32.const	$push12=, 16
 	i32.shl 	$push2=, $pop0, $pop12
@@ -35,7 +34,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -44,5 +43,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 0842cfd21..ec711228f 100644
--- a/test/torture-s/strct-pack-4.c.s
+++ b/test/torture-s/strct-pack-4.c.s
@@ -6,7 +6,7 @@
 	.type	my_set_a,@function
 my_set_a:                               # @my_set_a
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 171
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ my_set_a:                               # @my_set_a
 	.type	my_set_b,@function
 my_set_b:                               # @my_set_b
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4660
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ my_set_b:                               # @my_set_b
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,5 +41,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2c553de4a..0e97f456a 100644
--- a/test/torture-s/strct-stdarg-1.c.s
+++ b/test/torture-s/strct-stdarg-1.c.s
@@ -8,14 +8,13 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push29=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop26, $pop28
+	i32.const	$push29=, 0
+	i32.store	__stack_pointer($pop29), $4
 	i32.store	12($4), $1
 	block   	
 	block   	
@@ -23,63 +22,61 @@ f:                                      # @f
 	i32.const	$push33=, 1
 	i32.lt_s	$push3=, $0, $pop33
 	br_if   	0, $pop3        # 0: down to label2
-# BB#1:                                 # %for.body.preheader
+# %bb.1:                                # %for.body.preheader
 	i32.const	$2=, 0
 .LBB0_2:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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.const	$push35=, 8
+	i32.add 	$3=, $1, $pop35
+	i32.store	12($4), $3
+	i32.const	$push34=, 10
+	i32.add 	$push4=, $2, $pop34
 	i32.load8_s	$push5=, 0($1)
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	3, $pop6        # 3: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push41=, 20
-	i32.add 	$push10=, $2, $pop41
-	i32.const	$push40=, 1
-	i32.add 	$push11=, $1, $pop40
+	i32.const	$push37=, 20
+	i32.add 	$push10=, $2, $pop37
+	i32.const	$push36=, 1
+	i32.add 	$push11=, $1, $pop36
 	i32.load8_s	$push12=, 0($pop11)
 	i32.ne  	$push13=, $pop10, $pop12
 	br_if   	3, $pop13       # 3: down to label0
-# BB#4:                                 # %if.end9
+# %bb.4:                                # %if.end9
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push43=, 30
-	i32.add 	$push14=, $2, $pop43
-	i32.const	$push42=, 2
-	i32.add 	$push9=, $1, $pop42
+	i32.const	$push39=, 30
+	i32.add 	$push14=, $2, $pop39
+	i32.const	$push38=, 2
+	i32.add 	$push9=, $1, $pop38
 	i32.load8_s	$push0=, 0($pop9)
 	i32.ne  	$push15=, $pop14, $pop0
 	br_if   	3, $pop15       # 3: down to label0
-# BB#5:                                 # %if.end15
+# %bb.5:                                # %if.end15
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push45=, 40
-	i32.add 	$push16=, $2, $pop45
-	i32.const	$push44=, 3
-	i32.add 	$push8=, $1, $pop44
+	i32.const	$push41=, 40
+	i32.add 	$push16=, $2, $pop41
+	i32.const	$push40=, 3
+	i32.add 	$push8=, $1, $pop40
 	i32.load8_s	$push1=, 0($pop8)
 	i32.ne  	$push17=, $pop16, $pop1
 	br_if   	3, $pop17       # 3: down to label0
-# BB#6:                                 # %if.end21
+# %bb.6:                                # %if.end21
                                         #   in Loop: Header=BB0_2 Depth=1
-	i32.const	$push47=, 50
-	i32.add 	$push18=, $2, $pop47
-	i32.const	$push46=, 4
-	i32.add 	$push7=, $1, $pop46
+	i32.const	$push43=, 50
+	i32.add 	$push18=, $2, $pop43
+	i32.const	$push42=, 4
+	i32.add 	$push7=, $1, $pop42
 	i32.load8_s	$push2=, 0($pop7)
 	i32.ne  	$push19=, $pop18, $pop2
 	br_if   	3, $pop19       # 3: down to label0
-# BB#7:                                 # %for.cond
+# %bb.7:                                # %for.cond
                                         #   in Loop: Header=BB0_2 Depth=1
+	i32.const	$push44=, 1
+	i32.add 	$2=, $2, $pop44
 	copy_local	$1=, $3
-	i32.const	$push50=, 1
-	i32.add 	$push49=, $2, $pop50
-	tee_local	$push48=, $2=, $pop49
-	i32.lt_s	$push20=, $pop48, $0
+	i32.lt_s	$push20=, $2, $0
 	br_if   	0, $pop20       # 0: up to label3
 	br      	2               # 2: down to label1
 .LBB0_8:
@@ -95,12 +92,12 @@ f:                                      # @f
 	i32.const	$push24=, 123
 	i32.ne  	$push25=, $pop23, $pop24
 	br_if   	0, $pop25       # 0: down to label0
-# BB#10:                                # %if.end34
+# %bb.10:                               # %if.end34
 	i32.const	$push32=, 0
 	i32.const	$push30=, 16
 	i32.add 	$push31=, $4, $pop30
 	i32.store	__stack_pointer($pop32), $pop31
-	return  	$1
+	return  	$2
 .LBB0_11:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -116,14 +113,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push30=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop27, $pop29
+	i32.const	$push30=, 0
+	i32.store	__stack_pointer($pop30), $0
 	i32.const	$push0=, 56
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 369898281
@@ -187,6 +183,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b3d0fad75..356e17b12 100644
--- a/test/torture-s/strct-varg-1.c.s
+++ b/test/torture-s/strct-varg-1.c.s
@@ -8,46 +8,43 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
+# %bb.0:                                # %entry
 	i32.const	$push25=, 0
 	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 16
-	i32.sub 	$push32=, $pop24, $pop26
-	tee_local	$push31=, $2=, $pop32
-	i32.store	__stack_pointer($pop27), $pop31
+	i32.sub 	$2=, $pop24, $pop26
+	i32.const	$push27=, 0
+	i32.store	__stack_pointer($pop27), $2
 	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 2
 	i32.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.load	$push34=, 12($2)
-	tee_local	$push33=, $0=, $pop34
+# %bb.1:                                # %if.end
+	i32.load	$0=, 12($2)
 	i32.const	$push2=, 8
-	i32.add 	$push3=, $pop33, $pop2
+	i32.add 	$push3=, $0, $pop2
 	i32.store	12($2), $pop3
 	i32.load	$push4=, 0($0)
 	i32.const	$push5=, 43690
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false
+# %bb.2:                                # %lor.lhs.false
 	i32.load	$push7=, 4($0)
 	i32.const	$push8=, 21845
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#3:                                 # %if.end5
+# %bb.3:                                # %if.end5
 	i32.const	$push10=, 12
-	i32.add 	$push36=, $0, $pop10
-	tee_local	$push35=, $1=, $pop36
-	i32.store	12($2), $pop35
+	i32.add 	$1=, $0, $pop10
+	i32.store	12($2), $1
 	i32.const	$push11=, 8
 	i32.add 	$push12=, $0, $pop11
 	i32.load	$push13=, 0($pop12)
 	i32.const	$push14=, 3
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %if.end10
+# %bb.4:                                # %if.end10
 	i32.const	$push16=, 20
 	i32.add 	$push17=, $0, $pop16
 	i32.store	12($2), $pop17
@@ -55,12 +52,12 @@ f:                                      # @f
 	i32.const	$push19=, 65535
 	i32.ne  	$push20=, $pop18, $pop19
 	br_if   	0, $pop20       # 0: down to label0
-# BB#5:                                 # %lor.lhs.false15
+# %bb.5:                                # %lor.lhs.false15
 	i32.load	$push21=, 16($0)
 	i32.const	$push22=, 4369
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#6:                                 # %if.end19
+# %bb.6:                                # %if.end19
 	i32.const	$push30=, 0
 	i32.const	$push28=, 16
 	i32.add 	$push29=, $2, $pop28
@@ -81,14 +78,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i64.const	$push0=, 18764712181759
 	i64.store	32($0), $pop0
 	i64.const	$push1=, 93823560624810
@@ -115,6 +111,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 358f42ea2..45fb7c004 100644
--- a/test/torture-s/string-opt-17.c.s
+++ b/test/torture-s/string-opt-17.c.s
@@ -7,7 +7,7 @@
 test1:                                  # @test1
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, .L.str
 	i32.add 	$push1=, $1, $pop0
 	i32.call	$drop=, strcpy@FUNCTION, $0, $pop1
@@ -24,19 +24,17 @@ test1:                                  # @test1
 	.type	check2,@function
 check2:                                 # @check2
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
+	i32.const	$push3=, 0
+	i32.load8_u	$push0=, check2.r($pop3)
+	br_if   	0, $pop0        # 0: down to label0
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
-	i32.load	$push0=, check2.r($pop4)
-	i32.const	$push1=, 5
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	i32.const	$push3=, 6
-	i32.store	check2.r($pop6), $pop3
-	i32.const	$push5=, 6
-	return  	$pop5
+	i32.const	$push1=, 1
+	i32.store8	check2.r($pop4), $pop1
+	i32.const	$push2=, 6
+	return  	$pop2
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -51,19 +49,17 @@ check2:                                 # @check2
 	.type	test2,@function
 test2:                                  # @test2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
-	i32.const	$push5=, 0
-	i32.load	$push0=, check2.r($pop5)
-	i32.const	$push1=, 5
-	i32.ne  	$push2=, $pop0, $pop1
-	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %check2.exit
-	i32.const	$push6=, 0
-	i32.const	$push3=, 6
-	i32.store	check2.r($pop6), $pop3
-	i32.const	$push4=, 8020322
-	i32.store	0($0):p2align=0, $pop4
+	i32.const	$push3=, 0
+	i32.load8_u	$push0=, check2.r($pop3)
+	br_if   	0, $pop0        # 0: down to label1
+# %bb.1:                                # %check2.exit
+	i32.const	$push4=, 0
+	i32.const	$push1=, 1
+	i32.store8	check2.r($pop4), $pop1
+	i32.const	$push2=, 8020322
+	i32.store	0($0):p2align=0, $pop2
 	return
 .LBB2_2:                                # %if.then.i
 	end_block                       # label1:
@@ -80,43 +76,43 @@ test2:                                  # @test2
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %lor.lhs.false
-	i32.const	$push13=, 0
+# %bb.0:                                # %lor.lhs.false
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
+	i32.const	$push10=, 16
+	i32.sub 	$0=, $pop8, $pop10
 	i32.const	$push11=, 0
-	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.load8_u	$push0=, .L.str+9($pop17)
+	i32.store	__stack_pointer($pop11), $0
+	i32.const	$push15=, 0
+	i32.load8_u	$push0=, .L.str+9($pop15)
 	i32.store8	6($0), $pop0
-	i32.const	$push16=, 0
-	i32.load16_u	$push1=, .L.str+7($pop16):p2align=0
+	i32.const	$push14=, 0
+	i32.load16_u	$push1=, .L.str+7($pop14):p2align=0
 	i32.store16	4($0), $pop1
 	block   	
-	i32.const	$push14=, 4
-	i32.add 	$push15=, $0, $pop14
+	block   	
+	i32.const	$push12=, 4
+	i32.add 	$push13=, $0, $pop12
 	i32.const	$push3=, .L.str.1
 	i32.const	$push2=, 3
-	i32.call	$push4=, memcmp@FUNCTION, $pop15, $pop3, $pop2
-	br_if   	0, $pop4        # 0: down to label2
-# BB#1:                                 # %if.end
-	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	$push9=, 0
-	i32.const	$push8=, 6
-	i32.store	check2.r($pop9), $pop8
-	i32.const	$push21=, 0
-	call    	exit@FUNCTION, $pop21
+	i32.call	$push4=, memcmp@FUNCTION, $pop13, $pop3, $pop2
+	br_if   	0, $pop4        # 0: down to label3
+# %bb.1:                                # %if.end
+	i32.const	$push16=, 0
+	i32.load8_u	$push5=, check2.r($pop16)
+	i32.eqz 	$push18=, $pop5
+	br_if   	1, $pop18       # 1: down to label2
+.LBB3_2:                                # %if.then
+	end_block                       # label3:
+	call    	abort@FUNCTION
 	unreachable
-.LBB3_3:                                # %if.then
+.LBB3_3:                                # %test2.exit
 	end_block                       # label2:
-	call    	abort@FUNCTION
+	i32.const	$push7=, 0
+	i32.const	$push6=, 1
+	i32.store8	check2.r($pop7), $pop6
+	i32.const	$push17=, 0
+	call    	exit@FUNCTION, $pop17
 	unreachable
 	.endfunc
 .Lfunc_end3:
@@ -129,11 +125,11 @@ main:                                   # @main
 	.size	.L.str, 10
 
 	.type	check2.r,@object        # @check2.r
-	.section	.data.check2.r,"aw",@progbits
+	.section	.bss.check2.r,"aw",@nobits
 	.p2align	2
 check2.r:
-	.int32	5                       # 0x5
-	.size	check2.r, 4
+	.int8	0                       # 0x0
+	.size	check2.r, 1
 
 	.type	.L.str.1,@object        # @.str.1
 	.section	.rodata.str1.1,"aMS",@progbits,1
@@ -142,7 +138,7 @@ check2.r:
 	.size	.L.str.1, 3
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f81cce63c..721cac919 100644
--- a/test/torture-s/string-opt-18.c.s
+++ b/test/torture-s/string-opt-18.c.s
@@ -6,7 +6,7 @@
 	.type	test1,@function
 test1:                                  # @test1
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -18,14 +18,14 @@ test1:                                  # @test1
 	.type	test2,@function
 test2:                                  # @test2
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i64.load	$push0=, 0($0):p2align=0
 	i64.store	0($0):p2align=0, $pop0
 	block   	
 	i32.const	$push1=, 1
 	i32.eqz 	$push2=, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -41,7 +41,7 @@ test2:                                  # @test2
 	.type	test3,@function
 test3:                                  # @test3
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end2:
@@ -53,7 +53,7 @@ test3:                                  # @test3
 	.type	test4,@function
 test4:                                  # @test4
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end3:
@@ -65,7 +65,7 @@ test4:                                  # @test4
 	.type	test5,@function
 test5:                                  # @test5
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end4:
@@ -77,7 +77,7 @@ test5:                                  # @test5
 	.type	test6,@function
 test6:                                  # @test6
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end5:
@@ -89,7 +89,7 @@ test6:                                  # @test6
 	.type	test7,@function
 test7:                                  # @test7
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end6:
@@ -102,21 +102,20 @@ test7:                                  # @test7
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push11=, $pop3, $pop5
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop6), $pop10
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i64.load	$push0=, 0($0)
 	i64.store	0($0), $pop0
 	block   	
 	i32.const	$push1=, 1
-	i32.eqz 	$push12=, $pop1
-	br_if   	0, $pop12       # 0: down to label1
-# BB#1:                                 # %test2.exit
+	i32.eqz 	$push10=, $pop1
+	br_if   	0, $pop10       # 0: down to label1
+# %bb.1:                                # %test2.exit
 	i32.const	$push9=, 0
 	i32.const	$push7=, 16
 	i32.add 	$push8=, $0, $pop7
@@ -132,6 +131,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end7-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2b99dd7af..686a3f32e 100644
--- a/test/torture-s/string-opt-5.c.s
+++ b/test/torture-s/string-opt-5.c.s
@@ -7,31 +7,27 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push136=, 0
+# %bb.0:                                # %entry
 	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
+	i32.sub 	$4=, $pop133, $pop135
+	i32.const	$push136=, 0
+	i32.store	__stack_pointer($pop136), $4
+	i32.const	$push140=, 0
+	i32.load	$0=, bar($pop140)
 	block   	
-	i32.const	$push142=, 0
-	i32.load	$push141=, bar($pop142)
-	tee_local	$push140=, $0=, $pop141
-	i32.call	$push0=, strlen@FUNCTION, $pop140
+	i32.call	$push0=, strlen@FUNCTION, $0
 	i32.const	$push1=, 8
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push150=, 0
-	i32.const	$push149=, 0
-	i32.load	$push148=, x($pop149)
-	tee_local	$push147=, $1=, $pop148
+# %bb.1:                                # %if.end
+	i32.const	$push142=, 0
+	i32.load	$1=, x($pop142)
 	i32.const	$push3=, 1
-	i32.add 	$push146=, $pop147, $pop3
-	tee_local	$push145=, $2=, $pop146
-	i32.store	x($pop150), $pop145
+	i32.add 	$2=, $1, $pop3
+	i32.const	$push141=, 0
+	i32.store	x($pop141), $2
 	i32.const	$push4=, 2
 	i32.and 	$push5=, $2, $pop4
 	i32.add 	$push6=, $0, $pop5
@@ -39,47 +35,44 @@ main:                                   # @main
 	i32.const	$push8=, 6
 	i32.ne  	$push9=, $pop7, $pop8
 	br_if   	0, $pop9        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push10=, 7
 	i32.ne  	$push11=, $2, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end25
-	i32.const	$push153=, 0
+# %bb.3:                                # %if.end25
 	i32.const	$push12=, -3
-	i32.add 	$push152=, $1, $pop12
-	tee_local	$push151=, $2=, $pop152
-	i32.store	x($pop153), $pop151
+	i32.add 	$2=, $1, $pop12
+	i32.const	$push143=, 0
+	i32.store	x($pop143), $2
 	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.end32
-	i32.const	$push155=, .L.str.1
-	i32.call	$push17=, strcmp@FUNCTION, $pop155, $0
-	i32.const	$push154=, 0
-	i32.ge_s	$push18=, $pop17, $pop154
+# %bb.4:                                # %if.end32
+	i32.const	$push145=, .L.str.1
+	i32.call	$push17=, strcmp@FUNCTION, $pop145, $0
+	i32.const	$push144=, 0
+	i32.ge_s	$push18=, $pop17, $pop144
 	br_if   	0, $pop18       # 0: down to label0
-# BB#5:                                 # %if.end36
-	i32.const	$push160=, 0
+# %bb.5:                                # %if.end36
 	i32.const	$push19=, -2
-	i32.add 	$push159=, $1, $pop19
-	tee_local	$push158=, $3=, $pop159
-	i32.store	x($pop160), $pop158
-	i32.const	$push157=, .L.str.1
+	i32.add 	$3=, $1, $pop19
+	i32.const	$push148=, 0
+	i32.store	x($pop148), $3
+	i32.const	$push147=, .L.str.1
 	i32.const	$push20=, 1
 	i32.and 	$push21=, $2, $pop20
 	i32.add 	$push22=, $0, $pop21
-	i32.call	$push23=, strcmp@FUNCTION, $pop157, $pop22
-	i32.const	$push156=, 0
-	i32.ge_s	$push24=, $pop23, $pop156
+	i32.call	$push23=, strcmp@FUNCTION, $pop147, $pop22
+	i32.const	$push146=, 0
+	i32.ge_s	$push24=, $pop23, $pop146
 	br_if   	0, $pop24       # 0: down to label0
-# BB#6:                                 # %if.end46
-	i32.const	$push163=, 0
+# %bb.6:                                # %if.end46
 	i32.const	$push25=, -1
-	i32.add 	$push162=, $1, $pop25
-	tee_local	$push161=, $2=, $pop162
-	i32.store	x($pop163), $pop161
+	i32.add 	$2=, $1, $pop25
+	i32.const	$push149=, 0
+	i32.store	x($pop149), $2
 	i32.const	$push26=, 7
 	i32.and 	$push27=, $3, $pop26
 	i32.const	$push28=, .L.str.1
@@ -89,261 +82,256 @@ 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.end56
+# %bb.7:                                # %if.end56
 	i32.const	$push36=, 111
-	i32.call	$push165=, strchr@FUNCTION, $0, $pop36
-	tee_local	$push164=, $3=, $pop165
+	i32.call	$3=, strchr@FUNCTION, $0, $pop36
 	i32.const	$push34=, 4
 	i32.add 	$push35=, $0, $pop34
-	i32.ne  	$push37=, $pop164, $pop35
+	i32.ne  	$push37=, $3, $pop35
 	br_if   	0, $pop37       # 0: down to label0
-# BB#8:                                 # %if.end61
+# %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.end66
+# %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.end70
+# %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.end75
+# %bb.11:                               # %if.end75
 	i32.const	$push46=, 0
 	i32.store	x($pop46), $1
-	i32.const	$push170=, 0
-	i32.const	$push169=, 0
-	i32.load	$push47=, y($pop169)
+	i32.const	$push152=, 0
+	i32.load	$push47=, y($pop152)
 	i32.const	$push48=, -1
-	i32.add 	$push168=, $pop47, $pop48
-	tee_local	$push167=, $0=, $pop168
-	i32.store	y($pop170), $pop167
+	i32.add 	$0=, $pop47, $pop48
+	i32.const	$push151=, 0
+	i32.store	y($pop151), $0
 	i32.const	$push49=, 1
 	i32.and 	$push50=, $2, $pop49
 	i32.const	$push51=, .L.str.1
 	i32.add 	$push52=, $pop50, $pop51
-	i32.const	$push166=, 1
-	i32.and 	$push53=, $0, $pop166
+	i32.const	$push150=, 1
+	i32.and 	$push53=, $0, $pop150
 	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.end84
+# %bb.12:                               # %if.end84
 	br_if   	0, $0           # 0: down to label0
-# BB#13:                                # %if.end88
-	i32.const	$push176=, 0
+# %bb.13:                               # %if.end88
+	i32.const	$push156=, 0
 	i32.const	$push57=, 1
-	i32.store	y($pop176), $pop57
-	i32.const	$push175=, 0
+	i32.store	y($pop156), $pop57
+	i32.const	$push155=, 0
 	i32.const	$push58=, 6
-	i32.store	x($pop175), $pop58
-	i32.const	$push174=, 32
-	i32.store16	5($4):p2align=0, $pop174
+	i32.store	x($pop155), $pop58
+	i32.const	$push154=, 32
+	i32.store16	5($4):p2align=0, $pop154
 	i32.const	$push59=, 1869376613
 	i32.store	1($4):p2align=0, $pop59
-	i32.const	$push173=, 1
-	i32.or  	$push172=, $4, $pop173
-	tee_local	$push171=, $0=, $pop172
+	i32.const	$push153=, 1
+	i32.or  	$0=, $4, $pop153
 	i32.const	$push60=, .L.str.4
-	i32.call	$push61=, strcmp@FUNCTION, $pop171, $pop60
+	i32.call	$push61=, strcmp@FUNCTION, $0, $pop60
 	br_if   	0, $pop61       # 0: down to label0
-# BB#14:                                # %if.end106
-	i32.const	$push187=, 0
-	i32.const	$push186=, 7
-	i32.store	x($pop187), $pop186
-	i32.const	$push185=, 0
+# %bb.14:                               # %if.end106
+	i32.const	$push167=, 0
+	i32.const	$push166=, 7
+	i32.store	x($pop167), $pop166
+	i32.const	$push165=, 0
 	i32.const	$push64=, 2
-	i32.store	y($pop185), $pop64
+	i32.store	y($pop165), $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
+	i64.const	$push164=, 2314885530818453536
+	i64.store	0($pop69), $pop164
 	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
+	i64.const	$push163=, 2314885530818453536
+	i64.store	0($pop71), $pop163
+	i32.const	$push162=, 32
+	i32.add 	$push72=, $4, $pop162
+	i64.const	$push161=, 2314885530818453536
+	i64.store	0($pop72), $pop161
 	i32.const	$push73=, 24
 	i32.add 	$push74=, $4, $pop73
-	i64.const	$push180=, 2314885530818453536
-	i64.store	0($pop74), $pop180
+	i64.const	$push160=, 2314885530818453536
+	i64.store	0($pop74), $pop160
 	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
+	i64.const	$push159=, 2314885530818453536
+	i64.store	0($pop76), $pop159
+	i64.const	$push158=, 2314885530818453536
+	i64.store	8($4), $pop158
+	i64.const	$push157=, 2314885530818453536
+	i64.store	0($4), $pop157
 	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
+# %bb.15:                               # %if.end106
+	i32.const	$push169=, 0
+	i32.load	$push62=, x($pop169)
+	i32.const	$push168=, 7
+	i32.ne  	$push81=, $pop62, $pop168
 	br_if   	0, $pop81       # 0: down to label0
-# BB#16:                                # %if.end106
-	i32.const	$push190=, 0
-	i32.load	$push63=, y($pop190)
+# %bb.16:                               # %if.end106
+	i32.const	$push170=, 0
+	i32.load	$push63=, y($pop170)
 	i32.const	$push82=, 2
 	i32.ne  	$push83=, $pop63, $pop82
 	br_if   	0, $pop83       # 0: down to label0
-# BB#17:                                # %lor.lhs.false123
+# %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
+# %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
+	i64.const	$push177=, 2314885530818453536
+	i64.store	0($pop91), $pop177
 	i32.const	$push92=, 40
 	i32.add 	$push93=, $4, $pop92
-	i64.const	$push196=, 2314885530818453536
-	i64.store	0($pop93), $pop196
+	i64.const	$push176=, 2314885530818453536
+	i64.store	0($pop93), $pop176
 	i32.const	$push94=, 32
 	i32.add 	$push95=, $4, $pop94
-	i64.const	$push195=, 2314885530818453536
-	i64.store	0($pop95), $pop195
+	i64.const	$push175=, 2314885530818453536
+	i64.store	0($pop95), $pop175
 	i32.const	$push96=, 24
 	i32.add 	$push97=, $4, $pop96
-	i64.const	$push194=, 2314885530818453536
-	i64.store	0($pop97), $pop194
+	i64.const	$push174=, 2314885530818453536
+	i64.store	0($pop97), $pop174
 	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
+	i64.const	$push173=, 2314885530818453536
+	i64.store	0($pop99), $pop173
+	i64.const	$push172=, 2314885530818453536
+	i64.store	8($4), $pop172
+	i64.const	$push171=, 2314885530818453536
+	i64.store	0($4), $pop171
 	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
+# %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
+# %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	$push195=, 0
+	i64.const	$push194=, 2314885530818453536
+	i64.store	buf+48($pop195), $pop194
+	i32.const	$push193=, 0
+	i64.const	$push192=, 2314885530818453536
+	i64.store	buf+40($pop193), $pop192
+	i32.const	$push191=, 0
+	i64.const	$push190=, 2314885530818453536
+	i64.store	buf+32($pop191), $pop190
+	i32.const	$push189=, 0
+	i64.const	$push188=, 2314885530818453536
+	i64.store	buf+24($pop189), $pop188
+	i32.const	$push187=, 0
+	i64.const	$push186=, 2314885530818453536
+	i64.store	buf+16($pop187), $pop186
+	i32.const	$push185=, 0
+	i64.const	$push184=, 2314885530818453536
+	i64.store	buf+8($pop185), $pop184
+	i32.const	$push183=, 0
+	i64.const	$push182=, 2314885530818453536
+	i64.store	buf($pop183), $pop182
+	i32.const	$push181=, 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.store	x($pop181), $pop109
+	i32.const	$push180=, 0
+	i32.load	$0=, y($pop180)
 	i32.const	$push110=, 1
-	i32.add 	$push200=, $pop201, $pop110
-	tee_local	$push199=, $1=, $pop200
-	i32.store	y($pop204), $pop199
+	i32.add 	$1=, $0, $pop110
+	i32.const	$push179=, 0
+	i32.store	y($pop179), $1
 	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
+	i32.const	$push178=, 3
+	i32.ne  	$push113=, $1, $pop178
 	br_if   	0, $pop113      # 0: down to label0
-# BB#21:                                # %lor.lhs.false146
+# %bb.21:                               # %lor.lhs.false146
 	i32.const	$push114=, .L.str.9
-	i32.const	$push220=, 3
-	i32.call	$push115=, memcmp@FUNCTION, $2, $pop114, $pop220
+	i32.const	$push196=, 3
+	i32.call	$push115=, memcmp@FUNCTION, $2, $pop114, $pop196
 	br_if   	0, $pop115      # 0: down to label0
-# BB#22:                                # %lor.lhs.false156
-	i32.const	$push223=, 0
+# %bb.22:                               # %lor.lhs.false156
+	i32.const	$push199=, 0
 	i64.const	$push116=, 3255307777713450285
-	i64.store	buf+3($pop223):p2align=0, $pop116
-	i32.const	$push222=, 0
+	i64.store	buf+3($pop199):p2align=0, $pop116
+	i32.const	$push198=, 0
 	i32.const	$push117=, 2
 	i32.add 	$push118=, $0, $pop117
-	i32.store	y($pop222), $pop118
+	i32.store	y($pop198), $pop118
 	i32.const	$push120=, buf
 	i32.const	$push119=, .L.str.10
-	i32.const	$push221=, 11
-	i32.call	$push121=, memcmp@FUNCTION, $pop120, $pop119, $pop221
+	i32.const	$push197=, 11
+	i32.call	$push121=, memcmp@FUNCTION, $pop120, $pop119, $pop197
 	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
+# %bb.23:                               # %lor.lhs.false169
+	i32.const	$push204=, 0
+	i32.const	$push203=, 11
+	i32.store	x($pop204), $pop203
+	i32.const	$push202=, 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.store	y($pop202), $pop123
+	i32.const	$push201=, 0
+	i32.const	$push200=, 0
+	i32.store	buf+11($pop201):p2align=0, $pop200
 	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
+# %bb.24:                               # %lor.lhs.false178
+	i32.const	$push209=, 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.store	x($pop209), $pop128
+	i32.const	$push208=, 0
+	i32.const	$push207=, 0
+	i32.store16	buf+19($pop208):p2align=0, $pop207
+	i32.const	$push206=, 0
+	i32.const	$push205=, 0
+	i32.store	buf+15($pop206):p2align=0, $pop205
 	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
+# %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
+	i32.const	$push210=, 0
+	return  	$pop210
 .LBB0_26:                               # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -462,7 +450,7 @@ buf:
 	.size	.L.str.12, 11
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 96afb6c34..8fb9c31a0 100644
--- a/test/torture-s/strlen-1.c.s
+++ b/test/torture-s/strlen-1.c.s
@@ -7,16 +7,16 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$1=, 0
-	i32.const	$2=, u
+# %bb.0:                                # %entry
+	i32.const	$1=, u
+	i32.const	$2=, 0
 .LBB0_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB0_2 Depth 2
 	block   	
 	loop    	                # label1:
 	i32.const	$push7=, u
-	i32.add 	$0=, $1, $pop7
+	i32.add 	$0=, $2, $pop7
 	i32.const	$3=, 0
 .LBB0_2:                                # %for.body3
                                         #   Parent Loop BB0_1 Depth=1
@@ -25,8 +25,8 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	br_if   	0, $1           # 0: down to label5
-# BB#3:                                 #   in Loop: Header=BB0_2 Depth=2
+	br_if   	0, $2           # 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
@@ -35,10 +35,10 @@ main:                                   # @main
 	end_block                       # label5:
 	i32.const	$push9=, u
 	i32.const	$push8=, 0
-	i32.call	$drop=, memset@FUNCTION, $pop9, $pop8, $1
-	copy_local	$4=, $2
-	i32.eqz 	$push23=, $3
-	br_if   	1, $pop23       # 1: down to label3
+	i32.call	$drop=, memset@FUNCTION, $pop9, $pop8, $2
+	copy_local	$4=, $1
+	i32.eqz 	$push19=, $3
+	br_if   	1, $pop19       # 1: down to label3
 .LBB0_5:                                # %for.body9.lr.ph
                                         #   in Loop: Header=BB0_2 Depth=2
 	end_block                       # label4:
@@ -57,26 +57,24 @@ main:                                   # @main
 	i32.call	$push1=, strlen@FUNCTION, $0
 	i32.ne  	$push2=, $3, $pop1
 	br_if   	2, $pop2        # 2: down to label0
-# BB#7:                                 # %for.cond1
+# %bb.7:                                # %for.cond1
                                         #   in Loop: Header=BB0_2 Depth=2
-	i32.const	$push17=, 1
-	i32.add 	$push16=, $3, $pop17
-	tee_local	$push15=, $3=, $pop16
+	i32.const	$push15=, 1
+	i32.add 	$3=, $3, $pop15
 	i32.const	$push14=, 63
-	i32.le_u	$push3=, $pop15, $pop14
+	i32.le_u	$push3=, $3, $pop14
 	br_if   	0, $pop3        # 0: up to label2
-# BB#8:                                 # %for.inc26
+# %bb.8:                                # %for.inc26
                                         #   in Loop: Header=BB0_1 Depth=1
 	end_loop
-	i32.const	$push22=, 1
-	i32.add 	$2=, $2, $pop22
-	i32.const	$push21=, 1
-	i32.add 	$push20=, $1, $pop21
-	tee_local	$push19=, $1=, $pop20
-	i32.const	$push18=, 8
-	i32.lt_u	$push4=, $pop19, $pop18
+	i32.const	$push18=, 1
+	i32.add 	$1=, $1, $pop18
+	i32.const	$push17=, 1
+	i32.add 	$2=, $2, $pop17
+	i32.const	$push16=, 8
+	i32.lt_u	$push4=, $2, $pop16
 	br_if   	0, $pop4        # 0: up to label1
-# BB#9:                                 # %for.end28
+# %bb.9:                                # %for.end28
 	end_loop
 	i32.const	$push5=, 0
 	call    	exit@FUNCTION, $pop5
@@ -97,7 +95,7 @@ u:
 	.size	u, 96
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a9ee84a00..ccbc9a0f1 100644
--- a/test/torture-s/strncmp-1.c.s
+++ b/test/torture-s/strncmp-1.c.s
@@ -6,14 +6,14 @@
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.call	$0=, strncmp@FUNCTION, $0, $1, $2
 	block   	
 	block   	
 	i32.const	$push0=, -1
 	i32.gt_s	$push1=, $3, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push2=, 0
 	i32.ge_s	$push3=, $0, $pop2
 	br_if   	1, $pop3        # 1: down to label0
@@ -21,7 +21,7 @@ test:                                   # @test
 	end_block                       # label1:
 	block   	
 	br_if   	0, $3           # 0: down to label2
-# BB#3:                                 # %if.else
+# %bb.3:                                # %if.else
 	br_if   	1, $0           # 1: down to label0
 .LBB0_4:                                # %if.else6
 	end_block                       # label2:
@@ -29,7 +29,7 @@ test:                                   # @test
 	i32.const	$push4=, 1
 	i32.lt_s	$push5=, $3, $pop4
 	br_if   	0, $pop5        # 0: down to label3
-# BB#5:                                 # %if.else6
+# %bb.5:                                # %if.else6
 	i32.const	$push6=, 0
 	i32.le_s	$push7=, $0, $pop6
 	br_if   	1, $pop7        # 1: down to label0
@@ -51,17 +51,17 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$0=, 0
-	i32.const	$1=, u1
+# %bb.0:                                # %entry
+	i32.const	$0=, u1
+	i32.const	$1=, 0
 .LBB1_1:                                # %for.body
                                         # =>This Loop Header: Depth=1
                                         #     Child Loop BB1_2 Depth 2
                                         #       Child Loop BB1_3 Depth 3
 	block   	
 	loop    	                # label5:
-	i32.const	$2=, 0
-	i32.const	$3=, u2
+	i32.const	$2=, u2
+	i32.const	$3=, 0
 .LBB1_2:                                # %for.body3
                                         #   Parent Loop BB1_1 Depth=1
                                         # =>  This Loop Header: Depth=2
@@ -76,8 +76,8 @@ main:                                   # @main
 	block   	
 	block   	
 	block   	
-	br_if   	0, $0           # 0: down to label10
-# BB#4:                                 #   in Loop: Header=BB1_3 Depth=3
+	br_if   	0, $1           # 0: down to label10
+# %bb.4:                                #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$5=, u1
 	i32.const	$push32=, u1
 	copy_local	$6=, $pop32
@@ -86,30 +86,29 @@ main:                                   # @main
 .LBB1_5:                                # %for.body9.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label10:
-	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
+	i32.const	$push35=, u1
+	i32.const	$push34=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop35, $pop34, $1
+	copy_local	$5=, $0
+	copy_local	$6=, $5
+	i32.eqz 	$push84=, $4
+	br_if   	1, $pop84       # 1: down to label8
 .LBB1_6:                                # %for.body12.lr.ph
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label9:
-	i32.const	$push38=, 97
-	i32.call	$push0=, memset@FUNCTION, $5, $pop38, $4
+	i32.const	$push36=, 97
+	i32.call	$push0=, memset@FUNCTION, $5, $pop36, $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
+	i64.const	$push37=, 8680820740569200760
+	i64.store	0($6):p2align=0, $pop37
 	block   	
 	block   	
 	block   	
-	br_if   	0, $2           # 0: down to label13
-# BB#8:                                 #   in Loop: Header=BB1_3 Depth=3
+	br_if   	0, $3           # 0: down to label13
+# %bb.8:                                #   in Loop: Header=BB1_3 Depth=3
 	i32.const	$7=, u2
 	i32.const	$push33=, u2
 	copy_local	$8=, $pop33
@@ -118,187 +117,181 @@ main:                                   # @main
 .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
+	i32.const	$push39=, u2
+	i32.const	$push38=, 0
+	i32.call	$drop=, memset@FUNCTION, $pop39, $pop38, $3
+	copy_local	$7=, $2
+	copy_local	$8=, $7
+	i32.eqz 	$push85=, $4
+	br_if   	1, $pop85       # 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.const	$push40=, 97
+	i32.call	$push1=, memset@FUNCTION, $7, $pop40, $4
 	i32.add 	$8=, $pop1, $4
 .LBB1_11:                               # %for.end37
                                         #   in Loop: Header=BB1_3 Depth=3
 	end_block                       # label11:
-	i64.const	$push48=, 8680820740569200760
-	i64.store	0($8):p2align=0, $pop48
-	i32.const	$push47=, 0
-	i32.store8	0($6), $pop47
-	i32.const	$push46=, 0
-	i32.store8	0($8), $pop46
-	i32.const	$push45=, 80
-	i32.call	$push2=, strncmp@FUNCTION, $5, $7, $pop45
+	i64.const	$push43=, 8680820740569200640
+	i64.store	0($8):p2align=0, $pop43
+	i32.const	$push42=, 0
+	i32.store8	0($6), $pop42
+	i32.const	$push41=, 80
+	i32.call	$push2=, strncmp@FUNCTION, $5, $7, $pop41
 	br_if   	3, $pop2        # 3: down to label4
-# BB#12:                                # %test.exit
+# %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 label4
-# BB#13:                                # %test.exit185
+# %bb.13:                               # %test.exit185
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push52=, 97
-	i32.store16	0($6):p2align=0, $pop52
-	i32.const	$push51=, 0
-	i32.store8	0($8), $pop51
-	i32.const	$push50=, 80
-	i32.call	$push4=, strncmp@FUNCTION, $5, $7, $pop50
-	i32.const	$push49=, 0
-	i32.le_s	$push5=, $pop4, $pop49
+	i32.const	$push47=, 97
+	i32.store16	0($6):p2align=0, $pop47
+	i32.const	$push46=, 0
+	i32.store8	0($8), $pop46
+	i32.const	$push45=, 80
+	i32.call	$push4=, strncmp@FUNCTION, $5, $7, $pop45
+	i32.const	$push44=, 0
+	i32.le_s	$push5=, $pop4, $pop44
 	br_if   	3, $pop5        # 3: down to label4
-# BB#14:                                # %test.exit190
+# %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 label4
-# BB#15:                                # %test.exit196
+# %bb.15:                               # %test.exit196
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push56=, 0
-	i32.store8	0($6), $pop56
-	i32.const	$push55=, 97
-	i32.store16	0($8):p2align=0, $pop55
-	i32.const	$push54=, 80
-	i32.call	$push7=, strncmp@FUNCTION, $5, $7, $pop54
-	i32.const	$push53=, 0
-	i32.ge_s	$push8=, $pop7, $pop53
+	i32.const	$push51=, 0
+	i32.store8	0($6), $pop51
+	i32.const	$push50=, 97
+	i32.store16	0($8):p2align=0, $pop50
+	i32.const	$push49=, 80
+	i32.call	$push7=, strncmp@FUNCTION, $5, $7, $pop49
+	i32.const	$push48=, 0
+	i32.ge_s	$push8=, $pop7, $pop48
 	br_if   	3, $pop8        # 3: down to label4
-# BB#16:                                # %test.exit201
+# %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 label4
-# BB#17:                                # %test.exit207
+# %bb.17:                               # %test.exit207
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push60=, 98
-	i32.store16	0($6):p2align=0, $pop60
-	i32.const	$push59=, 99
-	i32.store16	0($8):p2align=0, $pop59
-	i32.const	$push58=, 80
-	i32.call	$push10=, strncmp@FUNCTION, $5, $7, $pop58
-	i32.const	$push57=, 0
-	i32.ge_s	$push11=, $pop10, $pop57
+	i32.const	$push55=, 98
+	i32.store16	0($6):p2align=0, $pop55
+	i32.const	$push54=, 99
+	i32.store16	0($8):p2align=0, $pop54
+	i32.const	$push53=, 80
+	i32.call	$push10=, strncmp@FUNCTION, $5, $7, $pop53
+	i32.const	$push52=, 0
+	i32.ge_s	$push11=, $pop10, $pop52
 	br_if   	3, $pop11       # 3: down to label4
-# BB#18:                                # %test.exit213
+# %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 label4
-# BB#19:                                # %test.exit219
+# %bb.19:                               # %test.exit219
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push64=, 99
-	i32.store16	0($6):p2align=0, $pop64
-	i32.const	$push63=, 98
-	i32.store16	0($8):p2align=0, $pop63
-	i32.const	$push62=, 80
-	i32.call	$push13=, strncmp@FUNCTION, $5, $7, $pop62
-	i32.const	$push61=, 0
-	i32.le_s	$push14=, $pop13, $pop61
+	i32.const	$push59=, 99
+	i32.store16	0($6):p2align=0, $pop59
+	i32.const	$push58=, 98
+	i32.store16	0($8):p2align=0, $pop58
+	i32.const	$push57=, 80
+	i32.call	$push13=, strncmp@FUNCTION, $5, $7, $pop57
+	i32.const	$push56=, 0
+	i32.le_s	$push14=, $pop13, $pop56
 	br_if   	3, $pop14       # 3: down to label4
-# BB#20:                                # %test.exit225
+# %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 label4
-# BB#21:                                # %test.exit231
+# %bb.21:                               # %test.exit231
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push68=, 98
-	i32.store16	0($6):p2align=0, $pop68
-	i32.const	$push67=, 169
-	i32.store16	0($8):p2align=0, $pop67
-	i32.const	$push66=, 80
-	i32.call	$push16=, strncmp@FUNCTION, $5, $7, $pop66
-	i32.const	$push65=, 0
-	i32.ge_s	$push17=, $pop16, $pop65
+	i32.const	$push63=, 98
+	i32.store16	0($6):p2align=0, $pop63
+	i32.const	$push62=, 169
+	i32.store16	0($8):p2align=0, $pop62
+	i32.const	$push61=, 80
+	i32.call	$push16=, strncmp@FUNCTION, $5, $7, $pop61
+	i32.const	$push60=, 0
+	i32.ge_s	$push17=, $pop16, $pop60
 	br_if   	3, $pop17       # 3: down to label4
-# BB#22:                                # %test.exit237
+# %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 label4
-# BB#23:                                # %test.exit243
+# %bb.23:                               # %test.exit243
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push72=, 169
-	i32.store16	0($6):p2align=0, $pop72
-	i32.const	$push71=, 98
-	i32.store16	0($8):p2align=0, $pop71
-	i32.const	$push70=, 80
-	i32.call	$push19=, strncmp@FUNCTION, $5, $7, $pop70
-	i32.const	$push69=, 0
-	i32.le_s	$push20=, $pop19, $pop69
+	i32.const	$push67=, 169
+	i32.store16	0($6):p2align=0, $pop67
+	i32.const	$push66=, 98
+	i32.store16	0($8):p2align=0, $pop66
+	i32.const	$push65=, 80
+	i32.call	$push19=, strncmp@FUNCTION, $5, $7, $pop65
+	i32.const	$push64=, 0
+	i32.le_s	$push20=, $pop19, $pop64
 	br_if   	3, $pop20       # 3: down to label4
-# BB#24:                                # %test.exit249
+# %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 label4
-# BB#25:                                # %test.exit255
+# %bb.25:                               # %test.exit255
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push76=, 169
-	i32.store16	0($6):p2align=0, $pop76
-	i32.const	$push75=, 170
-	i32.store16	0($8):p2align=0, $pop75
-	i32.const	$push74=, 80
-	i32.call	$push22=, strncmp@FUNCTION, $5, $7, $pop74
-	i32.const	$push73=, 0
-	i32.ge_s	$push23=, $pop22, $pop73
+	i32.const	$push71=, 169
+	i32.store16	0($6):p2align=0, $pop71
+	i32.const	$push70=, 170
+	i32.store16	0($8):p2align=0, $pop70
+	i32.const	$push69=, 80
+	i32.call	$push22=, strncmp@FUNCTION, $5, $7, $pop69
+	i32.const	$push68=, 0
+	i32.ge_s	$push23=, $pop22, $pop68
 	br_if   	3, $pop23       # 3: down to label4
-# BB#26:                                # %test.exit261
+# %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 label4
-# BB#27:                                # %test.exit267
+# %bb.27:                               # %test.exit267
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push80=, 170
-	i32.store16	0($6):p2align=0, $pop80
-	i32.const	$push79=, 169
-	i32.store16	0($8):p2align=0, $pop79
-	i32.const	$push78=, 80
-	i32.call	$push25=, strncmp@FUNCTION, $5, $7, $pop78
-	i32.const	$push77=, 0
-	i32.le_s	$push26=, $pop25, $pop77
+	i32.const	$push75=, 170
+	i32.store16	0($6):p2align=0, $pop75
+	i32.const	$push74=, 169
+	i32.store16	0($8):p2align=0, $pop74
+	i32.const	$push73=, 80
+	i32.call	$push25=, strncmp@FUNCTION, $5, $7, $pop73
+	i32.const	$push72=, 0
+	i32.le_s	$push26=, $pop25, $pop72
 	br_if   	3, $pop26       # 3: down to label4
-# BB#28:                                # %test.exit273
+# %bb.28:                               # %test.exit273
                                         #   in Loop: Header=BB1_3 Depth=3
 	i32.call	$push27=, strncmp@FUNCTION, $5, $7, $4
 	br_if   	3, $pop27       # 3: down to label4
-# BB#29:                                # %for.cond4
+# %bb.29:                               # %for.cond4
                                         #   in Loop: Header=BB1_3 Depth=3
-	i32.const	$push84=, 1
-	i32.add 	$push83=, $4, $pop84
-	tee_local	$push82=, $4=, $pop83
-	i32.const	$push81=, 63
-	i32.le_u	$push28=, $pop82, $pop81
+	i32.const	$push77=, 1
+	i32.add 	$4=, $4, $pop77
+	i32.const	$push76=, 63
+	i32.le_u	$push28=, $4, $pop76
 	br_if   	0, $pop28       # 0: up to label7
-# BB#30:                                # %for.inc79
+# %bb.30:                               # %for.inc79
                                         #   in Loop: Header=BB1_2 Depth=2
 	end_loop
-	i32.const	$push89=, 1
-	i32.add 	$3=, $3, $pop89
-	i32.const	$push88=, 1
-	i32.add 	$push87=, $2, $pop88
-	tee_local	$push86=, $2=, $pop87
-	i32.const	$push85=, 8
-	i32.lt_u	$push29=, $pop86, $pop85
+	i32.const	$push80=, 1
+	i32.add 	$2=, $2, $pop80
+	i32.const	$push79=, 1
+	i32.add 	$3=, $3, $pop79
+	i32.const	$push78=, 8
+	i32.lt_u	$push29=, $3, $pop78
 	br_if   	0, $pop29       # 0: up to label6
-# BB#31:                                # %for.inc82
+# %bb.31:                               # %for.inc82
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_loop
-	i32.const	$push94=, 1
-	i32.add 	$1=, $1, $pop94
-	i32.const	$push93=, 1
-	i32.add 	$push92=, $0, $pop93
-	tee_local	$push91=, $0=, $pop92
-	i32.const	$push90=, 8
-	i32.lt_u	$push30=, $pop91, $pop90
+	i32.const	$push83=, 1
+	i32.add 	$0=, $0, $pop83
+	i32.const	$push82=, 1
+	i32.add 	$1=, $1, $pop82
+	i32.const	$push81=, 8
+	i32.lt_u	$push30=, $1, $pop81
 	br_if   	0, $pop30       # 0: up to label5
-# BB#32:                                # %for.end84
+# %bb.32:                               # %for.end84
 	end_loop
 	i32.const	$push31=, 0
 	call    	exit@FUNCTION, $pop31
@@ -326,7 +319,7 @@ u2:
 	.size	u2, 80
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 4a9c6448b..8e3bc2dd7 100644
--- a/test/torture-s/struct-aliasing-1.c.s
+++ b/test/torture-s/struct-aliasing-1.c.s
@@ -8,7 +8,7 @@ foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.load	$2=, 0($1)
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
@@ -26,14 +26,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 16
-	i32.sub 	$push17=, $pop4, $pop6
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop7), $pop16
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push0=, 1
 	i32.store	12($0), $pop0
 	block   	
@@ -45,7 +44,7 @@ main:                                   # @main
 	i32.const	$push15=, 1
 	i32.ne  	$push2=, $pop1, $pop15
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push10=, 0
 	i32.const	$push8=, 16
 	i32.add 	$push9=, $0, $pop8
@@ -61,5 +60,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/struct-cpy-1.c.s b/test/torture-s/struct-cpy-1.c.s
index 8f42be60d..36519838b 100644
--- a/test/torture-s/struct-cpy-1.c.s
+++ b/test/torture-s/struct-cpy-1.c.s
@@ -5,25 +5,7 @@
 	.globl	ini
 	.type	ini,@function
 ini:                                    # @ini
-# BB#0:                                 # %entry
-	i32.const	$push1=, 0
-	i64.const	$push0=, 0
-	i64.store	pty+72($pop1), $pop0
-	i32.const	$push11=, 0
-	i64.const	$push10=, 0
-	i64.store	pty+64($pop11), $pop10
-	i32.const	$push9=, 0
-	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
-	i64.const	$push3=, 17179869187
-	i64.store	pty+48($pop6), $pop3
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.store	pty+80($pop5), $pop4
+# %bb.0:                                # %entry
                                         # fallthrough-return
 	.endfunc
 .Lfunc_end0:
@@ -35,37 +17,12 @@ ini:                                    # @ini
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end
-	i32.const	$push1=, 0
-	i64.const	$push0=, 0
-	i64.store	pty+72($pop1), $pop0
-	i32.const	$push12=, 0
-	i64.const	$push11=, 0
-	i64.store	pty+64($pop12), $pop11
-	i32.const	$push10=, 0
-	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
-	i64.const	$push3=, 17179869187
-	i64.store	pty+48($pop7), $pop3
-	i32.const	$push6=, 0
-	i32.const	$push5=, 0
-	i32.store	pty+80($pop6), $pop5
-	i32.const	$push4=, 0
-                                        # fallthrough-return: $pop4
+# %bb.0:                                # %if.end
+	i32.const	$push0=, 0
+                                        # fallthrough-return: $pop0
 	.endfunc
 .Lfunc_end1:
 	.size	main, .Lfunc_end1-main
                                         # -- End function
-	.type	pty,@object             # @pty
-	.section	.bss.pty,"aw",@nobits
-	.p2align	3
-pty:
-	.skip	88
-	.size	pty, 88
 
-
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/struct-ini-1.c.s b/test/torture-s/struct-ini-1.c.s
index e789bebf9..acecf4404 100644
--- a/test/torture-s/struct-ini-1.c.s
+++ b/test/torture-s/struct-ini-1.c.s
@@ -6,26 +6,26 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push10=, 0
 	i32.load8_u	$push2=, object($pop10)
 	i32.const	$push3=, 88
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push11=, 0
 	i32.load	$push0=, object+4($pop11)
 	i32.const	$push5=, 8
 	i32.ne  	$push6=, $pop0, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push1=, object+8($pop12)
 	i32.const	$push7=, 9
 	i32.ne  	$push8=, $pop1, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push9=, 0
 	call    	exit@FUNCTION, $pop9
 	unreachable
@@ -50,6 +50,6 @@ object:
 	.size	object, 12
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ab84e6e0e..9183609fe 100644
--- a/test/torture-s/struct-ini-2.c.s
+++ b/test/torture-s/struct-ini-2.c.s
@@ -7,29 +7,28 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load16_u	$push15=, x($pop0)
-	tee_local	$push14=, $0=, $pop15
+	i32.load16_u	$0=, x($pop0)
+	block   	
 	i32.const	$push1=, 15
-	i32.and 	$push2=, $pop14, $pop1
+	i32.and 	$push2=, $0, $pop1
 	i32.const	$push3=, 2
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 3840
 	i32.and 	$push6=, $0, $pop5
 	i32.const	$push7=, 768
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#2:                                 # %if.end7
+# %bb.2:                                # %if.end7
 	i32.const	$push9=, 61440
 	i32.and 	$push10=, $0, $pop9
 	i32.const	$push11=, 16384
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#3:                                 # %if.end13
+# %bb.3:                                # %if.end13
 	i32.const	$push13=, 0
 	call    	exit@FUNCTION, $pop13
 	unreachable
@@ -53,6 +52,6 @@ x:
 	.size	x, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f6f2db600..c0dd5ad81 100644
--- a/test/torture-s/struct-ini-3.c.s
+++ b/test/torture-s/struct-ini-3.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -26,5 +26,5 @@ result:
 	.size	result, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 55b27cbf9..69d790319 100644
--- a/test/torture-s/struct-ini-4.c.s
+++ b/test/torture-s/struct-ini-4.c.s
@@ -6,14 +6,14 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, s+12($pop3)
 	i32.const	$push1=, 1
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	call    	exit@FUNCTION, $pop4
 	unreachable
@@ -38,6 +38,6 @@ s:
 	.size	s, 24
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 07076e3bd..a9e7515a6 100644
--- a/test/torture-s/struct-ret-1.c.s
+++ b/test/torture-s/struct-ret-1.c.s
@@ -7,14 +7,13 @@
 f:                                      # @f
 	.param  	i32, i32, i32, f64, i32
 	.local  	i64, i32, f64, f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push31=, 0
+# %bb.0:                                # %entry
 	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.sub 	$9=, $pop28, $pop30
+	i32.const	$push31=, 0
+	i32.store	__stack_pointer($pop31), $9
 	i32.const	$push0=, 12
 	i32.add 	$push1=, $1, $pop0
 	i64.load	$5=, 0($pop1):p2align=2
@@ -86,14 +85,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push39=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop36, $pop38
+	i32.const	$push39=, 0
+	i32.store	__stack_pointer($pop39), $0
 	i32.const	$push1=, 92
 	i32.add 	$push2=, $0, $pop1
 	i32.const	$push74=, 0
@@ -184,9 +182,9 @@ main:                                   # @main
 	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	$push77=, 0
-	call    	exit@FUNCTION, $pop77
+# %bb.1:                                # %if.end
+	i32.const	$push75=, 0
+	call    	exit@FUNCTION, $pop75
 	unreachable
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -402,7 +400,7 @@ fp:
 	.size	fp, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 487db26f1..745b5f27f 100644
--- a/test/torture-s/struct-ret-2.c.s
+++ b/test/torture-s/struct-ret-2.c.s
@@ -6,7 +6,7 @@
 	.type	f,@function
 f:                                      # @f
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 171
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -19,7 +19,7 @@ f:                                      # @f
 	.type	g,@function
 g:                                      # @g
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4660
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -32,7 +32,7 @@ g:                                      # @g
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -41,5 +41,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/switch-1.c.s b/test/torture-s/switch-1.c.s
index b86f693fe..546253107 100644
--- a/test/torture-s/switch-1.c.s
+++ b/test/torture-s/switch-1.c.s
@@ -7,15 +7,14 @@
 foo:                                    # @foo
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
-	block   	
+# %bb.0:                                # %entry
 	i32.const	$push0=, -4
-	i32.add 	$push10=, $0, $pop0
-	tee_local	$push9=, $0=, $pop10
+	i32.add 	$0=, $0, $pop0
+	block   	
 	i32.const	$push1=, 7
-	i32.gt_u	$push2=, $pop9, $pop1
+	i32.gt_u	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %switch.lookup
+# %bb.1:                                # %switch.lookup
 	i32.const	$push4=, 2
 	i32.shl 	$push5=, $0, $pop4
 	i32.const	$push6=, .Lswitch.table.main
@@ -38,99 +37,93 @@ main:                                   # @main
 	.param  	i32
 	.result 	i32
 	.local  	i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	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	$push10=, 4
+	i32.add 	$3=, $2, $pop10
 	i32.const	$4=, 31
 	block   	
-	i32.const	$push11=, 7
-	i32.gt_u	$push0=, $2, $pop11
+	i32.const	$push9=, 7
+	i32.gt_u	$push0=, $2, $pop9
 	br_if   	0, $pop0        # 0: down to label3
-# BB#2:                                 # %switch.lookup
+# %bb.2:                                # %switch.lookup
                                         #   in Loop: Header=BB1_1 Depth=1
 	i32.load	$4=, 0($1)
 .LBB1_3:                                # %foo.exit
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label3:
+	i32.const	$push12=, -4
+	i32.add 	$5=, $3, $pop12
 	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
+	i32.const	$push11=, 7
+	i32.gt_u	$push1=, $5, $pop11
+	br_if   	0, $pop1        # 0: down to label5
+# %bb.4:                                # %foo.exit
                                         #   in Loop: Header=BB1_1 Depth=1
 	block   	
 	block   	
 	block   	
 	block   	
-	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
+	br_table 	$5, 0, 4, 2, 4, 4, 1, 4, 3, 0 # 0: down to label9
+                                        # 4: down to label5
+                                        # 2: down to label7
+                                        # 1: down to label8
+                                        # 3: down to label6
 .LBB1_5:                                # %if.then
                                         #   in Loop: Header=BB1_1 Depth=1
-	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                       # label9:
-	i32.const	$push18=, 30
-	i32.eq  	$push3=, $4, $pop18
-	br_if   	3, $pop3        # 3: down to label5
+	i32.const	$push13=, 30
+	i32.eq  	$push5=, $4, $pop13
+	br_if   	4, $pop5        # 4: down to label4
 	br      	6               # 6: down to label1
-.LBB1_7:                                # %if.then5
+.LBB1_6:                                # %if.then11
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label8:
-	i32.const	$push19=, 30
-	i32.eq  	$push4=, $4, $pop19
-	br_if   	2, $pop4        # 2: down to label5
+	i32.const	$push14=, 30
+	i32.eq  	$push3=, $4, $pop14
+	br_if   	3, $pop3        # 3: down to label4
 	br      	5               # 5: down to label1
-.LBB1_8:                                # %if.then17
+.LBB1_7:                                # %if.then5
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label7:
-	i32.const	$push20=, 30
-	i32.eq  	$push2=, $4, $pop20
-	br_if   	1, $pop2        # 1: down to label5
+	i32.const	$push15=, 30
+	i32.eq  	$push4=, $4, $pop15
+	br_if   	2, $pop4        # 2: down to label4
 	br      	4               # 4: down to label1
-.LBB1_9:                                # %if.else21
+.LBB1_8:                                # %if.then17
                                         #   in Loop: Header=BB1_1 Depth=1
 	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
-	i32.const	$push22=, 64
-	i32.gt_s	$push7=, $3, $pop22
-	br_if   	1, $pop7        # 1: down to label4
-.LBB1_11:                               # %for.body.backedge
+	i32.const	$push16=, 30
+	i32.eq  	$push2=, $4, $pop16
+	br_if   	1, $pop2        # 1: down to label4
+	br      	3               # 3: down to label1
+.LBB1_9:                                # %if.else21
                                         #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label5:
-	i32.const	$push10=, 4
-	i32.add 	$1=, $1, $pop10
-	i32.const	$push9=, 1
-	i32.add 	$2=, $2, $pop9
-	br      	1               # 1: up to label2
-.LBB1_12:                               # %for.end
+	i32.const	$push17=, 31
+	i32.ne  	$push6=, $4, $pop17
+	br_if   	2, $pop6        # 2: down to label1
+.LBB1_10:                               # %for.inc
+                                        #   in Loop: Header=BB1_1 Depth=1
 	end_block                       # label4:
+	i32.const	$push20=, 4
+	i32.add 	$1=, $1, $pop20
+	i32.const	$push19=, 1
+	i32.add 	$2=, $2, $pop19
+	i32.const	$push18=, 65
+	i32.lt_s	$push7=, $3, $pop18
+	br_if   	0, $pop7        # 0: up to label2
+# %bb.11:                               # %for.end
 	end_loop
 	i32.const	$push8=, 0
 	return  	$pop8
-.LBB1_13:                               # %if.then3
+.LBB1_12:                               # %if.then3
 	end_block                       # label1:
 	call    	abort@FUNCTION
 	unreachable
@@ -153,5 +146,5 @@ main:                                   # @main
 	.size	.Lswitch.table.main, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/tstdi-1.c.s b/test/torture-s/tstdi-1.c.s
index b44fb0b47..a2f0160d1 100644
--- a/test/torture-s/tstdi-1.c.s
+++ b/test/torture-s/tstdi-1.c.s
@@ -7,7 +7,7 @@
 feq:                                    # @feq
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 13
 	i32.const	$push1=, 140
 	i64.eqz 	$push0=, $0
@@ -24,7 +24,7 @@ feq:                                    # @feq
 fne:                                    # @fne
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push2=, 140
 	i32.const	$push1=, 13
 	i64.eqz 	$push0=, $0
@@ -41,7 +41,7 @@ fne:                                    # @fne
 flt:                                    # @flt
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 13
 	i32.const	$push2=, 140
 	i64.const	$push0=, 0
@@ -59,7 +59,7 @@ flt:                                    # @flt
 fge:                                    # @fge
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 13
 	i32.const	$push2=, 140
 	i64.const	$push0=, -1
@@ -77,7 +77,7 @@ fge:                                    # @fge
 fgt:                                    # @fgt
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 13
 	i32.const	$push2=, 140
 	i64.const	$push0=, 0
@@ -95,7 +95,7 @@ fgt:                                    # @fgt
 fle:                                    # @fle
 	.param  	i64
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push3=, 13
 	i32.const	$push2=, 140
 	i64.const	$push0=, 1
@@ -112,7 +112,7 @@ fle:                                    # @fle
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.end140
+# %bb.0:                                # %if.end140
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -121,5 +121,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end6-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/unroll-1.c.s b/test/torture-s/unroll-1.c.s
index dcee48fb9..15d2977b4 100644
--- a/test/torture-s/unroll-1.c.s
+++ b/test/torture-s/unroll-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.add 	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -21,7 +21,7 @@ f:                                      # @f
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %while.body
+# %bb.0:                                # %while.body
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -30,5 +30,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/usmul.c.s b/test/torture-s/usmul.c.s
index baf8174ab..82d5c160d 100644
--- a/test/torture-s/usmul.c.s
+++ b/test/torture-s/usmul.c.s
@@ -7,7 +7,7 @@
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.mul 	$push0=, $1, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -21,7 +21,7 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.mul 	$push0=, $1, $0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -34,7 +34,7 @@ bar:                                    # @bar
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, -2
 	i32.const	$push33=, 65535
@@ -42,56 +42,56 @@ main:                                   # @main
 	i32.const	$push2=, -131070
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 2
 	i32.const	$push34=, 65535
 	i32.call	$push5=, foo@FUNCTION, $pop4, $pop34
 	i32.const	$push6=, 131070
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.const	$push8=, -32768
 	i32.const	$push35=, 32768
 	i32.call	$push9=, foo@FUNCTION, $pop8, $pop35
 	i32.const	$push10=, -1073741824
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end8
+# %bb.3:                                # %if.end8
 	i32.const	$push12=, 32767
 	i32.const	$push36=, 32768
 	i32.call	$push13=, foo@FUNCTION, $pop12, $pop36
 	i32.const	$push14=, 1073709056
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	i32.const	$push37=, 65535
 	i32.const	$push16=, -2
 	i32.call	$push17=, bar@FUNCTION, $pop37, $pop16
 	i32.const	$push18=, -131070
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#5:                                 # %if.end16
+# %bb.5:                                # %if.end16
 	i32.const	$push38=, 65535
 	i32.const	$push20=, 2
 	i32.call	$push21=, bar@FUNCTION, $pop38, $pop20
 	i32.const	$push22=, 131070
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#6:                                 # %if.end20
+# %bb.6:                                # %if.end20
 	i32.const	$push39=, 32768
 	i32.const	$push24=, -32768
 	i32.call	$push25=, bar@FUNCTION, $pop39, $pop24
 	i32.const	$push26=, -1073741824
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#7:                                 # %if.end24
+# %bb.7:                                # %if.end24
 	i32.const	$push40=, 32768
 	i32.const	$push28=, 32767
 	i32.call	$push29=, bar@FUNCTION, $pop40, $pop28
 	i32.const	$push30=, 1073709056
 	i32.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#8:                                 # %if.end28
+# %bb.8:                                # %if.end28
 	i32.const	$push32=, 0
 	call    	exit@FUNCTION, $pop32
 	unreachable
@@ -104,6 +104,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 2e0cb658a..3ad9f1677 100644
--- a/test/torture-s/va-arg-1.c.s
+++ b/test/torture-s/va-arg-1.c.s
@@ -8,44 +8,41 @@ f:                                      # @f
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push14=, 0
+# %bb.0:                                # %entry
 	i32.const	$push12=, 0
 	i32.load	$push11=, __stack_pointer($pop12)
 	i32.const	$push13=, 16
-	i32.sub 	$push21=, $pop11, $pop13
-	tee_local	$push20=, $12=, $pop21
-	i32.store	__stack_pointer($pop14), $pop20
+	i32.sub 	$12=, $pop11, $pop13
+	i32.const	$push14=, 0
+	i32.store	__stack_pointer($pop14), $12
 	i32.const	$push0=, 4
-	i32.add 	$push19=, $9, $pop0
-	tee_local	$push18=, $10=, $pop19
-	i32.store	12($12), $pop18
+	i32.add 	$10=, $9, $pop0
+	i32.store	12($12), $10
 	block   	
 	i32.load	$push1=, 0($9)
 	i32.const	$push2=, 10
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 8
-	i32.add 	$push23=, $9, $pop4
-	tee_local	$push22=, $11=, $pop23
-	i32.store	12($12), $pop22
+	i32.add 	$11=, $9, $pop4
+	i32.store	12($12), $11
 	i32.load	$push5=, 0($10)
 	i32.const	$push6=, 11
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $9, $pop8
 	i32.store	12($12), $pop9
 	i32.load	$push10=, 0($11)
 	br_if   	0, $pop10       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push17=, 0
 	i32.const	$push15=, 16
 	i32.add 	$push16=, $12, $pop15
 	i32.store	__stack_pointer($pop17), $pop16
-	return  	$9
+	return  	$12
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -61,14 +58,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push8=, $pop2, $pop4
-	tee_local	$push7=, $0=, $pop8
-	i32.store	__stack_pointer($pop5), $pop7
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 0
 	i32.store	8($0), $pop0
 	i64.const	$push1=, 47244640266
@@ -82,6 +78,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 f9731cfd0..a3331bdc3 100644
--- a/test/torture-s/va-arg-10.c.s
+++ b/test/torture-s/va-arg-10.c.s
@@ -7,12 +7,12 @@
 to_hex:                                 # @to_hex
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 16
 	i32.ge_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, .L.str
 	i32.add 	$push3=, $0, $pop2
 	i32.load8_s	$push4=, 0($pop3)
@@ -32,14 +32,13 @@ to_hex:                                 # @to_hex
 fap:                                    # @fap
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push20=, 0
+# %bb.0:                                # %entry
 	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.sub 	$6=, $pop17, $pop19
+	i32.const	$push20=, 0
+	i32.store	__stack_pointer($pop20), $6
 	i32.store	12($6), $2
 	i32.load	$push2=, 12($6)
 	i32.store	8($6), $pop2
@@ -49,80 +48,75 @@ fap:                                    # @fap
 	i32.sub 	$push4=, $pop3, $0
 	i32.ne  	$push6=, $pop5, $pop4
 	br_if   	0, $pop6        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
+	i32.load8_u	$5=, 0($1)
 	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.eqz 	$push36=, $5
+	br_if   	0, $pop36       # 0: down to label2
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push24=, 1
+	i32.add 	$0=, $1, $pop24
 	i32.load	$2=, 12($6)
 	copy_local	$4=, $5
 .LBB1_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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
+	i32.const	$push26=, 4
+	i32.add 	$3=, $2, $pop26
+	i32.store	12($6), $3
+	i32.load	$2=, 0($2)
+	i32.const	$push25=, 16
+	i32.ge_u	$push7=, $2, $pop25
 	br_if   	2, $pop7        # 2: down to label1
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push36=, .L.str
-	i32.add 	$push9=, $2, $pop36
+	i32.const	$push28=, .L.str
+	i32.add 	$push9=, $2, $pop28
 	i32.load8_u	$push10=, 0($pop9)
-	i32.const	$push35=, 255
-	i32.and 	$push8=, $4, $pop35
+	i32.const	$push27=, 255
+	i32.and 	$push8=, $4, $pop27
 	i32.ne  	$push11=, $pop10, $pop8
 	br_if   	2, $pop11       # 2: down to label1
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push29=, 1
+	i32.add 	$push0=, $0, $pop29
 	copy_local	$0=, $pop0
 	copy_local	$2=, $3
 	br_if   	0, $4           # 0: up to label3
-# BB#6:                                 # %while.end
+# %bb.6:                                # %while.end
 	end_loop
-	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.eqz 	$push37=, $5
+	br_if   	0, $pop37       # 0: down to label2
+# %bb.7:                                # %while.body8.lr.ph
+	i32.const	$push30=, 1
+	i32.add 	$0=, $1, $pop30
 	i32.load	$2=, 8($6)
 .LBB1_8:                                # %while.body8
                                         # =>This Inner Loop Header: Depth=1
 	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=, 16
-	i32.ge_u	$push12=, $pop40, $pop39
+	i32.const	$push32=, 4
+	i32.add 	$4=, $2, $pop32
+	i32.store	8($6), $4
+	i32.load	$2=, 0($2)
+	i32.const	$push31=, 16
+	i32.ge_u	$push12=, $2, $pop31
 	br_if   	2, $pop12       # 2: down to label1
-# BB#9:                                 # %to_hex.exit28
+# %bb.9:                                # %to_hex.exit28
                                         #   in Loop: Header=BB1_8 Depth=1
-	i32.const	$push46=, .L.str
-	i32.add 	$push14=, $2, $pop46
+	i32.const	$push34=, .L.str
+	i32.add 	$push14=, $2, $pop34
 	i32.load8_u	$push15=, 0($pop14)
-	i32.const	$push45=, 255
-	i32.and 	$push13=, $5, $pop45
+	i32.const	$push33=, 255
+	i32.and 	$push13=, $5, $pop33
 	i32.ne  	$push16=, $pop15, $pop13
 	br_if   	2, $pop16       # 2: down to label1
-# BB#10:                                # %while.cond6
+# %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
+	i32.const	$push35=, 1
+	i32.add 	$push1=, $0, $pop35
 	copy_local	$0=, $pop1
 	copy_local	$2=, $4
 	br_if   	0, $5           # 0: up to label4
@@ -149,14 +143,13 @@ fap:                                    # @fap
 f0:                                     # @f0
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $2=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$2=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $2
 	i32.store	12($2), $1
 	i32.const	$push0=, 0
 	call    	fap@FUNCTION, $pop0, $0, $1
@@ -176,14 +169,13 @@ f0:                                     # @f0
 f1:                                     # @f1
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $3=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$3=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $3
 	i32.store	12($3), $2
 	i32.const	$push0=, 1
 	call    	fap@FUNCTION, $pop0, $1, $2
@@ -203,14 +195,13 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $4=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$4=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $4
 	i32.store	12($4), $3
 	i32.const	$push0=, 2
 	call    	fap@FUNCTION, $pop0, $2, $3
@@ -230,14 +221,13 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $5=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$5=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $5
 	i32.store	12($5), $4
 	i32.const	$push0=, 3
 	call    	fap@FUNCTION, $pop0, $3, $4
@@ -257,14 +247,13 @@ f3:                                     # @f3
 f4:                                     # @f4
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $6=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$6=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $6
 	i32.store	12($6), $5
 	i32.const	$push0=, 4
 	call    	fap@FUNCTION, $pop0, $4, $5
@@ -284,14 +273,13 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $7=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$7=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $7
 	i32.store	12($7), $6
 	i32.const	$push0=, 5
 	call    	fap@FUNCTION, $pop0, $5, $6
@@ -311,14 +299,13 @@ f5:                                     # @f5
 f6:                                     # @f6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $8=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$8=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $8
 	i32.store	12($8), $7
 	i32.const	$push0=, 6
 	call    	fap@FUNCTION, $pop0, $6, $7
@@ -338,14 +325,13 @@ f6:                                     # @f6
 f7:                                     # @f7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $9=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$9=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $9
 	i32.store	12($9), $8
 	i32.const	$push0=, 7
 	call    	fap@FUNCTION, $pop0, $7, $8
@@ -365,14 +351,13 @@ f7:                                     # @f7
 f8:                                     # @f8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $10=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$10=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $10
 	i32.store	12($10), $9
 	i32.const	$push0=, 8
 	call    	fap@FUNCTION, $pop0, $8, $9
@@ -392,14 +377,13 @@ f8:                                     # @f8
 f9:                                     # @f9
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $11=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$11=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $11
 	i32.store	12($11), $10
 	i32.const	$push0=, 9
 	call    	fap@FUNCTION, $pop0, $9, $10
@@ -419,14 +403,13 @@ f9:                                     # @f9
 f10:                                    # @f10
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $12=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$12=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $12
 	i32.store	12($12), $11
 	i32.const	$push0=, 10
 	call    	fap@FUNCTION, $pop0, $10, $11
@@ -446,14 +429,13 @@ f10:                                    # @f10
 f11:                                    # @f11
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $13=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$13=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $13
 	i32.store	12($13), $12
 	i32.const	$push0=, 11
 	call    	fap@FUNCTION, $pop0, $11, $12
@@ -473,14 +455,13 @@ f11:                                    # @f11
 f12:                                    # @f12
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $14=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$14=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $14
 	i32.store	12($14), $13
 	i32.const	$push0=, 12
 	call    	fap@FUNCTION, $pop0, $12, $13
@@ -500,14 +481,13 @@ f12:                                    # @f12
 f13:                                    # @f13
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $15=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$15=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $15
 	i32.store	12($15), $14
 	i32.const	$push0=, 13
 	call    	fap@FUNCTION, $pop0, $13, $14
@@ -527,14 +507,13 @@ f13:                                    # @f13
 f14:                                    # @f14
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $16=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$16=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $16
 	i32.store	12($16), $15
 	i32.const	$push0=, 14
 	call    	fap@FUNCTION, $pop0, $14, $15
@@ -554,14 +533,13 @@ f14:                                    # @f14
 f15:                                    # @f15
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push9=, $pop1, $pop3
-	tee_local	$push8=, $17=, $pop9
-	i32.store	__stack_pointer($pop4), $pop8
+	i32.sub 	$17=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $17
 	i32.store	12($17), $16
 	i32.const	$push0=, 15
 	call    	fap@FUNCTION, $pop0, $15, $16
@@ -581,14 +559,13 @@ f15:                                    # @f15
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push84=, 0
+# %bb.0:                                # %entry
 	i32.const	$push82=, 0
 	i32.load	$push81=, __stack_pointer($pop82)
 	i32.const	$push83=, 640
-	i32.sub 	$push292=, $pop81, $pop83
-	tee_local	$push291=, $0=, $pop292
-	i32.store	__stack_pointer($pop84), $pop291
+	i32.sub 	$0=, $pop81, $pop83
+	i32.const	$push84=, 0
+	i32.store	__stack_pointer($pop84), $0
 	i32.const	$push85=, 576
 	i32.add 	$push86=, $0, $pop85
 	i32.const	$push0=, 56
@@ -978,7 +955,7 @@ main:                                   # @main
 	.size	.L.str, 17
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 70d01b052..048441a33 100644
--- a/test/torture-s/va-arg-11.c.s
+++ b/test/torture-s/va-arg-11.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 32
-	i32.sub 	$push11=, $pop5, $pop7
-	tee_local	$push10=, $0=, $pop11
-	i32.store	__stack_pointer($pop8), $pop10
+	i32.sub 	$0=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $0
 	i32.const	$push0=, 16
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push9=, 0
@@ -26,9 +25,9 @@ main:                                   # @main
 	block   	
 	i32.call	$push4=, foo@FUNCTION, $0, $0
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push12=, 0
-	call    	exit@FUNCTION, $pop12
+# %bb.1:                                # %if.end
+	i32.const	$push10=, 0
+	call    	exit@FUNCTION, $pop10
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -43,7 +42,7 @@ main:                                   # @main
 foo:                                    # @foo
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
@@ -60,6 +59,6 @@ foo:                                    # @foo
 	.size	foo, .Lfunc_end1-foo
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b2c528e0e..c2d62c4c9 100644
--- a/test/torture-s/va-arg-12.c.s
+++ b/test/torture-s/va-arg-12.c.s
@@ -7,38 +7,34 @@
 f:                                      # @f
 	.param  	f64, f64, f64, f64, f64, f64, f64, f64, f64, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 16
-	i32.sub 	$push28=, $pop16, $pop18
-	tee_local	$push27=, $12=, $pop28
-	i32.store	__stack_pointer($pop19), $pop27
+	i32.sub 	$12=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $12
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $9, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push26=, $pop1, $pop2
-	tee_local	$push25=, $9=, $pop26
+	i32.and 	$9=, $pop1, $pop2
 	i32.const	$push3=, 8
-	i32.add 	$push24=, $pop25, $pop3
-	tee_local	$push23=, $10=, $pop24
-	i32.store	12($12), $pop23
+	i32.add 	$10=, $9, $pop3
+	i32.store	12($12), $10
 	block   	
 	f64.load	$push4=, 0($9)
 	f64.const	$push5=, 0x1.4p3
 	f64.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 16
-	i32.add 	$push30=, $9, $pop7
-	tee_local	$push29=, $11=, $pop30
-	i32.store	12($12), $pop29
+	i32.add 	$11=, $9, $pop7
+	i32.store	12($12), $11
 	f64.load	$push8=, 0($10)
 	f64.const	$push9=, 0x1.6p3
 	f64.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push11=, 24
 	i32.add 	$push12=, $9, $pop11
 	i32.store	12($12), $pop12
@@ -46,7 +42,7 @@ f:                                      # @f
 	f64.const	$push14=, 0x0p0
 	f64.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push22=, 0
 	i32.const	$push20=, 16
 	i32.add 	$push21=, $12, $pop20
@@ -67,14 +63,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push9=, 0
+# %bb.0:                                # %entry
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 32
-	i32.sub 	$push11=, $pop6, $pop8
-	tee_local	$push10=, $1=, $pop11
-	i32.store	__stack_pointer($pop9), $pop10
+	i32.sub 	$1=, $pop6, $pop8
+	i32.const	$push9=, 0
+	i32.store	__stack_pointer($pop9), $1
 	i32.const	$push0=, 16
 	i32.add 	$push1=, $1, $pop0
 	i64.const	$push2=, 0
@@ -92,6 +87,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 449fe48c4..462d6a411 100644
--- a/test/torture-s/va-arg-13.c.s
+++ b/test/torture-s/va-arg-13.c.s
@@ -6,13 +6,13 @@
 	.type	dummy,@function
 dummy:                                  # @dummy
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.load	$push0=, 0($0)
 	i32.const	$push1=, 1234
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -29,30 +29,29 @@ dummy:                                  # @dummy
 test:                                   # @test
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push16=, $pop7, $pop9
-	tee_local	$push15=, $2=, $pop16
-	i32.store	__stack_pointer($pop10), $pop15
+	i32.sub 	$2=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $2
 	i32.store	4($2), $1
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push14=, 1234
 	i32.ne  	$push2=, $pop1, $pop14
 	br_if   	0, $pop2        # 0: down to label1
-# BB#1:                                 # %dummy.exit
+# %bb.1:                                # %dummy.exit
 	i32.const	$push3=, 4
 	i32.or  	$push0=, $2, $pop3
 	i32.store	0($pop0), $1
 	i32.load	$push4=, 4($2)
 	i32.load	$push5=, 0($pop4)
-	i32.const	$push17=, 1234
-	i32.ne  	$push6=, $pop5, $pop17
+	i32.const	$push15=, 1234
+	i32.ne  	$push6=, $pop5, $pop15
 	br_if   	0, $pop6        # 0: down to label1
-# BB#2:                                 # %dummy.exit15
+# %bb.2:                                # %dummy.exit15
 	i32.const	$push13=, 0
 	i32.const	$push11=, 16
 	i32.add 	$push12=, $2, $pop11
@@ -73,14 +72,13 @@ test:                                   # @test
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop2, $pop4
-	tee_local	$push6=, $0=, $pop7
-	i32.store	__stack_pointer($pop5), $pop6
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 1234
 	i32.store	0($0), $pop0
 	call    	test@FUNCTION, $0, $0
@@ -92,6 +90,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 c292b6de9..10a2ae9f3 100644
--- a/test/torture-s/va-arg-14.c.s
+++ b/test/torture-s/va-arg-14.c.s
@@ -7,14 +7,13 @@
 vat:                                    # @vat
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
+# %bb.0:                                # %entry
 	i32.const	$push25=, 0
 	i32.load	$push24=, __stack_pointer($pop25)
 	i32.const	$push26=, 16
-	i32.sub 	$push35=, $pop24, $pop26
-	tee_local	$push34=, $2=, $pop35
-	i32.store	__stack_pointer($pop27), $pop34
+	i32.sub 	$2=, $pop24, $pop26
+	i32.const	$push27=, 0
+	i32.store	__stack_pointer($pop27), $2
 	i32.store	12($2), $0
 	i32.const	$push33=, 0
 	i32.store	global($pop33), $1
@@ -27,73 +26,68 @@ vat:                                    # @vat
 	i32.const	$push31=, 1
 	i32.ne  	$push2=, $pop1, $pop31
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	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
+# %bb.1:                                # %if.end
+	i32.const	$push37=, 0
+	i32.load	$0=, global($pop37)
+	i32.const	$push36=, 0
+	i32.const	$push35=, 4
+	i32.add 	$push3=, $0, $pop35
+	i32.store	global($pop36), $pop3
 	i32.load	$push4=, 0($0)
-	i32.const	$push36=, 1
-	i32.ne  	$push5=, $pop4, $pop36
+	i32.const	$push34=, 1
+	i32.ne  	$push5=, $pop4, $pop34
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end7
-	i32.load	$push45=, 12($2)
-	tee_local	$push44=, $0=, $pop45
-	i32.const	$push43=, 4
-	i32.add 	$push6=, $pop44, $pop43
+# %bb.2:                                # %if.end7
+	i32.load	$0=, 12($2)
+	i32.const	$push39=, 4
+	i32.add 	$push6=, $0, $pop39
 	i32.store	12($2), $pop6
 	i32.load	$push7=, 0($0)
-	i32.const	$push42=, 1
-	i32.ne  	$push8=, $pop7, $pop42
+	i32.const	$push38=, 1
+	i32.ne  	$push8=, $pop7, $pop38
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end12
-	i32.const	$push48=, 0
-	i32.store	global($pop48), $1
+# %bb.3:                                # %if.end12
+	i32.const	$push42=, 0
+	i32.store	global($pop42), $1
 	i32.store	12($2), $1
-	i32.const	$push47=, 4
-	i32.add 	$push9=, $1, $pop47
+	i32.const	$push41=, 4
+	i32.add 	$push9=, $1, $pop41
 	i32.store	8($2), $pop9
 	i32.load	$push10=, 0($1)
-	i32.const	$push46=, 1
-	i32.ne  	$push11=, $pop10, $pop46
+	i32.const	$push40=, 1
+	i32.ne  	$push11=, $pop10, $pop40
 	br_if   	0, $pop11       # 0: down to label0
-# BB#4:                                 # %if.end19
-	i32.const	$push53=, 0
-	i32.load	$push52=, global($pop53)
-	tee_local	$push51=, $1=, $pop52
-	i32.const	$push50=, 4
-	i32.add 	$push12=, $pop51, $pop50
+# %bb.4:                                # %if.end19
+	i32.const	$push45=, 0
+	i32.load	$1=, global($pop45)
+	i32.const	$push44=, 4
+	i32.add 	$push12=, $1, $pop44
 	i32.store	8($2), $pop12
 	i32.load	$push13=, 0($1)
-	i32.const	$push49=, 1
-	i32.ne  	$push14=, $pop13, $pop49
+	i32.const	$push43=, 1
+	i32.ne  	$push14=, $pop13, $pop43
 	br_if   	0, $pop14       # 0: down to label0
-# BB#5:                                 # %if.end25
+# %bb.5:                                # %if.end25
 	i32.const	$push15=, 0
-	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	$1=, global($pop15)
+	i32.const	$push48=, 0
+	i32.const	$push47=, 4
+	i32.add 	$push16=, $1, $pop47
+	i32.store	global($pop48), $pop16
 	i32.load	$push17=, 0($1)
-	i32.const	$push54=, 1
-	i32.ne  	$push18=, $pop17, $pop54
+	i32.const	$push46=, 1
+	i32.ne  	$push18=, $pop17, $pop46
 	br_if   	0, $pop18       # 0: down to label0
-# BB#6:                                 # %if.end31
-	i32.load	$push60=, 12($2)
-	tee_local	$push59=, $1=, $pop60
+# %bb.6:                                # %if.end31
+	i32.load	$1=, 12($2)
 	i32.const	$push19=, 4
-	i32.add 	$push20=, $pop59, $pop19
+	i32.add 	$push20=, $1, $pop19
 	i32.store	12($2), $pop20
 	i32.load	$push21=, 0($1)
 	i32.const	$push22=, 1
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#7:                                 # %if.end36
+# %bb.7:                                # %if.end36
 	i32.const	$push30=, 0
 	i32.const	$push28=, 16
 	i32.add 	$push29=, $2, $pop28
@@ -114,14 +108,13 @@ vat:                                    # @vat
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop2, $pop4
-	tee_local	$push6=, $0=, $pop7
-	i32.store	__stack_pointer($pop5), $pop6
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, 1
 	i32.store	0($0), $pop0
 	call    	vat@FUNCTION, $0, $0
@@ -142,6 +135,6 @@ global:
 	.size	global, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 b023d3bf6..b1d099f9f 100644
--- a/test/torture-s/va-arg-15.c.s
+++ b/test/torture-s/va-arg-15.c.s
@@ -7,67 +7,64 @@
 vafunction:                             # @vafunction
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
-	i32.const	$push8=, 0
-	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
+# %bb.0:                                # %entry
+	i32.const	$push9=, 0
+	i32.load	$push8=, __stack_pointer($pop9)
+	i32.const	$push10=, 16
+	i32.sub 	$5=, $pop8, $pop10
+	i32.const	$push11=, 0
+	i32.store	__stack_pointer($pop11), $5
 	i32.store	12($5), $1
-	i32.const	$4=, 0
+	i32.const	$2=, 1
 .LBB0_1:                                # %for.body
                                         # =>This Inner Loop Header: Depth=1
 	block   	
 	loop    	                # label1:
-	i32.const	$push17=, 1
-	i32.add 	$2=, $4, $pop17
 	block   	
 	block   	
-	i32.const	$push16=, 1
-	i32.and 	$push0=, $4, $pop16
-	br_if   	0, $pop0        # 0: down to label3
-# BB#2:                                 # %if.else
+	i32.const	$push16=, -1
+	i32.add 	$push0=, $2, $pop16
+	i32.const	$push15=, 1
+	i32.and 	$push1=, $pop0, $pop15
+	br_if   	0, $pop1        # 0: down to label3
+# %bb.2:                                # %if.else
                                         #   in Loop: Header=BB0_1 Depth=1
-	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
+	i32.const	$push17=, 4
+	i32.add 	$3=, $1, $pop17
+	i32.store	12($5), $3
+	i32.load	$4=, 0($1)
+	copy_local	$1=, $3
+	i32.eq  	$push6=, $2, $4
+	br_if   	1, $pop6        # 1: down to label2
 	br      	3               # 3: down to label0
 .LBB0_3:                                # %if.then
                                         #   in Loop: Header=BB0_1 Depth=1
 	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
+	i32.const	$push20=, 7
+	i32.add 	$push2=, $1, $pop20
+	i32.const	$push19=, -8
+	i32.and 	$3=, $pop2, $pop19
+	i32.const	$push18=, 8
+	i32.add 	$1=, $3, $pop18
+	i32.store	12($5), $1
+	f64.load	$push3=, 0($3)
+	f64.convert_s/i32	$push4=, $2
+	f64.ne  	$push5=, $pop3, $pop4
+	br_if   	2, $pop5        # 2: down to label0
 .LBB0_4:                                # %for.inc
                                         #   in Loop: Header=BB0_1 Depth=1
 	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
+	i32.const	$push22=, 1
+	i32.add 	$2=, $2, $pop22
+	i32.const	$push21=, 19
+	i32.lt_u	$push7=, $2, $pop21
+	br_if   	0, $pop7        # 0: up to label1
+# %bb.5:                                # %for.end
 	end_loop
-	i32.const	$push13=, 0
-	i32.const	$push11=, 16
-	i32.add 	$push12=, $5, $pop11
-	i32.store	__stack_pointer($pop13), $pop12
+	i32.const	$push14=, 0
+	i32.const	$push12=, 16
+	i32.add 	$push13=, $5, $pop12
+	i32.store	__stack_pointer($pop14), $pop13
 	return
 .LBB0_6:                                # %if.then4
 	end_block                       # label0:
@@ -84,14 +81,13 @@ vafunction:                             # @vafunction
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push54=, 0
+# %bb.0:                                # %entry
 	i32.const	$push52=, 0
 	i32.load	$push51=, __stack_pointer($pop52)
 	i32.const	$push53=, 144
-	i32.sub 	$push56=, $pop51, $pop53
-	tee_local	$push55=, $0=, $pop56
-	i32.store	__stack_pointer($pop54), $pop55
+	i32.sub 	$0=, $pop51, $pop53
+	i32.const	$push54=, 0
+	i32.store	__stack_pointer($pop54), $0
 	i32.const	$push0=, 136
 	i32.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 4625759767262920704
@@ -169,6 +165,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 d6551b066..a9c039e44 100644
--- a/test/torture-s/va-arg-16.c.s
+++ b/test/torture-s/va-arg-16.c.s
@@ -7,102 +7,92 @@
 vafunction:                             # @vafunction
 	.param  	f64, f64, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push48=, 0
+# %bb.0:                                # %entry
 	i32.const	$push46=, 0
 	i32.load	$push45=, __stack_pointer($pop46)
 	i32.const	$push47=, 16
-	i32.sub 	$push53=, $pop45, $pop47
-	tee_local	$push52=, $5=, $pop53
-	i32.store	__stack_pointer($pop48), $pop52
+	i32.sub 	$5=, $pop45, $pop47
+	i32.const	$push48=, 0
+	i32.store	__stack_pointer($pop48), $5
 	i32.store	12($5), $2
 	block   	
 	f64.const	$push0=, 0x1.bcp9
 	f64.ne  	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	f64.const	$push2=, 0x1.f38p9
 	f64.ne  	$push3=, $1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end4
+# %bb.2:                                # %if.end4
 	i32.load	$push5=, 12($5)
 	i32.const	$push4=, 7
 	i32.add 	$push6=, $pop5, $pop4
 	i32.const	$push7=, -8
-	i32.and 	$push57=, $pop6, $pop7
-	tee_local	$push56=, $2=, $pop57
+	i32.and 	$2=, $pop6, $pop7
 	i32.const	$push8=, 8
-	i32.add 	$push55=, $pop56, $pop8
-	tee_local	$push54=, $3=, $pop55
-	i32.store	12($5), $pop54
+	i32.add 	$3=, $2, $pop8
+	i32.store	12($5), $3
 	f64.load	$push9=, 0($2)
 	f64.const	$push10=, 0x1p0
 	f64.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end7
+# %bb.3:                                # %if.end7
 	i32.const	$push12=, 16
-	i32.add 	$push59=, $2, $pop12
-	tee_local	$push58=, $4=, $pop59
-	i32.store	12($5), $pop58
+	i32.add 	$4=, $2, $pop12
+	i32.store	12($5), $4
 	f64.load	$push13=, 0($3)
 	f64.const	$push14=, 0x1p1
 	f64.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %if.end12
+# %bb.4:                                # %if.end12
 	i32.const	$push16=, 24
-	i32.add 	$push61=, $2, $pop16
-	tee_local	$push60=, $3=, $pop61
-	i32.store	12($5), $pop60
+	i32.add 	$3=, $2, $pop16
+	i32.store	12($5), $3
 	f64.load	$push17=, 0($4)
 	f64.const	$push18=, 0x1.8p1
 	f64.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#5:                                 # %if.end17
+# %bb.5:                                # %if.end17
 	i32.const	$push20=, 32
-	i32.add 	$push63=, $2, $pop20
-	tee_local	$push62=, $4=, $pop63
-	i32.store	12($5), $pop62
+	i32.add 	$4=, $2, $pop20
+	i32.store	12($5), $4
 	f64.load	$push21=, 0($3)
 	f64.const	$push22=, 0x1p2
 	f64.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#6:                                 # %if.end22
+# %bb.6:                                # %if.end22
 	i32.const	$push24=, 40
-	i32.add 	$push65=, $2, $pop24
-	tee_local	$push64=, $3=, $pop65
-	i32.store	12($5), $pop64
+	i32.add 	$3=, $2, $pop24
+	i32.store	12($5), $3
 	f64.load	$push25=, 0($4)
 	f64.const	$push26=, 0x1.4p2
 	f64.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#7:                                 # %if.end27
+# %bb.7:                                # %if.end27
 	i32.const	$push28=, 48
-	i32.add 	$push67=, $2, $pop28
-	tee_local	$push66=, $4=, $pop67
-	i32.store	12($5), $pop66
+	i32.add 	$4=, $2, $pop28
+	i32.store	12($5), $4
 	f64.load	$push29=, 0($3)
 	f64.const	$push30=, 0x1.8p2
 	f64.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#8:                                 # %if.end32
+# %bb.8:                                # %if.end32
 	i32.const	$push32=, 56
-	i32.add 	$push69=, $2, $pop32
-	tee_local	$push68=, $3=, $pop69
-	i32.store	12($5), $pop68
+	i32.add 	$3=, $2, $pop32
+	i32.store	12($5), $3
 	f64.load	$push33=, 0($4)
 	f64.const	$push34=, 0x1.cp2
 	f64.ne  	$push35=, $pop33, $pop34
 	br_if   	0, $pop35       # 0: down to label0
-# BB#9:                                 # %if.end37
+# %bb.9:                                # %if.end37
 	i32.const	$push36=, 64
-	i32.add 	$push71=, $2, $pop36
-	tee_local	$push70=, $4=, $pop71
-	i32.store	12($5), $pop70
+	i32.add 	$4=, $2, $pop36
+	i32.store	12($5), $4
 	f64.load	$push37=, 0($3)
 	f64.const	$push38=, 0x1p3
 	f64.ne  	$push39=, $pop37, $pop38
 	br_if   	0, $pop39       # 0: down to label0
-# BB#10:                                # %if.end42
+# %bb.10:                               # %if.end42
 	i32.const	$push40=, 72
 	i32.add 	$push41=, $2, $pop40
 	i32.store	12($5), $pop41
@@ -110,7 +100,7 @@ vafunction:                             # @vafunction
 	f64.const	$push43=, 0x1.2p3
 	f64.ne  	$push44=, $pop42, $pop43
 	br_if   	0, $pop44       # 0: down to label0
-# BB#11:                                # %if.end47
+# %bb.11:                               # %if.end47
 	i32.const	$push51=, 0
 	i32.const	$push49=, 16
 	i32.add 	$push50=, $5, $pop49
@@ -131,14 +121,13 @@ vafunction:                             # @vafunction
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push29=, 0
+# %bb.0:                                # %entry
 	i32.const	$push27=, 0
 	i32.load	$push26=, __stack_pointer($pop27)
 	i32.const	$push28=, 80
-	i32.sub 	$push31=, $pop26, $pop28
-	tee_local	$push30=, $0=, $pop31
-	i32.store	__stack_pointer($pop29), $pop30
+	i32.sub 	$0=, $pop26, $pop28
+	i32.const	$push29=, 0
+	i32.store	__stack_pointer($pop29), $0
 	i32.const	$push0=, 64
 	i32.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 4621256167635550208
@@ -182,6 +171,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 3effdb44e..2ce9b51f8 100644
--- a/test/torture-s/va-arg-17.c.s
+++ b/test/torture-s/va-arg-17.c.s
@@ -7,92 +7,82 @@
 vafunction:                             # @vafunction
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push43=, 0
+# %bb.0:                                # %entry
 	i32.const	$push41=, 0
 	i32.load	$push40=, __stack_pointer($pop41)
 	i32.const	$push42=, 16
-	i32.sub 	$push52=, $pop40, $pop42
-	tee_local	$push51=, $4=, $pop52
-	i32.store	__stack_pointer($pop43), $pop51
+	i32.sub 	$4=, $pop40, $pop42
+	i32.const	$push43=, 0
+	i32.store	__stack_pointer($pop43), $4
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push50=, $pop1, $pop2
-	tee_local	$push49=, $1=, $pop50
+	i32.and 	$1=, $pop1, $pop2
 	i32.const	$push3=, 8
-	i32.add 	$push48=, $pop49, $pop3
-	tee_local	$push47=, $2=, $pop48
-	i32.store	12($4), $pop47
+	i32.add 	$2=, $1, $pop3
+	i32.store	12($4), $2
 	block   	
 	f64.load	$push4=, 0($1)
 	f64.const	$push5=, 0x1p0
 	f64.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 16
-	i32.add 	$push54=, $1, $pop7
-	tee_local	$push53=, $3=, $pop54
-	i32.store	12($4), $pop53
+	i32.add 	$3=, $1, $pop7
+	i32.store	12($4), $3
 	f64.load	$push8=, 0($2)
 	f64.const	$push9=, 0x1p1
 	f64.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push11=, 24
-	i32.add 	$push56=, $1, $pop11
-	tee_local	$push55=, $2=, $pop56
-	i32.store	12($4), $pop55
+	i32.add 	$2=, $1, $pop11
+	i32.store	12($4), $2
 	f64.load	$push12=, 0($3)
 	f64.const	$push13=, 0x1.8p1
 	f64.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push15=, 32
-	i32.add 	$push58=, $1, $pop15
-	tee_local	$push57=, $3=, $pop58
-	i32.store	12($4), $pop57
+	i32.add 	$3=, $1, $pop15
+	i32.store	12($4), $3
 	f64.load	$push16=, 0($2)
 	f64.const	$push17=, 0x1p2
 	f64.ne  	$push18=, $pop16, $pop17
 	br_if   	0, $pop18       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push19=, 40
-	i32.add 	$push60=, $1, $pop19
-	tee_local	$push59=, $2=, $pop60
-	i32.store	12($4), $pop59
+	i32.add 	$2=, $1, $pop19
+	i32.store	12($4), $2
 	f64.load	$push20=, 0($3)
 	f64.const	$push21=, 0x1.4p2
 	f64.ne  	$push22=, $pop20, $pop21
 	br_if   	0, $pop22       # 0: down to label0
-# BB#5:                                 # %if.end21
+# %bb.5:                                # %if.end21
 	i32.const	$push23=, 48
-	i32.add 	$push62=, $1, $pop23
-	tee_local	$push61=, $3=, $pop62
-	i32.store	12($4), $pop61
+	i32.add 	$3=, $1, $pop23
+	i32.store	12($4), $3
 	f64.load	$push24=, 0($2)
 	f64.const	$push25=, 0x1.8p2
 	f64.ne  	$push26=, $pop24, $pop25
 	br_if   	0, $pop26       # 0: down to label0
-# BB#6:                                 # %if.end26
+# %bb.6:                                # %if.end26
 	i32.const	$push27=, 56
-	i32.add 	$push64=, $1, $pop27
-	tee_local	$push63=, $2=, $pop64
-	i32.store	12($4), $pop63
+	i32.add 	$2=, $1, $pop27
+	i32.store	12($4), $2
 	f64.load	$push28=, 0($3)
 	f64.const	$push29=, 0x1.cp2
 	f64.ne  	$push30=, $pop28, $pop29
 	br_if   	0, $pop30       # 0: down to label0
-# BB#7:                                 # %if.end31
+# %bb.7:                                # %if.end31
 	i32.const	$push31=, 64
-	i32.add 	$push66=, $1, $pop31
-	tee_local	$push65=, $3=, $pop66
-	i32.store	12($4), $pop65
+	i32.add 	$3=, $1, $pop31
+	i32.store	12($4), $3
 	f64.load	$push32=, 0($2)
 	f64.const	$push33=, 0x1p3
 	f64.ne  	$push34=, $pop32, $pop33
 	br_if   	0, $pop34       # 0: down to label0
-# BB#8:                                 # %if.end36
+# %bb.8:                                # %if.end36
 	i32.const	$push35=, 72
 	i32.add 	$push36=, $1, $pop35
 	i32.store	12($4), $pop36
@@ -100,7 +90,7 @@ vafunction:                             # @vafunction
 	f64.const	$push38=, 0x1.2p3
 	f64.ne  	$push39=, $pop37, $pop38
 	br_if   	0, $pop39       # 0: down to label0
-# BB#9:                                 # %if.end41
+# %bb.9:                                # %if.end41
 	i32.const	$push46=, 0
 	i32.const	$push44=, 16
 	i32.add 	$push45=, $4, $pop44
@@ -121,14 +111,13 @@ vafunction:                             # @vafunction
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop24, $pop26
+	i32.const	$push27=, 0
+	i32.store	__stack_pointer($pop27), $0
 	i32.const	$push0=, 64
 	i32.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 4621256167635550208
@@ -170,6 +159,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e46059983..7421e5524 100644
--- a/test/torture-s/va-arg-18.c.s
+++ b/test/torture-s/va-arg-18.c.s
@@ -7,41 +7,38 @@
 f:                                      # @f
 	.param  	f64, f64, f64, f64, f64, f64, f64, f64, f64, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push22=, $pop12, $pop14
-	tee_local	$push21=, $12=, $pop22
-	i32.store	__stack_pointer($pop15), $pop21
+	i32.sub 	$12=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $12
 	i32.const	$push0=, 4
-	i32.add 	$push20=, $9, $pop0
-	tee_local	$push19=, $10=, $pop20
-	i32.store	12($12), $pop19
+	i32.add 	$10=, $9, $pop0
+	i32.store	12($12), $10
 	block   	
 	i32.load	$push1=, 0($9)
 	i32.const	$push2=, 10
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 8
-	i32.add 	$push24=, $9, $pop4
-	tee_local	$push23=, $11=, $pop24
-	i32.store	12($12), $pop23
+	i32.add 	$11=, $9, $pop4
+	i32.store	12($12), $11
 	i32.load	$push5=, 0($10)
 	i32.const	$push6=, 11
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push8=, 12
 	i32.add 	$push9=, $9, $pop8
 	i32.store	12($12), $pop9
 	i32.load	$push10=, 0($11)
-	i32.const	$push25=, 12
-	i32.ne  	$push11=, $pop10, $pop25
+	i32.const	$push19=, 12
+	i32.ne  	$push11=, $pop10, $pop19
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push18=, 0
 	i32.const	$push16=, 16
 	i32.add 	$push17=, $12, $pop16
@@ -62,14 +59,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $1=, $pop8
-	i32.store	__stack_pointer($pop6), $pop7
+	i32.sub 	$1=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $1
 	i32.const	$push0=, 12
 	i32.store	8($1), $pop0
 	i64.const	$push1=, 47244640266
@@ -83,6 +79,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e872908c5..c3ab3f2d1 100644
--- a/test/torture-s/va-arg-19.c.s
+++ b/test/torture-s/va-arg-19.c.s
@@ -7,87 +7,78 @@
 vafunction:                             # @vafunction
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push40=, 0
+# %bb.0:                                # %entry
 	i32.const	$push38=, 0
 	i32.load	$push37=, __stack_pointer($pop38)
 	i32.const	$push39=, 16
-	i32.sub 	$push47=, $pop37, $pop39
-	tee_local	$push46=, $4=, $pop47
-	i32.store	__stack_pointer($pop40), $pop46
+	i32.sub 	$4=, $pop37, $pop39
+	i32.const	$push40=, 0
+	i32.store	__stack_pointer($pop40), $4
 	i32.const	$push0=, 4
-	i32.add 	$push45=, $1, $pop0
-	tee_local	$push44=, $2=, $pop45
-	i32.store	12($4), $pop44
+	i32.add 	$2=, $1, $pop0
+	i32.store	12($4), $2
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 1
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 8
-	i32.add 	$push49=, $1, $pop4
-	tee_local	$push48=, $3=, $pop49
-	i32.store	12($4), $pop48
+	i32.add 	$3=, $1, $pop4
+	i32.store	12($4), $3
 	i32.load	$push5=, 0($2)
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	0, $pop7        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push8=, 12
-	i32.add 	$push51=, $1, $pop8
-	tee_local	$push50=, $2=, $pop51
-	i32.store	12($4), $pop50
+	i32.add 	$2=, $1, $pop8
+	i32.store	12($4), $2
 	i32.load	$push9=, 0($3)
 	i32.const	$push10=, 3
 	i32.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push12=, 16
-	i32.add 	$push53=, $1, $pop12
-	tee_local	$push52=, $3=, $pop53
-	i32.store	12($4), $pop52
+	i32.add 	$3=, $1, $pop12
+	i32.store	12($4), $3
 	i32.load	$push13=, 0($2)
 	i32.const	$push14=, 4
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	0, $pop15       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push16=, 20
-	i32.add 	$push55=, $1, $pop16
-	tee_local	$push54=, $2=, $pop55
-	i32.store	12($4), $pop54
+	i32.add 	$2=, $1, $pop16
+	i32.store	12($4), $2
 	i32.load	$push17=, 0($3)
 	i32.const	$push18=, 5
 	i32.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#5:                                 # %if.end21
+# %bb.5:                                # %if.end21
 	i32.const	$push20=, 24
-	i32.add 	$push57=, $1, $pop20
-	tee_local	$push56=, $3=, $pop57
-	i32.store	12($4), $pop56
+	i32.add 	$3=, $1, $pop20
+	i32.store	12($4), $3
 	i32.load	$push21=, 0($2)
 	i32.const	$push22=, 6
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	0, $pop23       # 0: down to label0
-# BB#6:                                 # %if.end26
+# %bb.6:                                # %if.end26
 	i32.const	$push24=, 28
-	i32.add 	$push59=, $1, $pop24
-	tee_local	$push58=, $2=, $pop59
-	i32.store	12($4), $pop58
+	i32.add 	$2=, $1, $pop24
+	i32.store	12($4), $2
 	i32.load	$push25=, 0($3)
 	i32.const	$push26=, 7
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#7:                                 # %if.end31
+# %bb.7:                                # %if.end31
 	i32.const	$push28=, 32
-	i32.add 	$push61=, $1, $pop28
-	tee_local	$push60=, $3=, $pop61
-	i32.store	12($4), $pop60
+	i32.add 	$3=, $1, $pop28
+	i32.store	12($4), $3
 	i32.load	$push29=, 0($2)
 	i32.const	$push30=, 8
 	i32.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#8:                                 # %if.end36
+# %bb.8:                                # %if.end36
 	i32.const	$push32=, 36
 	i32.add 	$push33=, $1, $pop32
 	i32.store	12($4), $pop33
@@ -95,7 +86,7 @@ vafunction:                             # @vafunction
 	i32.const	$push35=, 9
 	i32.ne  	$push36=, $pop34, $pop35
 	br_if   	0, $pop36       # 0: down to label0
-# BB#9:                                 # %if.end41
+# %bb.9:                                # %if.end41
 	i32.const	$push43=, 0
 	i32.const	$push41=, 16
 	i32.add 	$push42=, $4, $pop41
@@ -116,14 +107,13 @@ vafunction:                             # @vafunction
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 48
-	i32.sub 	$push17=, $pop12, $pop14
-	tee_local	$push16=, $0=, $pop17
-	i32.store	__stack_pointer($pop15), $pop16
+	i32.sub 	$0=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $0
 	i32.const	$push0=, 32
 	i32.add 	$push1=, $0, $pop0
 	i32.const	$push2=, 9
@@ -149,6 +139,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 00a38b022..99532f033 100644
--- a/test/torture-s/va-arg-2.c.s
+++ b/test/torture-s/va-arg-2.c.s
@@ -7,12 +7,12 @@
 to_hex:                                 # @to_hex
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 16
 	i32.ge_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, .L.str
 	i32.add 	$push3=, $0, $pop2
 	i32.load8_s	$push4=, 0($pop3)
@@ -32,56 +32,52 @@ to_hex:                                 # @to_hex
 f0:                                     # @f0
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $4
 	i32.store	12($4), $1
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$1=, 0($0)
 	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.eqz 	$push22=, $1
+	br_if   	0, $pop22       # 0: down to label2
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$0=, $0, $pop16
 	i32.load	$3=, 12($4)
 .LBB1_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$2=, $3, $pop18
+	i32.store	12($4), $2
+	i32.load	$3=, 0($3)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $3, $pop17
 	br_if   	2, $pop4        # 2: down to label1
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $3, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $3, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $1, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $1, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label1
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $0, $pop21
 	copy_local	$0=, $pop0
 	copy_local	$3=, $2
 	br_if   	0, $1           # 0: up to label3
@@ -108,56 +104,52 @@ f0:                                     # @f0
 f1:                                     # @f1
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$5=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $5
 	i32.store	12($5), $2
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$2=, 0($1)
 	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.eqz 	$push22=, $2
+	br_if   	0, $pop22       # 0: down to label5
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$1=, $1, $pop16
 	i32.load	$4=, 12($5)
 .LBB2_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$3=, $4, $pop18
+	i32.store	12($5), $3
+	i32.load	$4=, 0($4)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $4, $pop17
 	br_if   	2, $pop4        # 2: down to label4
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB2_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $4, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $4, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $2, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $2, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label4
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $1, $pop21
 	copy_local	$1=, $pop0
 	copy_local	$4=, $3
 	br_if   	0, $2           # 0: up to label6
@@ -184,56 +176,52 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$6=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $6
 	i32.store	12($6), $3
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$3=, 0($2)
 	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.eqz 	$push22=, $3
+	br_if   	0, $pop22       # 0: down to label8
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$2=, $2, $pop16
 	i32.load	$5=, 12($6)
 .LBB3_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$4=, $5, $pop18
+	i32.store	12($6), $4
+	i32.load	$5=, 0($5)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $5, $pop17
 	br_if   	2, $pop4        # 2: down to label7
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB3_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $5, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $5, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $3, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $3, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label7
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $2, $pop21
 	copy_local	$2=, $pop0
 	copy_local	$5=, $4
 	br_if   	0, $3           # 0: up to label9
@@ -260,56 +248,52 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$7=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $7
 	i32.store	12($7), $4
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$4=, 0($3)
 	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.eqz 	$push22=, $4
+	br_if   	0, $pop22       # 0: down to label11
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$3=, $3, $pop16
 	i32.load	$6=, 12($7)
 .LBB4_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$5=, $6, $pop18
+	i32.store	12($7), $5
+	i32.load	$6=, 0($6)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $6, $pop17
 	br_if   	2, $pop4        # 2: down to label10
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB4_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $6, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $6, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $4, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $4, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label10
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $3, $pop21
 	copy_local	$3=, $pop0
 	copy_local	$6=, $5
 	br_if   	0, $4           # 0: up to label12
@@ -336,56 +320,52 @@ f3:                                     # @f3
 f4:                                     # @f4
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$8=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $8
 	i32.store	12($8), $5
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$5=, 0($4)
 	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.eqz 	$push22=, $5
+	br_if   	0, $pop22       # 0: down to label14
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$4=, $4, $pop16
 	i32.load	$7=, 12($8)
 .LBB5_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$6=, $7, $pop18
+	i32.store	12($8), $6
+	i32.load	$7=, 0($7)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $7, $pop17
 	br_if   	2, $pop4        # 2: down to label13
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB5_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $7, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $7, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $5, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $5, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label13
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $4, $pop21
 	copy_local	$4=, $pop0
 	copy_local	$7=, $6
 	br_if   	0, $5           # 0: up to label15
@@ -412,56 +392,52 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$9=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $9
 	i32.store	12($9), $6
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$6=, 0($5)
 	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.eqz 	$push22=, $6
+	br_if   	0, $pop22       # 0: down to label17
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$5=, $5, $pop16
 	i32.load	$8=, 12($9)
 .LBB6_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$7=, $8, $pop18
+	i32.store	12($9), $7
+	i32.load	$8=, 0($8)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $8, $pop17
 	br_if   	2, $pop4        # 2: down to label16
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB6_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $8, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $8, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $6, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $6, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label16
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $5, $pop21
 	copy_local	$5=, $pop0
 	copy_local	$8=, $7
 	br_if   	0, $6           # 0: up to label18
@@ -488,56 +464,52 @@ f5:                                     # @f5
 f6:                                     # @f6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$10=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $10
 	i32.store	12($10), $7
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$7=, 0($6)
 	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.eqz 	$push22=, $7
+	br_if   	0, $pop22       # 0: down to label20
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$6=, $6, $pop16
 	i32.load	$9=, 12($10)
 .LBB7_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label21:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$8=, $9, $pop18
+	i32.store	12($10), $8
+	i32.load	$9=, 0($9)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $9, $pop17
 	br_if   	2, $pop4        # 2: down to label19
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB7_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $9, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $9, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $7, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $7, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label19
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $6, $pop21
 	copy_local	$6=, $pop0
 	copy_local	$9=, $8
 	br_if   	0, $7           # 0: up to label21
@@ -564,56 +536,52 @@ f6:                                     # @f6
 f7:                                     # @f7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$11=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $11
 	i32.store	12($11), $8
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$8=, 0($7)
 	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.eqz 	$push22=, $8
+	br_if   	0, $pop22       # 0: down to label23
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$7=, $7, $pop16
 	i32.load	$10=, 12($11)
 .LBB8_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label24:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$9=, $10, $pop18
+	i32.store	12($11), $9
+	i32.load	$10=, 0($10)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $10, $pop17
 	br_if   	2, $pop4        # 2: down to label22
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB8_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $10, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $10, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $8, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $8, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label22
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $7, $pop21
 	copy_local	$7=, $pop0
 	copy_local	$10=, $9
 	br_if   	0, $8           # 0: up to label24
@@ -640,56 +608,52 @@ f7:                                     # @f7
 f8:                                     # @f8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$12=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $12
 	i32.store	12($12), $9
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$9=, 0($8)
 	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.eqz 	$push22=, $9
+	br_if   	0, $pop22       # 0: down to label26
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$8=, $8, $pop16
 	i32.load	$11=, 12($12)
 .LBB9_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label27:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$10=, $11, $pop18
+	i32.store	12($12), $10
+	i32.load	$11=, 0($11)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $11, $pop17
 	br_if   	2, $pop4        # 2: down to label25
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB9_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $11, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $11, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $9, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $9, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label25
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $8, $pop21
 	copy_local	$8=, $pop0
 	copy_local	$11=, $10
 	br_if   	0, $9           # 0: up to label27
@@ -716,56 +680,52 @@ f8:                                     # @f8
 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
+# %bb.0:                                # %entry
 	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.sub 	$13=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $13
 	i32.store	12($13), $10
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$10=, 0($9)
 	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.eqz 	$push22=, $10
+	br_if   	0, $pop22       # 0: down to label29
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$9=, $9, $pop16
 	i32.load	$12=, 12($13)
 .LBB10_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label30:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$11=, $12, $pop18
+	i32.store	12($13), $11
+	i32.load	$12=, 0($12)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $12, $pop17
 	br_if   	2, $pop4        # 2: down to label28
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB10_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $12, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $12, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $10, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $10, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label28
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $9, $pop21
 	copy_local	$9=, $pop0
 	copy_local	$12=, $11
 	br_if   	0, $10          # 0: up to label30
@@ -792,56 +752,52 @@ f9:                                     # @f9
 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
+# %bb.0:                                # %entry
 	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.sub 	$14=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $14
 	i32.store	12($14), $11
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$11=, 0($10)
 	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.eqz 	$push22=, $11
+	br_if   	0, $pop22       # 0: down to label32
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$10=, $10, $pop16
 	i32.load	$13=, 12($14)
 .LBB11_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label33:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$12=, $13, $pop18
+	i32.store	12($14), $12
+	i32.load	$13=, 0($13)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $13, $pop17
 	br_if   	2, $pop4        # 2: down to label31
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB11_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $13, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $13, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $11, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $11, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label31
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $10, $pop21
 	copy_local	$10=, $pop0
 	copy_local	$13=, $12
 	br_if   	0, $11          # 0: up to label33
@@ -868,56 +824,52 @@ f10:                                    # @f10
 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
+# %bb.0:                                # %entry
 	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.sub 	$15=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $15
 	i32.store	12($15), $12
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$12=, 0($11)
 	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.eqz 	$push22=, $12
+	br_if   	0, $pop22       # 0: down to label35
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$11=, $11, $pop16
 	i32.load	$14=, 12($15)
 .LBB12_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label36:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$13=, $14, $pop18
+	i32.store	12($15), $13
+	i32.load	$14=, 0($14)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $14, $pop17
 	br_if   	2, $pop4        # 2: down to label34
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $14, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $14, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $12, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $12, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label34
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $11, $pop21
 	copy_local	$11=, $pop0
 	copy_local	$14=, $13
 	br_if   	0, $12          # 0: up to label36
@@ -944,56 +896,52 @@ f11:                                    # @f11
 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	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$16=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $16
 	i32.store	12($16), $13
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$13=, 0($12)
 	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.eqz 	$push22=, $13
+	br_if   	0, $pop22       # 0: down to label38
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$12=, $12, $pop16
 	i32.load	$15=, 12($16)
 .LBB13_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label39:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$14=, $15, $pop18
+	i32.store	12($16), $14
+	i32.load	$15=, 0($15)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $15, $pop17
 	br_if   	2, $pop4        # 2: down to label37
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB13_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $15, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $15, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $13, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $13, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label37
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $12, $pop21
 	copy_local	$12=, $pop0
 	copy_local	$15=, $14
 	br_if   	0, $13          # 0: up to label39
@@ -1020,56 +968,52 @@ f12:                                    # @f12
 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
+# %bb.0:                                # %entry
 	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.sub 	$17=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $17
 	i32.store	12($17), $14
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$14=, 0($13)
 	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.eqz 	$push22=, $14
+	br_if   	0, $pop22       # 0: down to label41
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$13=, $13, $pop16
 	i32.load	$16=, 12($17)
 .LBB14_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label42:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$15=, $16, $pop18
+	i32.store	12($17), $15
+	i32.load	$16=, 0($16)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $16, $pop17
 	br_if   	2, $pop4        # 2: down to label40
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB14_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $16, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $16, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $14, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $14, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label40
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $13, $pop21
 	copy_local	$13=, $pop0
 	copy_local	$16=, $15
 	br_if   	0, $14          # 0: up to label42
@@ -1096,56 +1040,52 @@ f13:                                    # @f13
 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
+# %bb.0:                                # %entry
 	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.sub 	$18=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $18
 	i32.store	12($18), $15
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$15=, 0($14)
 	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.eqz 	$push22=, $15
+	br_if   	0, $pop22       # 0: down to label44
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$14=, $14, $pop16
 	i32.load	$17=, 12($18)
 .LBB15_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label45:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$16=, $17, $pop18
+	i32.store	12($18), $16
+	i32.load	$17=, 0($17)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $17, $pop17
 	br_if   	2, $pop4        # 2: down to label43
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB15_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $17, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $17, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $15, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $15, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label43
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $14, $pop21
 	copy_local	$14=, $pop0
 	copy_local	$17=, $16
 	br_if   	0, $15          # 0: up to label45
@@ -1172,56 +1112,52 @@ f14:                                    # @f14
 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	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$19=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $19
 	i32.store	12($19), $16
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$16=, 0($15)
 	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.eqz 	$push22=, $16
+	br_if   	0, $pop22       # 0: down to label47
+# %bb.2:                                # %while.body.lr.ph
+	i32.const	$push16=, 1
+	i32.add 	$15=, $15, $pop16
 	i32.load	$18=, 12($19)
 .LBB16_3:                               # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label48:
-	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
+	i32.const	$push18=, 4
+	i32.add 	$17=, $18, $pop18
+	i32.store	12($19), $17
+	i32.load	$18=, 0($18)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $18, $pop17
 	br_if   	2, $pop4        # 2: down to label46
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB16_3 Depth=1
-	i32.const	$push28=, .L.str
-	i32.add 	$push6=, $18, $pop28
+	i32.const	$push20=, .L.str
+	i32.add 	$push6=, $18, $pop20
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push27=, 255
-	i32.and 	$push5=, $16, $pop27
+	i32.const	$push19=, 255
+	i32.and 	$push5=, $16, $pop19
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label46
-# BB#5:                                 # %while.cond
+# %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
+	i32.const	$push21=, 1
+	i32.add 	$push0=, $15, $pop21
 	copy_local	$15=, $pop0
 	copy_local	$18=, $17
 	br_if   	0, $16          # 0: up to label48
@@ -1248,14 +1184,13 @@ f15:                                    # @f15
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push84=, 0
+# %bb.0:                                # %entry
 	i32.const	$push82=, 0
 	i32.load	$push81=, __stack_pointer($pop82)
 	i32.const	$push83=, 640
-	i32.sub 	$push292=, $pop81, $pop83
-	tee_local	$push291=, $0=, $pop292
-	i32.store	__stack_pointer($pop84), $pop291
+	i32.sub 	$0=, $pop81, $pop83
+	i32.const	$push84=, 0
+	i32.store	__stack_pointer($pop84), $0
 	i32.const	$push85=, 576
 	i32.add 	$push86=, $0, $pop85
 	i32.const	$push0=, 56
@@ -1645,7 +1580,7 @@ main:                                   # @main
 	.size	.L.str, 17
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 bdd52f12b..f04452c21 100644
--- a/test/torture-s/va-arg-20.c.s
+++ b/test/torture-s/va-arg-20.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $0, $pop0
@@ -16,7 +16,7 @@ foo:                                    # @foo
 	i64.const	$push5=, 16
 	i64.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -33,14 +33,13 @@ foo:                                    # @foo
 bar:                                    # @bar
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop7, $pop9
-	tee_local	$push14=, $3=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.sub 	$3=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $3
 	i32.store	12($3), $2
 	block   	
 	i32.const	$push0=, 7
@@ -51,7 +50,7 @@ bar:                                    # @bar
 	i64.const	$push5=, 16
 	i64.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label1
-# BB#1:                                 # %foo.exit
+# %bb.1:                                # %foo.exit
 	i32.const	$push13=, 0
 	i32.const	$push11=, 16
 	i32.add 	$push12=, $3, $pop11
@@ -72,14 +71,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	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
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i64.const	$push0=, 16
 	i64.store	0($0), $pop0
 	i32.const	$push1=, 0
@@ -93,6 +91,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e2f41785d..aa3e2a10a 100644
--- a/test/torture-s/va-arg-21.c.s
+++ b/test/torture-s/va-arg-21.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
+# %bb.0:                                # %entry
 	i32.const	$push3=, 0
 	i32.load	$push2=, __stack_pointer($pop3)
 	i32.const	$push4=, 16
-	i32.sub 	$push7=, $pop2, $pop4
-	tee_local	$push6=, $0=, $pop7
-	i32.store	__stack_pointer($pop5), $pop6
+	i32.sub 	$0=, $pop2, $pop4
+	i32.const	$push5=, 0
+	i32.store	__stack_pointer($pop5), $0
 	i32.const	$push0=, .L.str.1
 	i32.store	0($0), $pop0
 	call    	doit@FUNCTION, $0, $0
@@ -30,7 +29,7 @@ main:                                   # @main
 doit:                                   # @doit
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 4
 	i32.call	$2=, malloc@FUNCTION, $pop0
 	i32.const	$push3=, 4
@@ -44,7 +43,7 @@ doit:                                   # @doit
 	block   	
 	i32.eqz 	$push4=, $3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	return
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
@@ -66,7 +65,7 @@ doit:                                   # @doit
 	.size	.L.str.1, 13
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7a2592349..4918de38a 100644
--- a/test/torture-s/va-arg-22.c.s
+++ b/test/torture-s/va-arg-22.c.s
@@ -7,26 +7,25 @@
 bar:                                    # @bar
 	.param  	i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.load	$3=, bar.lastc($pop0)
+	i32.load	$2=, bar.lastn($pop0)
+	i32.const	$push13=, 0
+	i32.load	$3=, bar.lastc($pop13)
 	block   	
 	block   	
-	i32.const	$push15=, 0
-	i32.load	$push14=, bar.lastn($pop15)
-	tee_local	$push13=, $2=, $pop14
-	i32.eq  	$push1=, $pop13, $0
+	i32.eq  	$push1=, $2, $0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.ne  	$push2=, $3, $2
 	br_if   	1, $pop2        # 1: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$3=, 0
-	i32.const	$push18=, 0
-	i32.store	bar.lastn($pop18), $0
-	i32.const	$push17=, 0
 	i32.const	$push16=, 0
-	i32.store	bar.lastc($pop17), $pop16
+	i32.store	bar.lastn($pop16), $0
+	i32.const	$push15=, 0
+	i32.const	$push14=, 0
+	i32.store	bar.lastc($pop15), $pop14
 .LBB0_3:                                # %if.end3
 	end_block                       # label1:
 	i32.const	$push3=, 3
@@ -34,11 +33,11 @@ bar:                                    # @bar
 	i32.xor 	$push5=, $3, $pop4
 	i32.const	$push6=, 24
 	i32.shl 	$push7=, $pop5, $pop6
-	i32.const	$push19=, 24
-	i32.shr_s	$push8=, $pop7, $pop19
+	i32.const	$push17=, 24
+	i32.shr_s	$push8=, $pop7, $pop17
 	i32.ne  	$push9=, $pop8, $1
 	br_if   	0, $pop9        # 0: down to label0
-# BB#4:                                 # %if.end8
+# %bb.4:                                # %if.end8
 	i32.const	$push12=, 0
 	i32.const	$push10=, 1
 	i32.add 	$push11=, $3, $pop10
@@ -59,1433 +58,1385 @@ bar:                                    # @bar
 foo:                                    # @foo
 	.param  	i32, i32
 	.local  	i64, i32, i32, i32, i32, i32, i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push470=, 0
+	i32.load	$push469=, __stack_pointer($pop470)
+	i32.const	$push471=, 352
+	i32.sub 	$9=, $pop469, $pop471
+	i32.const	$push472=, 0
+	i32.store	__stack_pointer($pop472), $9
 	block   	
-	i32.const	$push14=, 21
-	i32.ne  	$push15=, $0, $pop14
-	br_if   	0, $pop15       # 0: down to label2
-# BB#1:                                 # %if.end
+	i32.const	$push4=, 21
+	i32.ne  	$push5=, $0, $pop4
+	br_if   	0, $pop5        # 0: down to label2
+# %bb.1:                                # %if.end
 	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)
+	i32.const	$push6=, 4
+	i32.add 	$push7=, $1, $pop6
+	i32.store	12($9), $pop7
+	i32.const	$push8=, 0
+	i32.load	$8=, bar.lastn($pop8)
+	i32.const	$push532=, 0
+	i32.load	$0=, bar.lastc($pop532)
+	i32.load8_s	$3=, 0($1)
 	block   	
-	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  	$push21=, $0, $3
-	br_if   	1, $pop21       # 1: down to label2
-# BB#3:                                 # %if.end.i
+	i32.const	$push9=, 1
+	i32.eq  	$push10=, $8, $pop9
+	br_if   	0, $pop10       # 0: down to label3
+# %bb.2:                                # %if.then.i
+	i32.ne  	$push11=, $0, $8
+	br_if   	1, $pop11       # 1: down to label2
+# %bb.3:                                # %if.end.i
 	i32.const	$0=, 0
-	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
+	i32.const	$push535=, 0
+	i32.const	$push12=, 1
+	i32.store	bar.lastn($pop535), $pop12
+	i32.const	$push534=, 0
+	i32.const	$push533=, 0
+	i32.store	bar.lastc($pop534), $pop533
 .LBB1_4:                                # %if.end3.i
 	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	$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
+	i32.const	$push13=, 24
+	i32.shl 	$push14=, $0, $pop13
+	i32.const	$push537=, 24
+	i32.shr_s	$push15=, $pop14, $pop537
+	i32.const	$push536=, 8
+	i32.xor 	$push16=, $pop15, $pop536
+	i32.ne  	$push17=, $pop16, $3
+	br_if   	0, $pop17       # 0: down to label2
+# %bb.5:                                # %if.then.i312
+	i32.const	$push539=, 0
+	i32.const	$push18=, 1
+	i32.add 	$push19=, $0, $pop18
+	i32.store	bar.lastc($pop539), $pop19
+	i32.const	$push538=, 8
+	i32.add 	$8=, $1, $pop538
+	i32.store	12($9), $8
 	br_if   	0, $0           # 0: down to label2
-# BB#6:                                 # %if.end3.i319
-	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
+# %bb.6:                                # %if.end3.i319
+	i32.const	$push20=, 4
+	i32.add 	$push21=, $1, $pop20
+	i32.load16_u	$0=, 0($pop21):p2align=0
+	i32.const	$push542=, 0
+	i32.const	$push22=, 2
+	i32.store	bar.lastn($pop542), $pop22
+	i32.const	$push541=, 0
+	i32.const	$push540=, 0
+	i32.store	bar.lastc($pop541), $pop540
+	i32.const	$push23=, 255
+	i32.and 	$push24=, $0, $pop23
+	i32.const	$push25=, 16
+	i32.ne  	$push26=, $pop24, $pop25
+	br_if   	0, $pop26       # 0: down to label2
+# %bb.7:                                # %if.end3.i319.1
+	i32.const	$push543=, 0
+	i32.const	$push27=, 1
+	i32.store	bar.lastc($pop543), $pop27
+	i32.const	$push28=, 65280
+	i32.and 	$push29=, $0, $pop28
+	i32.const	$push30=, 4352
+	i32.ne  	$push31=, $pop29, $pop30
+	br_if   	0, $pop31       # 0: down to label2
+# %bb.8:                                # %if.end3.i333
 	i32.const	$push546=, 0
+	i32.const	$push32=, 3
+	i32.store	bar.lastn($pop546), $pop32
+	i32.load16_u	$push33=, 0($8):p2align=0
+	i32.store16	344($9), $pop33
 	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	$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
+	i32.const	$push544=, 0
+	i32.store	bar.lastc($pop545), $pop544
+	i32.const	$push34=, 12
+	i32.add 	$push35=, $1, $pop34
+	i32.store	12($9), $pop35
+	i32.const	$push36=, 2
+	i32.add 	$push37=, $8, $pop36
+	i32.load8_u	$push38=, 0($pop37)
+	i32.store8	346($9), $pop38
+	i32.load8_u	$push40=, 344($9)
+	i32.const	$push39=, 24
+	i32.ne  	$push41=, $pop40, $pop39
 	br_if   	0, $pop41       # 0: down to label2
-# BB#8:                                 # %if.end3.i333
+# %bb.9:                                # %if.end3.i333.1
+	i32.const	$push547=, 0
+	i32.const	$push42=, 1
+	i32.store	bar.lastc($pop547), $pop42
+	i32.load8_u	$push44=, 345($9)
+	i32.const	$push43=, 25
+	i32.ne  	$push45=, $pop44, $pop43
+	br_if   	0, $pop45       # 0: down to label2
+# %bb.10:                               # %if.end3.i333.2
+	i32.const	$push548=, 0
+	i32.const	$push46=, 2
+	i32.store	bar.lastc($pop548), $pop46
+	i32.load8_u	$push48=, 346($9)
+	i32.const	$push47=, 26
+	i32.ne  	$push49=, $pop48, $pop47
+	br_if   	0, $pop49       # 0: down to label2
+# %bb.11:                               # %if.end3.i347
+	i32.const	$push50=, 16
+	i32.add 	$8=, $1, $pop50
+	i32.store	12($9), $8
+	i32.const	$push51=, 12
+	i32.add 	$push52=, $1, $pop51
+	i32.load	$0=, 0($pop52):p2align=0
 	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	$push53=, 4
+	i32.store	bar.lastn($pop551), $pop53
 	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	$push54=, 255
+	i32.and 	$push55=, $0, $pop54
+	i32.const	$push56=, 32
+	i32.ne  	$push57=, $pop55, $pop56
+	br_if   	0, $pop57       # 0: down to label2
+# %bb.12:                               # %if.end3.i347.1
 	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	$push58=, 1
+	i32.store	bar.lastc($pop552), $pop58
+	i32.const	$push59=, 65280
+	i32.and 	$push60=, $0, $pop59
+	i32.const	$push61=, 8448
+	i32.ne  	$push62=, $pop60, $pop61
+	br_if   	0, $pop62       # 0: down to label2
+# %bb.13:                               # %if.end3.i347.2
 	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	$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.const	$push63=, 2
+	i32.store	bar.lastc($pop553), $pop63
+	i32.const	$push64=, 16711680
 	i32.and 	$push65=, $0, $pop64
-	i32.const	$push66=, 32
+	i32.const	$push66=, 2228224
 	i32.ne  	$push67=, $pop65, $pop66
 	br_if   	0, $pop67       # 0: down to label2
-# BB#12:                                # %if.end3.i347.1
-	i32.const	$push559=, 0
-	i32.const	$push68=, 1
-	i32.store	bar.lastc($pop559), $pop68
-	i32.const	$push69=, 65280
+# %bb.14:                               # %if.end3.i347.3
+	i32.const	$push554=, 0
+	i32.const	$push68=, 3
+	i32.store	bar.lastc($pop554), $pop68
+	i32.const	$push69=, -16777216
 	i32.and 	$push70=, $0, $pop69
-	i32.const	$push71=, 8448
+	i32.const	$push71=, 587202560
 	i32.ne  	$push72=, $pop70, $pop71
 	br_if   	0, $pop72       # 0: down to label2
-# BB#13:                                # %if.end3.i347.2
+# %bb.15:                               # %if.end3.i361
+	i32.const	$push557=, 0
+	i32.const	$push73=, 5
+	i32.store	bar.lastn($pop557), $pop73
+	i32.load	$push74=, 0($8):p2align=0
+	i32.store	336($9), $pop74
+	i32.const	$push556=, 0
+	i32.const	$push555=, 0
+	i32.store	bar.lastc($pop556), $pop555
+	i32.const	$push75=, 24
+	i32.add 	$3=, $1, $pop75
+	i32.store	12($9), $3
+	i32.const	$push76=, 4
+	i32.add 	$push77=, $8, $pop76
+	i32.load8_u	$push78=, 0($pop77)
+	i32.store8	340($9), $pop78
+	i32.load8_u	$push80=, 336($9)
+	i32.const	$push79=, 40
+	i32.ne  	$push81=, $pop80, $pop79
+	br_if   	0, $pop81       # 0: down to label2
+# %bb.16:                               # %if.end3.i361.1
+	i32.const	$push558=, 0
+	i32.const	$push82=, 1
+	i32.store	bar.lastc($pop558), $pop82
+	i32.load8_u	$push84=, 337($9)
+	i32.const	$push83=, 41
+	i32.ne  	$push85=, $pop84, $pop83
+	br_if   	0, $pop85       # 0: down to label2
+# %bb.17:                               # %if.end3.i361.2
+	i32.const	$push559=, 0
+	i32.const	$push86=, 2
+	i32.store	bar.lastc($pop559), $pop86
+	i32.load8_u	$push88=, 338($9)
+	i32.const	$push87=, 42
+	i32.ne  	$push89=, $pop88, $pop87
+	br_if   	0, $pop89       # 0: down to label2
+# %bb.18:                               # %if.end3.i361.3
 	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	$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	$push90=, 3
+	i32.store	bar.lastc($pop560), $pop90
+	i32.load8_u	$push92=, 339($9)
+	i32.const	$push91=, 43
+	i32.ne  	$push93=, $pop92, $pop91
+	br_if   	0, $pop93       # 0: down to label2
+# %bb.19:                               # %if.end3.i361.4
+	i32.const	$push562=, 0
+	i32.const	$push561=, 4
+	i32.store	bar.lastc($pop562), $pop561
+	i32.load8_u	$push95=, 340($9)
+	i32.const	$push94=, 44
+	i32.ne  	$push96=, $pop95, $pop94
+	br_if   	0, $pop96       # 0: down to label2
+# %bb.20:                               # %if.end3.i375
 	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	$push97=, 6
+	i32.store	bar.lastn($pop566), $pop97
+	i32.load	$push98=, 0($3):p2align=0
+	i32.store	328($9), $pop98
 	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	$push99=, 32
+	i32.add 	$0=, $1, $pop99
+	i32.store	12($9), $0
+	i32.const	$push563=, 4
+	i32.add 	$push100=, $3, $pop563
+	i32.load16_u	$push101=, 0($pop100):p2align=0
+	i32.store16	332($9), $pop101
+	i32.load8_u	$push103=, 328($9)
+	i32.const	$push102=, 48
+	i32.ne  	$push104=, $pop103, $pop102
+	br_if   	0, $pop104      # 0: down to label2
+# %bb.21:                               # %if.end3.i375.1
 	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	$push105=, 1
+	i32.store	bar.lastc($pop567), $pop105
+	i32.load8_u	$push107=, 329($9)
+	i32.const	$push106=, 49
+	i32.ne  	$push108=, $pop107, $pop106
+	br_if   	0, $pop108      # 0: down to label2
+# %bb.22:                               # %if.end3.i375.2
 	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	$push109=, 2
+	i32.store	bar.lastc($pop568), $pop109
+	i32.load8_u	$push111=, 330($9)
+	i32.const	$push110=, 50
+	i32.ne  	$push112=, $pop111, $pop110
+	br_if   	0, $pop112      # 0: down to label2
+# %bb.23:                               # %if.end3.i375.3
 	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	$push113=, 3
+	i32.store	bar.lastc($pop569), $pop113
+	i32.load8_u	$push115=, 331($9)
+	i32.const	$push114=, 51
+	i32.ne  	$push116=, $pop115, $pop114
+	br_if   	0, $pop116      # 0: down to label2
+# %bb.24:                               # %if.end3.i375.4
+	i32.const	$push570=, 0
+	i32.const	$push117=, 4
+	i32.store	bar.lastc($pop570), $pop117
+	i32.load8_u	$push119=, 332($9)
+	i32.const	$push118=, 52
+	i32.ne  	$push120=, $pop119, $pop118
+	br_if   	0, $pop120      # 0: down to label2
+# %bb.25:                               # %if.end3.i375.5
 	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	$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	$push121=, 5
+	i32.store	bar.lastc($pop571), $pop121
+	i32.load8_u	$push123=, 333($9)
+	i32.const	$push122=, 53
+	i32.ne  	$push124=, $pop123, $pop122
+	br_if   	0, $pop124      # 0: down to label2
+# %bb.26:                               # %if.end3.i389
+	i32.const	$push574=, 0
+	i32.const	$push125=, 7
+	i32.store	bar.lastn($pop574), $pop125
+	i32.load	$push126=, 0($0):p2align=0
+	i32.store	320($9), $pop126
+	i32.const	$push573=, 0
+	i32.const	$push572=, 0
+	i32.store	bar.lastc($pop573), $pop572
+	i32.const	$push127=, 40
+	i32.add 	$push128=, $1, $pop127
+	i32.store	12($9), $pop128
+	i32.const	$push129=, 4
+	i32.add 	$push130=, $0, $pop129
+	i32.load16_u	$push131=, 0($pop130):p2align=0
+	i32.store16	324($9), $pop131
+	i32.const	$push132=, 6
+	i32.add 	$push133=, $0, $pop132
+	i32.load8_u	$push134=, 0($pop133)
+	i32.store8	326($9), $pop134
+	i32.load8_u	$push136=, 320($9)
+	i32.const	$push135=, 56
+	i32.ne  	$push137=, $pop136, $pop135
+	br_if   	0, $pop137      # 0: down to label2
+# %bb.27:                               # %if.end3.i389.1
 	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	$push138=, 1
+	i32.store	bar.lastc($pop575), $pop138
+	i32.load8_u	$push140=, 321($9)
+	i32.const	$push139=, 57
+	i32.ne  	$push141=, $pop140, $pop139
+	br_if   	0, $pop141      # 0: down to label2
+# %bb.28:                               # %if.end3.i389.2
+	i32.const	$push576=, 0
+	i32.const	$push142=, 2
+	i32.store	bar.lastc($pop576), $pop142
+	i32.load8_u	$push144=, 322($9)
+	i32.const	$push143=, 58
+	i32.ne  	$push145=, $pop144, $pop143
+	br_if   	0, $pop145      # 0: down to label2
+# %bb.29:                               # %if.end3.i389.3
+	i32.const	$push577=, 0
+	i32.const	$push146=, 3
+	i32.store	bar.lastc($pop577), $pop146
+	i32.load8_u	$push148=, 323($9)
+	i32.const	$push147=, 59
+	i32.ne  	$push149=, $pop148, $pop147
+	br_if   	0, $pop149      # 0: down to label2
+# %bb.30:                               # %if.end3.i389.4
 	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	$push150=, 4
+	i32.store	bar.lastc($pop578), $pop150
+	i32.load8_u	$push152=, 324($9)
+	i32.const	$push151=, 60
+	i32.ne  	$push153=, $pop152, $pop151
+	br_if   	0, $pop153      # 0: down to label2
+# %bb.31:                               # %if.end3.i389.5
 	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	$push154=, 5
+	i32.store	bar.lastc($pop579), $pop154
+	i32.load8_u	$push156=, 325($9)
+	i32.const	$push155=, 61
+	i32.ne  	$push157=, $pop156, $pop155
+	br_if   	0, $pop157      # 0: down to label2
+# %bb.32:                               # %if.end3.i389.6
 	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	$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	$push158=, 6
+	i32.store	bar.lastc($pop580), $pop158
+	i32.load8_u	$push160=, 326($9)
+	i32.const	$push159=, 62
+	i32.ne  	$push161=, $pop160, $pop159
+	br_if   	0, $pop161      # 0: down to label2
+# %bb.33:                               # %if.end3.i403
+	i32.const	$push583=, 0
+	i32.const	$push162=, 8
+	i32.store	bar.lastn($pop583), $pop162
 	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	$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	$push581=, 0
+	i32.store	bar.lastc($pop582), $pop581
+	i32.const	$push163=, 48
+	i32.add 	$0=, $1, $pop163
+	i32.store	12($9), $0
+	i32.const	$push164=, 40
+	i32.add 	$push165=, $1, $pop164
+	i64.load	$2=, 0($pop165):p2align=0
+	i64.const	$push170=, 255
+	i64.and 	$push171=, $2, $pop170
+	i64.const	$push172=, 64
+	i64.ne  	$push173=, $pop171, $pop172
+	br_if   	0, $pop173      # 0: down to label2
+# %bb.34:                               # %if.end3.i403.1
 	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	$push174=, 1
+	i32.store	bar.lastc($pop584), $pop174
+	i32.wrap/i64	$push175=, $2
+	i32.const	$push176=, 16
+	i32.shl 	$push177=, $pop175, $pop176
+	i32.const	$push178=, -16777216
+	i32.and 	$push179=, $pop177, $pop178
+	i32.const	$push180=, 1090519040
+	i32.ne  	$push181=, $pop179, $pop180
+	br_if   	0, $pop181      # 0: down to label2
+# %bb.35:                               # %if.end3.i403.2
+	i32.const	$push585=, 0
+	i32.const	$push182=, 2
+	i32.store	bar.lastc($pop585), $pop182
+	i64.const	$push169=, 16
+	i64.shr_u	$push0=, $2, $pop169
+	i32.wrap/i64	$push183=, $pop0
+	i32.const	$push184=, 24
+	i32.shl 	$push185=, $pop183, $pop184
+	i32.const	$push186=, 1107296256
+	i32.ne  	$push187=, $pop185, $pop186
+	br_if   	0, $pop187      # 0: down to label2
+# %bb.36:                               # %if.end3.i403.3
 	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	$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	$push188=, 3
+	i32.store	bar.lastc($pop586), $pop188
+	i64.const	$push189=, 4278190080
+	i64.and 	$push190=, $2, $pop189
+	i64.const	$push191=, 1124073472
+	i64.ne  	$push192=, $pop190, $pop191
+	br_if   	0, $pop192      # 0: down to label2
+# %bb.37:                               # %if.end3.i403.4
 	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	$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	$push193=, 4
+	i32.store	bar.lastc($pop588), $pop193
+	i64.const	$push168=, 32
+	i64.shr_u	$push1=, $2, $pop168
+	i32.wrap/i64	$push194=, $pop1
+	i32.const	$push587=, 24
+	i32.shl 	$push195=, $pop194, $pop587
+	i32.const	$push196=, 1140850688
+	i32.ne  	$push197=, $pop195, $pop196
+	br_if   	0, $pop197      # 0: down to label2
+# %bb.38:                               # %if.end3.i403.5
 	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	$push198=, 5
+	i32.store	bar.lastc($pop590), $pop198
+	i64.const	$push167=, 40
+	i64.shr_u	$push2=, $2, $pop167
+	i32.wrap/i64	$push199=, $pop2
+	i32.const	$push589=, 24
+	i32.shl 	$push200=, $pop199, $pop589
+	i32.const	$push201=, 1157627904
+	i32.ne  	$push202=, $pop200, $pop201
+	br_if   	0, $pop202      # 0: down to label2
+# %bb.39:                               # %if.end3.i403.6
 	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	$push598=, 0
-	i32.const	$push172=, 8
-	i32.store	bar.lastn($pop598), $pop172
-	i32.const	$push597=, 0
+	i32.const	$push203=, 6
+	i32.store	bar.lastc($pop591), $pop203
+	i64.const	$push166=, 48
+	i64.shr_u	$push3=, $2, $pop166
+	i32.wrap/i64	$push204=, $pop3
+	i32.const	$push205=, 24
+	i32.shl 	$push206=, $pop204, $pop205
+	i32.const	$push207=, 1174405120
+	i32.ne  	$push208=, $pop206, $pop207
+	br_if   	0, $pop208      # 0: down to label2
+# %bb.40:                               # %if.end3.i403.7
+	i32.const	$push592=, 0
+	i32.const	$push209=, 7
+	i32.store	bar.lastc($pop592), $pop209
+	i64.const	$push210=, -72057594037927936
+	i64.and 	$push211=, $2, $pop210
+	i64.const	$push212=, 5116089176692883456
+	i64.ne  	$push213=, $pop211, $pop212
+	br_if   	0, $pop213      # 0: down to label2
+# %bb.41:                               # %if.end3.i417
 	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	$push214=, 9
+	i32.store	bar.lastn($pop596), $pop214
+	i32.const	$push476=, 304
+	i32.add 	$push477=, $9, $pop476
+	i32.const	$push215=, 8
+	i32.add 	$push218=, $pop477, $pop215
+	i32.const	$push595=, 8
+	i32.add 	$push216=, $0, $pop595
+	i32.load8_u	$push217=, 0($pop216)
+	i32.store8	0($pop218), $pop217
+	i64.load	$push219=, 0($0):p2align=0
+	i64.store	304($9), $pop219
+	i32.const	$push594=, 0
+	i32.const	$push593=, 0
+	i32.store	bar.lastc($pop594), $pop593
+	i32.const	$push220=, 60
+	i32.add 	$0=, $1, $pop220
+	i32.store	12($9), $0
+	i32.load8_u	$push222=, 304($9)
+	i32.const	$push221=, 72
+	i32.ne  	$push223=, $pop222, $pop221
+	br_if   	0, $pop223      # 0: down to label2
+# %bb.42:                               # %if.end3.i417.1
+	i32.const	$push597=, 0
+	i32.const	$push224=, 1
+	i32.store	bar.lastc($pop597), $pop224
+	i32.load8_u	$push226=, 305($9)
+	i32.const	$push225=, 73
+	i32.ne  	$push227=, $pop226, $pop225
+	br_if   	0, $pop227      # 0: down to label2
+# %bb.43:                               # %if.end3.i417.2
+	i32.const	$push598=, 0
+	i32.const	$push228=, 2
+	i32.store	bar.lastc($pop598), $pop228
+	i32.load8_u	$push230=, 306($9)
+	i32.const	$push229=, 74
+	i32.ne  	$push231=, $pop230, $pop229
+	br_if   	0, $pop231      # 0: down to label2
+# %bb.44:                               # %if.end3.i417.3
 	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	$push232=, 3
+	i32.store	bar.lastc($pop599), $pop232
+	i32.load8_u	$push234=, 307($9)
+	i32.const	$push233=, 75
+	i32.ne  	$push235=, $pop234, $pop233
+	br_if   	0, $pop235      # 0: down to label2
+# %bb.45:                               # %if.end3.i417.4
 	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	$push236=, 4
+	i32.store	bar.lastc($pop600), $pop236
+	i32.load8_u	$push238=, 308($9)
+	i32.const	$push237=, 76
+	i32.ne  	$push239=, $pop238, $pop237
+	br_if   	0, $pop239      # 0: down to label2
+# %bb.46:                               # %if.end3.i417.5
 	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	$push240=, 5
+	i32.store	bar.lastc($pop601), $pop240
+	i32.load8_u	$push242=, 309($9)
+	i32.const	$push241=, 77
+	i32.ne  	$push243=, $pop242, $pop241
+	br_if   	0, $pop243      # 0: down to label2
+# %bb.47:                               # %if.end3.i417.6
+	i32.const	$push602=, 0
+	i32.const	$push244=, 6
+	i32.store	bar.lastc($pop602), $pop244
+	i32.load8_u	$push246=, 310($9)
+	i32.const	$push245=, 78
+	i32.ne  	$push247=, $pop246, $pop245
+	br_if   	0, $pop247      # 0: down to label2
+# %bb.48:                               # %if.end3.i417.7
 	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	$push248=, 7
+	i32.store	bar.lastc($pop603), $pop248
+	i32.load8_u	$push250=, 311($9)
+	i32.const	$push249=, 79
+	i32.ne  	$push251=, $pop250, $pop249
+	br_if   	0, $pop251      # 0: down to label2
+# %bb.49:                               # %if.end3.i417.8
 	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	$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	$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	$push604=, 8
+	i32.store	bar.lastc($pop605), $pop604
+	i32.load8_u	$push253=, 312($9)
+	i32.const	$push252=, 64
+	i32.ne  	$push254=, $pop253, $pop252
+	br_if   	0, $pop254      # 0: down to label2
+# %bb.50:                               # %bar.exit420.8
 	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	$push255=, 10
+	i32.store	bar.lastn($pop610), $pop255
+	i32.const	$push478=, 288
+	i32.add 	$push479=, $9, $pop478
+	i32.const	$push609=, 8
+	i32.add 	$push258=, $pop479, $pop609
+	i32.const	$push608=, 8
+	i32.add 	$push256=, $0, $pop608
+	i32.load16_u	$push257=, 0($pop256):p2align=0
+	i32.store16	0($pop258), $pop257
+	i64.load	$push259=, 0($0):p2align=0
+	i64.store	288($9), $pop259
+	i32.const	$push607=, 0
+	i32.const	$push606=, 0
+	i32.store	bar.lastc($pop607), $pop606
+	i32.const	$push260=, 72
+	i32.add 	$3=, $1, $pop260
+	i32.store	12($9), $3
+	i32.load8_s	$push262=, 288($9)
+	i32.const	$push261=, 80
+	i32.ne  	$push263=, $pop262, $pop261
+	br_if   	0, $pop263      # 0: down to label2
+# %bb.51:                               # %bar.exit434
+	i32.const	$push612=, 0
+	i32.const	$push611=, 1
+	i32.store	bar.lastc($pop612), $pop611
+	i32.load8_s	$push265=, 289($9)
+	i32.const	$push264=, 81
+	i32.ne  	$push266=, $pop265, $pop264
+	br_if   	0, $pop266      # 0: down to label2
+# %bb.52:                               # %bar.exit434.1
+	i32.const	$push616=, 1
+	i32.const	$push615=, 1
+	i32.add 	$0=, $pop616, $pop615
 	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.store	bar.lastc($pop614), $0
+	i32.const	$push613=, 80
+	i32.or  	$push267=, $0, $pop613
+	i32.load8_s	$push268=, 290($9)
+	i32.ne  	$push269=, $pop267, $pop268
+	br_if   	0, $pop269      # 0: down to label2
+# %bb.53:                               # %bar.exit434.2
+	i32.const	$push621=, 1
+	i32.add 	$0=, $0, $pop621
 	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.store	bar.lastc($pop620), $0
+	i32.const	$push619=, 24
+	i32.shl 	$push270=, $0, $pop619
+	i32.const	$push618=, 24
+	i32.shr_s	$push271=, $pop270, $pop618
+	i32.const	$push617=, 80
+	i32.xor 	$push272=, $pop271, $pop617
+	i32.load8_s	$push273=, 291($9)
+	i32.ne  	$push274=, $pop272, $pop273
+	br_if   	0, $pop274      # 0: down to label2
+# %bb.54:                               # %bar.exit434.3
+	i32.const	$push626=, 1
+	i32.add 	$0=, $0, $pop626
 	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.store	bar.lastc($pop625), $0
+	i32.const	$push624=, 24
+	i32.shl 	$push275=, $0, $pop624
+	i32.const	$push623=, 24
+	i32.shr_s	$push276=, $pop275, $pop623
+	i32.const	$push622=, 80
+	i32.xor 	$push277=, $pop276, $pop622
+	i32.load8_s	$push278=, 292($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)
+# %bb.55:                               # %bar.exit434.4
+	i32.const	$push631=, 1
+	i32.add 	$0=, $0, $pop631
+	i32.const	$push630=, 0
+	i32.store	bar.lastc($pop630), $0
+	i32.const	$push629=, 24
+	i32.shl 	$push280=, $0, $pop629
+	i32.const	$push628=, 24
+	i32.shr_s	$push281=, $pop280, $pop628
+	i32.const	$push627=, 80
+	i32.xor 	$push282=, $pop281, $pop627
+	i32.load8_s	$push283=, 293($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)
+# %bb.56:                               # %bar.exit434.5
+	i32.const	$push636=, 1
+	i32.add 	$0=, $0, $pop636
+	i32.const	$push635=, 0
+	i32.store	bar.lastc($pop635), $0
+	i32.const	$push634=, 24
+	i32.shl 	$push285=, $0, $pop634
+	i32.const	$push633=, 24
+	i32.shr_s	$push286=, $pop285, $pop633
+	i32.const	$push632=, 80
+	i32.xor 	$push287=, $pop286, $pop632
+	i32.load8_s	$push288=, 294($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)
+# %bb.57:                               # %bar.exit434.6
+	i32.const	$push641=, 1
+	i32.add 	$0=, $0, $pop641
+	i32.const	$push640=, 0
+	i32.store	bar.lastc($pop640), $0
+	i32.const	$push639=, 24
+	i32.shl 	$push290=, $0, $pop639
+	i32.const	$push638=, 24
+	i32.shr_s	$push291=, $pop290, $pop638
+	i32.const	$push637=, 80
+	i32.xor 	$push292=, $pop291, $pop637
+	i32.load8_s	$push293=, 295($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)
+# %bb.58:                               # %bar.exit434.7
+	i32.const	$push646=, 1
+	i32.add 	$0=, $0, $pop646
+	i32.const	$push645=, 0
+	i32.store	bar.lastc($pop645), $0
+	i32.const	$push644=, 24
+	i32.shl 	$push295=, $0, $pop644
+	i32.const	$push643=, 24
+	i32.shr_s	$push296=, $pop295, $pop643
+	i32.const	$push642=, 80
+	i32.xor 	$push297=, $pop296, $pop642
+	i32.load8_s	$push298=, 296($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)
+# %bb.59:                               # %bar.exit434.8
+	i32.const	$push651=, 1
+	i32.add 	$0=, $0, $pop651
+	i32.const	$push650=, 0
+	i32.store	bar.lastc($pop650), $0
+	i32.const	$push649=, 24
+	i32.shl 	$push300=, $0, $pop649
+	i32.const	$push648=, 24
+	i32.shr_s	$push301=, $pop300, $pop648
+	i32.const	$push647=, 80
+	i32.xor 	$push302=, $pop301, $pop647
+	i32.load8_s	$push303=, 297($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
+# %bb.60:                               # %bar.exit434.9
+	i32.const	$push656=, 1
+	i32.add 	$0=, $0, $pop656
+	i32.const	$push655=, 0
+	i32.store	bar.lastc($pop655), $0
+	i32.const	$push480=, 272
+	i32.add 	$push481=, $9, $pop480
+	i32.const	$push305=, 8
+	i32.add 	$push308=, $pop481, $pop305
+	i32.const	$push654=, 8
+	i32.add 	$push306=, $3, $pop654
+	i32.load16_u	$push307=, 0($pop306):p2align=0
+	i32.store16	0($pop308), $pop307
 	i32.const	$8=, 10
+	i32.const	$push482=, 272
+	i32.add 	$push483=, $9, $pop482
+	i32.const	$push653=, 10
+	i32.add 	$push311=, $pop483, $pop653
+	i32.const	$push652=, 10
+	i32.add 	$push309=, $3, $pop652
+	i32.load8_u	$push310=, 0($pop309)
+	i32.store8	0($pop311), $pop310
+	i32.const	$push312=, 84
+	i32.add 	$6=, $1, $pop312
+	i32.store	12($9), $6
+	i64.load	$push313=, 0($3):p2align=0
+	i64.store	272($9), $pop313
 	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)
+	i32.const	$push484=, 272
+	i32.add 	$push485=, $9, $pop484
+	i32.add 	$push315=, $pop485, $3
+	i32.load8_s	$4=, 0($pop315)
 	block   	
-	i32.const	$push696=, 11
-	i32.eq  	$push324=, $7, $pop696
-	br_if   	0, $pop324      # 0: down to label5
-# BB#62:                                # %if.then.i438
+	i32.const	$push657=, 11
+	i32.eq  	$push314=, $7, $pop657
+	br_if   	0, $pop314      # 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
+	i32.ne  	$push316=, $0, $7
+	br_if   	2, $pop316      # 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	$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
+	i32.const	$push661=, 0
+	i32.const	$push660=, 11
+	i32.store	bar.lastn($pop661), $pop660
+	i32.const	$push659=, 0
+	i32.const	$push658=, 0
+	i32.store	bar.lastc($pop659), $pop658
 .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
+	i32.const	$push664=, 24
+	i32.shl 	$push317=, $0, $pop664
+	i32.const	$push663=, 24
+	i32.shr_s	$push318=, $pop317, $pop663
+	i32.const	$push662=, 88
+	i32.xor 	$push319=, $pop318, $pop662
+	i32.ne  	$push320=, $pop319, $4
+	br_if   	1, $pop320      # 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	$push668=, 1
+	i32.add 	$0=, $0, $pop668
+	i32.const	$push667=, 0
+	i32.store	bar.lastc($pop667), $0
+	i32.const	$push666=, 1
+	i32.add 	$3=, $3, $pop666
 	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
+	i32.const	$push665=, 11
+	i32.lt_u	$push321=, $3, $pop665
+	br_if   	0, $pop321      # 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
+	i32.const	$push486=, 256
+	i32.add 	$push487=, $9, $pop486
+	i32.const	$push322=, 8
+	i32.add 	$push325=, $pop487, $pop322
+	i32.const	$push670=, 8
+	i32.add 	$push323=, $6, $pop670
+	i32.load	$push324=, 0($pop323):p2align=0
+	i32.store	0($pop325), $pop324
+	i64.load	$push326=, 0($6):p2align=0
+	i64.store	256($9), $pop326
+	i32.const	$push669=, 96
+	i32.add 	$6=, $1, $pop669
+	i32.store	12($9), $6
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_67:                               # %for.body140
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.const	$push487=, 256
-	i32.add 	$push488=, $9, $pop487
-	i32.add 	$push337=, $pop488, $3
-	i32.load8_s	$4=, 0($pop337)
+	i32.const	$push488=, 256
+	i32.add 	$push489=, $9, $pop488
+	i32.add 	$push328=, $pop489, $3
+	i32.load8_s	$4=, 0($pop328)
 	block   	
-	i32.const	$push714=, 12
-	i32.eq  	$push336=, $7, $pop714
-	br_if   	0, $pop336      # 0: down to label7
-# BB#68:                                # %if.then.i452
+	i32.const	$push671=, 12
+	i32.eq  	$push327=, $7, $pop671
+	br_if   	0, $pop327      # 0: down to label7
+# %bb.68:                               # %if.then.i452
                                         #   in Loop: Header=BB1_67 Depth=1
-	i32.ne  	$push338=, $0, $7
-	br_if   	2, $pop338      # 2: down to label2
-# BB#69:                                # %if.end.i454
+	i32.ne  	$push329=, $0, $7
+	br_if   	2, $pop329      # 2: down to label2
+# %bb.69:                               # %if.end.i454
                                         #   in Loop: Header=BB1_67 Depth=1
 	i32.const	$8=, 12
 	i32.const	$0=, 0
-	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
+	i32.const	$push675=, 0
+	i32.const	$push674=, 12
+	i32.store	bar.lastn($pop675), $pop674
+	i32.const	$push673=, 0
+	i32.const	$push672=, 0
+	i32.store	bar.lastc($pop673), $pop672
 .LBB1_70:                               # %if.end3.i459
                                         #   in Loop: Header=BB1_67 Depth=1
 	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
+	i32.const	$push678=, 24
+	i32.shl 	$push330=, $0, $pop678
+	i32.const	$push677=, 24
+	i32.shr_s	$push331=, $pop330, $pop677
+	i32.const	$push676=, 96
+	i32.xor 	$push332=, $pop331, $pop676
+	i32.ne  	$push333=, $pop332, $4
+	br_if   	1, $pop333      # 1: down to label2
+# %bb.71:                               # %bar.exit462
                                         #   in Loop: Header=BB1_67 Depth=1
-	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	$push682=, 1
+	i32.add 	$0=, $0, $pop682
+	i32.const	$push681=, 0
+	i32.store	bar.lastc($pop681), $0
+	i32.const	$push680=, 1
+	i32.add 	$3=, $3, $pop680
 	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
+	i32.const	$push679=, 12
+	i32.lt_u	$push334=, $3, $pop679
+	br_if   	0, $pop334      # 0: up to label6
+# %bb.72:                               # %for.end146
 	end_loop
-	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
+	i64.load	$push335=, 0($6):p2align=0
+	i64.store	240($9), $pop335
+	i32.const	$push336=, 112
+	i32.add 	$5=, $1, $pop336
+	i32.store	12($9), $5
+	i32.const	$push337=, 5
+	i32.add 	$push338=, $6, $pop337
+	i64.load	$push339=, 0($pop338):p2align=0
+	i64.store	245($9):p2align=0, $pop339
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_73:                               # %for.body152
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label8:
-	i32.const	$push489=, 240
-	i32.add 	$push490=, $9, $pop489
-	i32.add 	$push349=, $pop490, $3
-	i32.load8_s	$4=, 0($pop349)
+	i32.const	$push490=, 240
+	i32.add 	$push491=, $9, $pop490
+	i32.add 	$push341=, $pop491, $3
+	i32.load8_s	$4=, 0($pop341)
 	block   	
-	i32.const	$push730=, 13
-	i32.eq  	$push348=, $7, $pop730
-	br_if   	0, $pop348      # 0: down to label9
-# BB#74:                                # %if.then.i466
+	i32.const	$push683=, 13
+	i32.eq  	$push340=, $7, $pop683
+	br_if   	0, $pop340      # 0: down to label9
+# %bb.74:                               # %if.then.i466
                                         #   in Loop: Header=BB1_73 Depth=1
-	i32.ne  	$push350=, $0, $7
-	br_if   	2, $pop350      # 2: down to label2
-# BB#75:                                # %if.end.i468
+	i32.ne  	$push342=, $0, $7
+	br_if   	2, $pop342      # 2: down to label2
+# %bb.75:                               # %if.end.i468
                                         #   in Loop: Header=BB1_73 Depth=1
 	i32.const	$8=, 13
 	i32.const	$0=, 0
-	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
+	i32.const	$push687=, 0
+	i32.const	$push686=, 13
+	i32.store	bar.lastn($pop687), $pop686
+	i32.const	$push685=, 0
+	i32.const	$push684=, 0
+	i32.store	bar.lastc($pop685), $pop684
 .LBB1_76:                               # %if.end3.i473
                                         #   in Loop: Header=BB1_73 Depth=1
 	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
+	i32.const	$push690=, 24
+	i32.shl 	$push343=, $0, $pop690
+	i32.const	$push689=, 24
+	i32.shr_s	$push344=, $pop343, $pop689
+	i32.const	$push688=, 104
+	i32.xor 	$push345=, $pop344, $pop688
+	i32.ne  	$push346=, $pop345, $4
+	br_if   	1, $pop346      # 1: down to label2
+# %bb.77:                               # %bar.exit476
                                         #   in Loop: Header=BB1_73 Depth=1
-	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	$push694=, 1
+	i32.add 	$0=, $0, $pop694
+	i32.const	$push693=, 0
+	i32.store	bar.lastc($pop693), $0
+	i32.const	$push692=, 1
+	i32.add 	$3=, $3, $pop692
 	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
+	i32.const	$push691=, 13
+	i32.lt_u	$push347=, $3, $pop691
+	br_if   	0, $pop347      # 0: up to label8
+# %bb.78:                               # %for.end158
 	end_loop
-	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
+	i64.load	$push348=, 0($5):p2align=0
+	i64.store	224($9), $pop348
+	i32.const	$push349=, 128
+	i32.add 	$6=, $1, $pop349
+	i32.store	12($9), $6
+	i32.const	$push350=, 6
+	i32.add 	$push351=, $5, $pop350
+	i64.load	$push352=, 0($pop351):p2align=0
+	i64.store	230($9):p2align=1, $pop352
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_79:                               # %for.body164
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label10:
-	i32.const	$push491=, 224
-	i32.add 	$push492=, $9, $pop491
-	i32.add 	$push361=, $pop492, $3
-	i32.load8_s	$4=, 0($pop361)
+	i32.const	$push492=, 224
+	i32.add 	$push493=, $9, $pop492
+	i32.add 	$push354=, $pop493, $3
+	i32.load8_s	$4=, 0($pop354)
 	block   	
-	i32.const	$push746=, 14
-	i32.eq  	$push360=, $7, $pop746
-	br_if   	0, $pop360      # 0: down to label11
-# BB#80:                                # %if.then.i480
+	i32.const	$push695=, 14
+	i32.eq  	$push353=, $7, $pop695
+	br_if   	0, $pop353      # 0: down to label11
+# %bb.80:                               # %if.then.i480
                                         #   in Loop: Header=BB1_79 Depth=1
-	i32.ne  	$push362=, $0, $7
-	br_if   	2, $pop362      # 2: down to label2
-# BB#81:                                # %if.end.i482
+	i32.ne  	$push355=, $0, $7
+	br_if   	2, $pop355      # 2: down to label2
+# %bb.81:                               # %if.end.i482
                                         #   in Loop: Header=BB1_79 Depth=1
 	i32.const	$8=, 14
 	i32.const	$0=, 0
-	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
+	i32.const	$push699=, 0
+	i32.const	$push698=, 14
+	i32.store	bar.lastn($pop699), $pop698
+	i32.const	$push697=, 0
+	i32.const	$push696=, 0
+	i32.store	bar.lastc($pop697), $pop696
 .LBB1_82:                               # %if.end3.i487
                                         #   in Loop: Header=BB1_79 Depth=1
 	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
+	i32.const	$push702=, 24
+	i32.shl 	$push356=, $0, $pop702
+	i32.const	$push701=, 24
+	i32.shr_s	$push357=, $pop356, $pop701
+	i32.const	$push700=, 112
+	i32.xor 	$push358=, $pop357, $pop700
+	i32.ne  	$push359=, $pop358, $4
+	br_if   	1, $pop359      # 1: down to label2
+# %bb.83:                               # %bar.exit490
                                         #   in Loop: Header=BB1_79 Depth=1
-	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	$push706=, 1
+	i32.add 	$0=, $0, $pop706
+	i32.const	$push705=, 0
+	i32.store	bar.lastc($pop705), $0
+	i32.const	$push704=, 1
+	i32.add 	$3=, $3, $pop704
 	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
+	i32.const	$push703=, 14
+	i32.lt_u	$push360=, $3, $pop703
+	br_if   	0, $pop360      # 0: up to label10
+# %bb.84:                               # %for.end170
 	end_loop
-	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
+	i64.load	$push361=, 0($6):p2align=0
+	i64.store	208($9), $pop361
+	i32.const	$push362=, 144
+	i32.add 	$5=, $1, $pop362
+	i32.store	12($9), $5
+	i32.const	$push363=, 7
+	i32.add 	$push364=, $6, $pop363
+	i64.load	$push365=, 0($pop364):p2align=0
+	i64.store	215($9):p2align=0, $pop365
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_85:                               # %for.body176
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
-	i32.const	$push493=, 208
-	i32.add 	$push494=, $9, $pop493
-	i32.add 	$push373=, $pop494, $3
-	i32.load8_s	$4=, 0($pop373)
+	i32.const	$push494=, 208
+	i32.add 	$push495=, $9, $pop494
+	i32.add 	$push367=, $pop495, $3
+	i32.load8_s	$4=, 0($pop367)
 	block   	
-	i32.const	$push762=, 15
-	i32.eq  	$push372=, $7, $pop762
-	br_if   	0, $pop372      # 0: down to label13
-# BB#86:                                # %if.then.i494
+	i32.const	$push707=, 15
+	i32.eq  	$push366=, $7, $pop707
+	br_if   	0, $pop366      # 0: down to label13
+# %bb.86:                               # %if.then.i494
                                         #   in Loop: Header=BB1_85 Depth=1
-	i32.ne  	$push374=, $0, $7
-	br_if   	2, $pop374      # 2: down to label2
-# BB#87:                                # %if.end.i496
+	i32.ne  	$push368=, $0, $7
+	br_if   	2, $pop368      # 2: down to label2
+# %bb.87:                               # %if.end.i496
                                         #   in Loop: Header=BB1_85 Depth=1
 	i32.const	$8=, 15
 	i32.const	$0=, 0
-	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
+	i32.const	$push711=, 0
+	i32.const	$push710=, 15
+	i32.store	bar.lastn($pop711), $pop710
+	i32.const	$push709=, 0
+	i32.const	$push708=, 0
+	i32.store	bar.lastc($pop709), $pop708
 .LBB1_88:                               # %if.end3.i501
                                         #   in Loop: Header=BB1_85 Depth=1
 	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
+	i32.const	$push714=, 24
+	i32.shl 	$push369=, $0, $pop714
+	i32.const	$push713=, 24
+	i32.shr_s	$push370=, $pop369, $pop713
+	i32.const	$push712=, 120
+	i32.xor 	$push371=, $pop370, $pop712
+	i32.ne  	$push372=, $pop371, $4
+	br_if   	1, $pop372      # 1: down to label2
+# %bb.89:                               # %bar.exit504
                                         #   in Loop: Header=BB1_85 Depth=1
-	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	$push718=, 1
+	i32.add 	$0=, $0, $pop718
+	i32.const	$push717=, 0
+	i32.store	bar.lastc($pop717), $0
+	i32.const	$push716=, 1
+	i32.add 	$3=, $3, $pop716
 	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
+	i32.const	$push715=, 15
+	i32.lt_u	$push373=, $3, $pop715
+	br_if   	0, $pop373      # 0: up to label12
+# %bb.90:                               # %for.end182
 	end_loop
-	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
+	i32.const	$push496=, 192
+	i32.add 	$push497=, $9, $pop496
+	i32.const	$push374=, 8
+	i32.add 	$push377=, $pop497, $pop374
+	i32.const	$push719=, 8
+	i32.add 	$push375=, $5, $pop719
+	i64.load	$push376=, 0($pop375):p2align=0
+	i64.store	0($pop377), $pop376
+	i64.load	$push378=, 0($5):p2align=0
+	i64.store	192($9), $pop378
+	i32.const	$push379=, 160
+	i32.add 	$6=, $1, $pop379
+	i32.store	12($9), $6
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_91:                               # %for.body188
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label14:
-	i32.const	$push497=, 192
-	i32.add 	$push498=, $9, $pop497
-	i32.add 	$push386=, $pop498, $3
-	i32.load8_s	$4=, 0($pop386)
+	i32.const	$push498=, 192
+	i32.add 	$push499=, $9, $pop498
+	i32.add 	$push381=, $pop499, $3
+	i32.load8_s	$4=, 0($pop381)
 	block   	
-	i32.const	$push779=, 16
-	i32.eq  	$push385=, $7, $pop779
-	br_if   	0, $pop385      # 0: down to label15
-# BB#92:                                # %if.then.i508
+	i32.const	$push720=, 16
+	i32.eq  	$push380=, $7, $pop720
+	br_if   	0, $pop380      # 0: down to label15
+# %bb.92:                               # %if.then.i508
                                         #   in Loop: Header=BB1_91 Depth=1
-	i32.ne  	$push387=, $0, $7
-	br_if   	2, $pop387      # 2: down to label2
-# BB#93:                                # %if.end.i510
+	i32.ne  	$push382=, $0, $7
+	br_if   	2, $pop382      # 2: down to label2
+# %bb.93:                               # %if.end.i510
                                         #   in Loop: Header=BB1_91 Depth=1
 	i32.const	$8=, 16
 	i32.const	$0=, 0
-	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
+	i32.const	$push724=, 0
+	i32.const	$push723=, 16
+	i32.store	bar.lastn($pop724), $pop723
+	i32.const	$push722=, 0
+	i32.const	$push721=, 0
+	i32.store	bar.lastc($pop722), $pop721
 .LBB1_94:                               # %if.end3.i515
                                         #   in Loop: Header=BB1_91 Depth=1
 	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
+	i32.const	$push727=, 24
+	i32.shl 	$push383=, $0, $pop727
+	i32.const	$push726=, -2147483648
+	i32.xor 	$push384=, $pop383, $pop726
+	i32.const	$push725=, 24
+	i32.shr_s	$push385=, $pop384, $pop725
+	i32.ne  	$push386=, $pop385, $4
+	br_if   	1, $pop386      # 1: down to label2
+# %bb.95:                               # %bar.exit518
                                         #   in Loop: Header=BB1_91 Depth=1
-	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	$push731=, 1
+	i32.add 	$0=, $0, $pop731
+	i32.const	$push730=, 0
+	i32.store	bar.lastc($pop730), $0
+	i32.const	$push729=, 1
+	i32.add 	$3=, $3, $pop729
 	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
+	i32.const	$push728=, 16
+	i32.lt_u	$push387=, $3, $pop728
+	br_if   	0, $pop387      # 0: up to label14
+# %bb.96:                               # %for.end194
 	end_loop
-	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
+	i32.const	$push500=, 160
+	i32.add 	$push501=, $9, $pop500
+	i32.const	$push388=, 8
+	i32.add 	$push391=, $pop501, $pop388
+	i32.const	$push734=, 8
+	i32.add 	$push389=, $6, $pop734
+	i64.load	$push390=, 0($pop389):p2align=0
+	i64.store	0($pop391), $pop390
+	i32.const	$push502=, 160
+	i32.add 	$push503=, $9, $pop502
+	i32.const	$push392=, 16
+	i32.add 	$push395=, $pop503, $pop392
+	i32.const	$push733=, 16
+	i32.add 	$push393=, $6, $pop733
 	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
+	i32.const	$push504=, 160
+	i32.add 	$push505=, $9, $pop504
+	i32.const	$push396=, 23
+	i32.add 	$push399=, $pop505, $pop396
+	i32.const	$push732=, 23
+	i32.add 	$push397=, $6, $pop732
 	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
+	i64.store	0($pop399):p2align=0, $pop398
+	i64.load	$push400=, 0($6):p2align=0
+	i64.store	160($9), $pop400
+	i32.const	$push401=, 192
+	i32.add 	$6=, $1, $pop401
+	i32.store	12($9), $6
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_97:                               # %for.body200
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label16:
-	i32.const	$push505=, 160
-	i32.add 	$push506=, $9, $pop505
-	i32.add 	$push407=, $pop506, $3
-	i32.load8_s	$4=, 0($pop407)
+	i32.const	$push506=, 160
+	i32.add 	$push507=, $9, $pop506
+	i32.add 	$push403=, $pop507, $3
+	i32.load8_s	$4=, 0($pop403)
 	block   	
-	i32.const	$push798=, 31
-	i32.eq  	$push406=, $7, $pop798
-	br_if   	0, $pop406      # 0: down to label17
-# BB#98:                                # %if.then.i522
+	i32.const	$push735=, 31
+	i32.eq  	$push402=, $7, $pop735
+	br_if   	0, $pop402      # 0: down to label17
+# %bb.98:                               # %if.then.i522
                                         #   in Loop: Header=BB1_97 Depth=1
-	i32.ne  	$push408=, $0, $7
-	br_if   	2, $pop408      # 2: down to label2
-# BB#99:                                # %if.end.i524
+	i32.ne  	$push404=, $0, $7
+	br_if   	2, $pop404      # 2: down to label2
+# %bb.99:                               # %if.end.i524
                                         #   in Loop: Header=BB1_97 Depth=1
 	i32.const	$8=, 31
 	i32.const	$0=, 0
-	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
+	i32.const	$push739=, 0
+	i32.const	$push738=, 31
+	i32.store	bar.lastn($pop739), $pop738
+	i32.const	$push737=, 0
+	i32.const	$push736=, 0
+	i32.store	bar.lastc($pop737), $pop736
 .LBB1_100:                              # %if.end3.i529
                                         #   in Loop: Header=BB1_97 Depth=1
 	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
+	i32.const	$push742=, 24
+	i32.shl 	$push405=, $0, $pop742
+	i32.const	$push741=, -134217728
+	i32.xor 	$push406=, $pop405, $pop741
+	i32.const	$push740=, 24
+	i32.shr_s	$push407=, $pop406, $pop740
+	i32.ne  	$push408=, $pop407, $4
+	br_if   	1, $pop408      # 1: down to label2
+# %bb.101:                              # %bar.exit532
                                         #   in Loop: Header=BB1_97 Depth=1
-	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	$push746=, 1
+	i32.add 	$0=, $0, $pop746
+	i32.const	$push745=, 0
+	i32.store	bar.lastc($pop745), $0
+	i32.const	$push744=, 1
+	i32.add 	$3=, $3, $pop744
 	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
+	i32.const	$push743=, 31
+	i32.lt_u	$push409=, $3, $pop743
+	br_if   	0, $pop409      # 0: up to label16
+# %bb.102:                              # %for.end206
 	end_loop
-	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
+	i32.const	$push508=, 128
+	i32.add 	$push509=, $9, $pop508
+	i32.const	$push410=, 8
+	i32.add 	$push413=, $pop509, $pop410
+	i32.const	$push750=, 8
+	i32.add 	$push411=, $6, $pop750
+	i64.load	$push412=, 0($pop411):p2align=0
+	i64.store	0($pop413), $pop412
+	i32.const	$push510=, 128
+	i32.add 	$push511=, $9, $pop510
+	i32.const	$push414=, 16
+	i32.add 	$push417=, $pop511, $pop414
+	i32.const	$push749=, 16
+	i32.add 	$push415=, $6, $pop749
+	i64.load	$push416=, 0($pop415):p2align=0
+	i64.store	0($pop417), $pop416
+	i32.const	$push512=, 128
+	i32.add 	$push513=, $9, $pop512
+	i32.const	$push748=, 24
+	i32.add 	$push420=, $pop513, $pop748
+	i32.const	$push747=, 24
+	i32.add 	$push418=, $6, $pop747
 	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
+	i64.load	$push421=, 0($6):p2align=0
+	i64.store	128($9), $pop421
+	i32.const	$push422=, 224
+	i32.add 	$6=, $1, $pop422
+	i32.store	12($9), $6
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_103:                              # %for.body212
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	i32.const	$push513=, 128
-	i32.add 	$push514=, $9, $pop513
-	i32.add 	$push427=, $pop514, $3
-	i32.load8_s	$4=, 0($pop427)
+	i32.const	$push514=, 128
+	i32.add 	$push515=, $9, $pop514
+	i32.add 	$push424=, $pop515, $3
+	i32.load8_s	$4=, 0($pop424)
 	block   	
-	i32.const	$push818=, 32
-	i32.eq  	$push426=, $7, $pop818
-	br_if   	0, $pop426      # 0: down to label19
-# BB#104:                               # %if.then.i536
+	i32.const	$push751=, 32
+	i32.eq  	$push423=, $7, $pop751
+	br_if   	0, $pop423      # 0: down to label19
+# %bb.104:                              # %if.then.i536
                                         #   in Loop: Header=BB1_103 Depth=1
-	i32.ne  	$push428=, $0, $7
-	br_if   	2, $pop428      # 2: down to label2
-# BB#105:                               # %if.end.i538
+	i32.ne  	$push425=, $0, $7
+	br_if   	2, $pop425      # 2: down to label2
+# %bb.105:                              # %if.end.i538
                                         #   in Loop: Header=BB1_103 Depth=1
 	i32.const	$8=, 32
 	i32.const	$0=, 0
-	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
+	i32.const	$push755=, 0
+	i32.const	$push754=, 32
+	i32.store	bar.lastn($pop755), $pop754
+	i32.const	$push753=, 0
+	i32.const	$push752=, 0
+	i32.store	bar.lastc($pop753), $pop752
 .LBB1_106:                              # %if.end3.i543
                                         #   in Loop: Header=BB1_103 Depth=1
 	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
+	i32.const	$push757=, 24
+	i32.shl 	$push426=, $0, $pop757
+	i32.const	$push756=, 24
+	i32.shr_s	$push427=, $pop426, $pop756
+	i32.ne  	$push428=, $pop427, $4
+	br_if   	1, $pop428      # 1: down to label2
+# %bb.107:                              # %bar.exit546
                                         #   in Loop: Header=BB1_103 Depth=1
-	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	$push761=, 1
+	i32.add 	$0=, $0, $pop761
+	i32.const	$push760=, 0
+	i32.store	bar.lastc($pop760), $0
+	i32.const	$push759=, 1
+	i32.add 	$3=, $3, $pop759
 	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
+	i32.const	$push758=, 32
+	i32.lt_u	$push429=, $3, $pop758
+	br_if   	0, $pop429      # 0: up to label18
+# %bb.108:                              # %for.end218
 	end_loop
-	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
+	i32.const	$push516=, 88
+	i32.add 	$push517=, $9, $pop516
+	i32.const	$push430=, 8
+	i32.add 	$push433=, $pop517, $pop430
+	i32.const	$push767=, 8
+	i32.add 	$push431=, $6, $pop767
+	i64.load	$push432=, 0($pop431):p2align=0
+	i64.store	0($pop433), $pop432
+	i32.const	$push518=, 88
+	i32.add 	$push519=, $9, $pop518
+	i32.const	$push434=, 16
+	i32.add 	$push437=, $pop519, $pop434
+	i32.const	$push766=, 16
+	i32.add 	$push435=, $6, $pop766
+	i64.load	$push436=, 0($pop435):p2align=0
+	i64.store	0($pop437), $pop436
+	i32.const	$push520=, 88
+	i32.add 	$push521=, $9, $pop520
+	i32.const	$push765=, 24
+	i32.add 	$push440=, $pop521, $pop765
+	i32.const	$push764=, 24
+	i32.add 	$push438=, $6, $pop764
+	i64.load	$push439=, 0($pop438):p2align=0
+	i64.store	0($pop440), $pop439
+	i32.const	$push522=, 88
+	i32.add 	$push523=, $9, $pop522
+	i32.const	$push441=, 32
+	i32.add 	$push444=, $pop523, $pop441
+	i32.const	$push763=, 32
+	i32.add 	$push442=, $6, $pop763
+	i32.load16_u	$push443=, 0($pop442):p2align=0
+	i32.store16	0($pop444), $pop443
+	i32.const	$push524=, 88
+	i32.add 	$push525=, $9, $pop524
+	i32.const	$push445=, 34
+	i32.add 	$push448=, $pop525, $pop445
+	i32.const	$push762=, 34
+	i32.add 	$push446=, $6, $pop762
+	i32.load8_u	$push447=, 0($pop446)
+	i32.store8	0($pop448), $pop447
+	i64.load	$push449=, 0($6):p2align=0
+	i64.store	88($9), $pop449
+	i32.const	$push450=, 260
+	i32.add 	$6=, $1, $pop450
+	i32.store	12($9), $6
 	copy_local	$7=, $8
 	i32.const	$3=, 0
 .LBB1_109:                              # %for.body224
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label20:
-	i32.const	$push525=, 88
-	i32.add 	$push526=, $9, $pop525
-	i32.add 	$push453=, $pop526, $3
-	i32.load8_s	$4=, 0($pop453)
+	i32.const	$push526=, 88
+	i32.add 	$push527=, $9, $pop526
+	i32.add 	$push452=, $pop527, $3
+	i32.load8_s	$4=, 0($pop452)
 	block   	
-	i32.const	$push840=, 35
-	i32.eq  	$push452=, $7, $pop840
-	br_if   	0, $pop452      # 0: down to label21
-# BB#110:                               # %if.then.i550
+	i32.const	$push768=, 35
+	i32.eq  	$push451=, $7, $pop768
+	br_if   	0, $pop451      # 0: down to label21
+# %bb.110:                              # %if.then.i550
                                         #   in Loop: Header=BB1_109 Depth=1
-	i32.ne  	$push454=, $0, $7
-	br_if   	2, $pop454      # 2: down to label2
-# BB#111:                               # %if.end.i552
+	i32.ne  	$push453=, $0, $7
+	br_if   	2, $pop453      # 2: down to label2
+# %bb.111:                              # %if.end.i552
                                         #   in Loop: Header=BB1_109 Depth=1
 	i32.const	$8=, 35
 	i32.const	$0=, 0
-	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
+	i32.const	$push772=, 0
+	i32.const	$push771=, 35
+	i32.store	bar.lastn($pop772), $pop771
+	i32.const	$push770=, 0
+	i32.const	$push769=, 0
+	i32.store	bar.lastc($pop770), $pop769
 .LBB1_112:                              # %if.end3.i557
                                         #   in Loop: Header=BB1_109 Depth=1
 	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
+	i32.const	$push775=, 24
+	i32.shl 	$push454=, $0, $pop775
+	i32.const	$push774=, 24
+	i32.shr_s	$push455=, $pop454, $pop774
+	i32.const	$push773=, 24
+	i32.xor 	$push456=, $pop455, $pop773
+	i32.ne  	$push457=, $pop456, $4
+	br_if   	1, $pop457      # 1: down to label2
+# %bb.113:                              # %bar.exit560
                                         #   in Loop: Header=BB1_109 Depth=1
-	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	$push779=, 1
+	i32.add 	$0=, $0, $pop779
+	i32.const	$push778=, 0
+	i32.store	bar.lastc($pop778), $0
+	i32.const	$push777=, 1
+	i32.add 	$3=, $3, $pop777
 	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
+	i32.const	$push776=, 35
+	i32.lt_u	$push458=, $3, $pop776
+	br_if   	0, $pop458      # 0: up to label20
+# %bb.114:                              # %for.end230
 	end_loop
 	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	$push528=, 16
+	i32.add 	$push529=, $9, $pop528
+	i32.const	$push780=, 72
+	i32.call	$drop=, memcpy@FUNCTION, $pop529, $6, $pop780
 	i32.const	$3=, 0
 .LBB1_115:                              # %for.body236
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label22:
-	i32.const	$push529=, 16
-	i32.add 	$push530=, $9, $pop529
-	i32.add 	$push462=, $pop530, $3
+	i32.const	$push530=, 16
+	i32.add 	$push531=, $9, $pop530
+	i32.add 	$push462=, $pop531, $3
 	i32.load8_s	$7=, 0($pop462)
 	block   	
-	i32.const	$push855=, 72
-	i32.eq  	$push461=, $8, $pop855
+	i32.const	$push781=, 72
+	i32.eq  	$push461=, $8, $pop781
 	br_if   	0, $pop461      # 0: down to label23
-# BB#116:                               # %if.then.i564
+# %bb.116:                              # %if.then.i564
                                         #   in Loop: Header=BB1_115 Depth=1
 	i32.ne  	$push463=, $0, $8
 	br_if   	2, $pop463      # 2: down to label2
-# BB#117:                               # %if.end.i566
+# %bb.117:                              # %if.end.i566
                                         #   in Loop: Header=BB1_115 Depth=1
 	i32.const	$0=, 0
-	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
+	i32.const	$push785=, 0
+	i32.const	$push784=, 72
+	i32.store	bar.lastn($pop785), $pop784
+	i32.const	$push783=, 0
+	i32.const	$push782=, 0
+	i32.store	bar.lastc($pop783), $pop782
 .LBB1_118:                              # %if.end3.i571
                                         #   in Loop: Header=BB1_115 Depth=1
 	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.const	$push788=, 24
+	i32.shl 	$push464=, $0, $pop788
+	i32.const	$push787=, 24
+	i32.shr_s	$push465=, $pop464, $pop787
+	i32.const	$push786=, 64
+	i32.xor 	$push466=, $pop465, $pop786
 	i32.ne  	$push467=, $pop466, $7
 	br_if   	1, $pop467      # 1: down to label2
-# BB#119:                               # %bar.exit574
+# %bb.119:                              # %bar.exit574
                                         #   in Loop: Header=BB1_115 Depth=1
-	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	$push792=, 1
+	i32.add 	$0=, $0, $pop792
+	i32.const	$push791=, 0
+	i32.store	bar.lastc($pop791), $0
+	i32.const	$push790=, 1
+	i32.add 	$3=, $3, $pop790
 	i32.const	$8=, 72
-	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
+	i32.const	$push789=, 72
+	i32.lt_u	$push468=, $3, $pop789
+	br_if   	0, $pop468      # 0: up to label22
+# %bb.120:                              # %for.end242
 	end_loop
-	i32.const	$push474=, 0
-	i32.const	$push472=, 352
-	i32.add 	$push473=, $9, $pop472
-	i32.store	__stack_pointer($pop474), $pop473
+	i32.const	$push475=, 0
+	i32.const	$push473=, 352
+	i32.add 	$push474=, $9, $pop473
+	i32.store	__stack_pointer($pop475), $pop474
 	return
 .LBB1_121:                              # %if.then
 	end_block                       # label2:
@@ -1502,14 +1453,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	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
+# %bb.0:                                # %entry
+	i32.const	$push174=, 0
+	i32.load	$push173=, __stack_pointer($pop174)
+	i32.const	$push175=, 800
+	i32.sub 	$1=, $pop173, $pop175
+	i32.const	$push176=, 0
+	i32.store	__stack_pointer($pop176), $1
 	i32.const	$push0=, 4368
 	i32.store16	792($1), $pop0
 	i32.const	$push1=, 6424
@@ -1544,579 +1494,446 @@ main:                                   # @main
 	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	$push17=, 89
+	i32.store8	721($1), $pop17
+	i32.const	$push18=, 22615
+	i32.store16	719($1):p2align=0, $pop18
+	i64.const	$push19=, 6872032732664977752
+	i64.store	696($1), $pop19
+	i32.const	$push20=, 20816
+	i32.store16	704($1), $pop20
+	i32.const	$push21=, 82
+	i32.store8	706($1), $pop21
+	i64.const	$push22=, 7450754115369591136
+	i64.store	680($1), $pop22
+	i32.const	$push23=, 1802135912
+	i32.store	688($1), $pop23
+	i32.const	$push299=, 1802135912
+	i32.store	664($1), $pop299
+	i64.const	$push24=, 7161393424286772588
+	i64.store	668($1):p2align=2, $pop24
+	i32.const	$push25=, 100
+	i32.store8	676($1), $pop25
+	i64.const	$push26=, 8608196880778817904
+	i64.store	648($1), $pop26
+	i32.const	$push27=, 2071624056
+	i32.store	656($1), $pop27
+	i32.const	$push28=, 32124
+	i32.store16	660($1), $pop28
+	i64.const	$push29=, 9186918263483431288
+	i64.store	632($1), $pop29
+	i32.const	$push30=, 1936879984
+	i32.store	640($1), $pop30
+	i32.const	$push31=, 30068
+	i32.store16	644($1), $pop31
+	i32.const	$push32=, 118
+	i32.store8	646($1), $pop32
+	i64.const	$push33=, -8681104427521506944
+	i64.store	616($1), $pop33
+	i64.const	$push34=, -8102383044816893560
+	i64.store	624($1), $pop34
 	i32.const	$0=, 0
 .LBB2_1:                                # %for.body180
                                         # =>This Inner Loop Header: Depth=1
 	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
+	i32.const	$push177=, 584
+	i32.add 	$push178=, $1, $pop177
+	i32.add 	$push36=, $pop178, $0
+	i32.const	$push302=, 248
+	i32.xor 	$push35=, $0, $pop302
+	i32.store8	0($pop36), $pop35
+	i32.const	$push301=, 1
+	i32.add 	$0=, $0, $pop301
+	i32.const	$push300=, 31
+	i32.ne  	$push37=, $0, $pop300
+	br_if   	0, $pop37       # 0: up to label24
+# %bb.2:                                # %for.end187
 	end_loop
-	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
+	i64.const	$push38=, 506097522914230528
+	i64.store	552($1), $pop38
+	i64.const	$push39=, 1084818905618843912
+	i64.store	560($1), $pop39
+	i32.const	$push40=, 4368
+	i32.store16	568($1), $pop40
+	i64.const	$push41=, 1808220633999610642
+	i64.store	570($1):p2align=1, $pop41
+	i32.const	$push42=, 488381210
+	i32.store	578($1):p2align=1, $pop42
+	i32.const	$push43=, 7966
+	i32.store16	582($1), $pop43
 	i32.const	$0=, 0
 .LBB2_3:                                # %for.body202
                                         # =>This Inner Loop Header: Depth=1
 	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
+	i32.const	$push179=, 512
+	i32.add 	$push180=, $1, $pop179
+	i32.add 	$push45=, $pop180, $0
+	i32.const	$push305=, 24
+	i32.xor 	$push44=, $0, $pop305
+	i32.store8	0($pop45), $pop44
+	i32.const	$push304=, 1
+	i32.add 	$0=, $0, $pop304
+	i32.const	$push303=, 35
+	i32.ne  	$push46=, $0, $pop303
+	br_if   	0, $pop46       # 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    	                # 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
+	i32.const	$push181=, 440
+	i32.add 	$push182=, $1, $pop181
+	i32.add 	$push48=, $pop182, $0
+	i32.const	$push308=, 64
+	i32.xor 	$push47=, $0, $pop308
+	i32.store8	0($pop48), $pop47
+	i32.const	$push307=, 1
+	i32.add 	$0=, $0, $pop307
+	i32.const	$push306=, 72
+	i32.ne  	$push49=, $0, $pop306
+	br_if   	0, $pop49       # 0: up to label26
+# %bb.6:                                # %for.end220
 	end_loop
-	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.const	$push50=, 436
+	i32.add 	$push51=, $1, $pop50
+	i32.load8_u	$push52=, 786($1)
+	i32.store8	0($pop51), $pop52
+	i32.const	$push183=, 420
+	i32.add 	$push184=, $1, $pop183
+	i32.const	$push53=, 4
+	i32.add 	$push54=, $pop184, $pop53
+	i32.load8_u	$push55=, 772($1)
+	i32.store8	0($pop54), $pop55
+	i32.const	$push185=, 412
+	i32.add 	$push186=, $1, $pop185
+	i32.const	$push342=, 4
+	i32.add 	$push56=, $pop186, $pop342
+	i32.load16_u	$push57=, 764($1)
+	i32.store16	0($pop56), $pop57
+	i32.const	$push58=, 410
+	i32.add 	$push59=, $1, $pop58
+	i32.load8_u	$push60=, 758($1)
+	i32.store8	0($pop59), $pop60
+	i32.const	$push187=, 404
+	i32.add 	$push188=, $1, $pop187
+	i32.const	$push341=, 4
+	i32.add 	$push61=, $pop188, $pop341
+	i32.load16_u	$push62=, 756($1)
+	i32.store16	0($pop61), $pop62
+	i32.load16_u	$push63=, 792($1)
+	i32.store16	438($1), $pop63
+	i32.load16_u	$push64=, 784($1)
+	i32.store16	434($1), $pop64
+	i32.load	$push65=, 776($1)
+	i32.store	428($1), $pop65
+	i32.load	$push66=, 768($1)
+	i32.store	420($1), $pop66
+	i32.load	$push67=, 760($1)
+	i32.store	412($1), $pop67
+	i32.load	$push68=, 752($1)
+	i32.store	404($1), $pop68
+	i32.const	$push189=, 376
+	i32.add 	$push190=, $1, $pop189
+	i32.const	$push69=, 8
+	i32.add 	$push70=, $pop190, $pop69
+	i32.const	$push191=, 728
+	i32.add 	$push192=, $1, $pop191
+	i32.const	$push340=, 8
+	i32.add 	$push71=, $pop192, $pop340
+	i32.load8_u	$push72=, 0($pop71)
+	i32.store8	0($pop70), $pop72
+	i32.const	$push193=, 360
+	i32.add 	$push194=, $1, $pop193
+	i32.const	$push339=, 8
+	i32.add 	$push73=, $pop194, $pop339
+	i32.const	$push195=, 712
+	i32.add 	$push196=, $1, $pop195
+	i32.const	$push338=, 8
+	i32.add 	$push74=, $pop196, $pop338
+	i32.load16_u	$push75=, 0($pop74)
+	i32.store16	0($pop73), $pop75
+	i32.const	$push197=, 344
+	i32.add 	$push198=, $1, $pop197
+	i32.const	$push76=, 10
+	i32.add 	$push77=, $pop198, $pop76
+	i32.const	$push199=, 696
+	i32.add 	$push200=, $1, $pop199
+	i32.const	$push337=, 10
+	i32.add 	$push78=, $pop200, $pop337
+	i32.load8_u	$push79=, 0($pop78)
+	i32.store8	0($pop77), $pop79
+	i32.const	$push201=, 344
+	i32.add 	$push202=, $1, $pop201
+	i32.const	$push336=, 8
+	i32.add 	$push80=, $pop202, $pop336
+	i32.const	$push203=, 696
+	i32.add 	$push204=, $1, $pop203
+	i32.const	$push335=, 8
+	i32.add 	$push81=, $pop204, $pop335
+	i32.load16_u	$push82=, 0($pop81)
+	i32.store16	0($pop80), $pop82
+	i32.const	$push205=, 328
+	i32.add 	$push206=, $1, $pop205
+	i32.const	$push334=, 8
+	i32.add 	$push83=, $pop206, $pop334
+	i32.const	$push207=, 680
+	i32.add 	$push208=, $1, $pop207
+	i32.const	$push333=, 8
+	i32.add 	$push84=, $pop208, $pop333
+	i32.load	$push85=, 0($pop84)
+	i32.store	0($pop83), $pop85
+	i64.load	$push86=, 744($1)
+	i64.store	392($1), $pop86
+	i64.load	$push87=, 728($1)
+	i64.store	376($1), $pop87
+	i64.load	$push88=, 712($1)
+	i64.store	360($1), $pop88
+	i64.load	$push89=, 696($1)
+	i64.store	344($1), $pop89
+	i64.load	$push90=, 680($1)
+	i64.store	328($1), $pop90
+	i64.load	$push91=, 669($1):p2align=0
+	i64.store	317($1):p2align=0, $pop91
+	i64.load	$push92=, 664($1)
+	i64.store	312($1), $pop92
+	i64.load	$push93=, 654($1):p2align=1
+	i64.store	302($1):p2align=1, $pop93
+	i64.load	$push94=, 648($1)
+	i64.store	296($1), $pop94
+	i64.load	$push95=, 639($1):p2align=0
+	i64.store	287($1):p2align=0, $pop95
+	i64.load	$push96=, 632($1)
+	i64.store	280($1), $pop96
+	i32.const	$push209=, 264
+	i32.add 	$push210=, $1, $pop209
+	i32.const	$push332=, 8
+	i32.add 	$push97=, $pop210, $pop332
+	i32.const	$push211=, 616
+	i32.add 	$push212=, $1, $pop211
+	i32.const	$push331=, 8
+	i32.add 	$push98=, $pop212, $pop331
+	i64.load	$push99=, 0($pop98)
+	i64.store	0($pop97), $pop99
+	i64.load	$push100=, 616($1)
+	i64.store	264($1), $pop100
+	i32.const	$push213=, 232
+	i32.add 	$push214=, $1, $pop213
+	i32.const	$push101=, 23
+	i32.add 	$push102=, $pop214, $pop101
+	i32.const	$push215=, 584
+	i32.add 	$push216=, $1, $pop215
+	i32.const	$push330=, 23
+	i32.add 	$push103=, $pop216, $pop330
+	i64.load	$push104=, 0($pop103):p2align=0
+	i64.store	0($pop102):p2align=0, $pop104
+	i32.const	$push217=, 232
+	i32.add 	$push218=, $1, $pop217
+	i32.const	$push105=, 16
+	i32.add 	$push106=, $pop218, $pop105
+	i32.const	$push219=, 584
+	i32.add 	$push220=, $1, $pop219
+	i32.const	$push329=, 16
+	i32.add 	$push107=, $pop220, $pop329
+	i64.load	$push108=, 0($pop107)
+	i64.store	0($pop106), $pop108
+	i32.const	$push221=, 232
+	i32.add 	$push222=, $1, $pop221
+	i32.const	$push328=, 8
+	i32.add 	$push109=, $pop222, $pop328
+	i32.const	$push223=, 584
+	i32.add 	$push224=, $1, $pop223
+	i32.const	$push327=, 8
+	i32.add 	$push110=, $pop224, $pop327
+	i64.load	$push111=, 0($pop110)
+	i64.store	0($pop109), $pop111
+	i64.load	$push112=, 584($1)
+	i64.store	232($1), $pop112
+	i32.const	$push225=, 200
 	i32.add 	$push226=, $1, $pop225
-	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.const	$push113=, 24
+	i32.add 	$push114=, $pop226, $pop113
+	i32.const	$push227=, 552
 	i32.add 	$push228=, $1, $pop227
-	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.const	$push326=, 24
+	i32.add 	$push115=, $pop228, $pop326
+	i64.load	$push116=, 0($pop115)
+	i64.store	0($pop114), $pop116
+	i32.const	$push229=, 200
 	i32.add 	$push230=, $1, $pop229
-	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.const	$push325=, 16
+	i32.add 	$push117=, $pop230, $pop325
+	i32.const	$push231=, 552
 	i32.add 	$push232=, $1, $pop231
-	i32.const	$push111=, 8
-	i32.add 	$push112=, $pop232, $pop111
-	i32.const	$push233=, 728
+	i32.const	$push324=, 16
+	i32.add 	$push118=, $pop232, $pop324
+	i64.load	$push119=, 0($pop118)
+	i64.store	0($pop117), $pop119
+	i32.const	$push233=, 200
 	i32.add 	$push234=, $1, $pop233
-	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.const	$push323=, 8
+	i32.add 	$push120=, $pop234, $pop323
+	i32.const	$push235=, 552
 	i32.add 	$push236=, $1, $pop235
-	i32.const	$push412=, 8
-	i32.add 	$push115=, $pop236, $pop412
-	i32.const	$push237=, 712
+	i32.const	$push322=, 8
+	i32.add 	$push121=, $pop236, $pop322
+	i64.load	$push122=, 0($pop121)
+	i64.store	0($pop120), $pop122
+	i64.load	$push123=, 552($1)
+	i64.store	200($1), $pop123
+	i32.const	$push237=, 160
 	i32.add 	$push238=, $1, $pop237
-	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.const	$push124=, 34
+	i32.add 	$push125=, $pop238, $pop124
+	i32.const	$push239=, 512
 	i32.add 	$push240=, $1, $pop239
-	i32.const	$push118=, 10
-	i32.add 	$push119=, $pop240, $pop118
-	i32.const	$push241=, 696
+	i32.const	$push321=, 34
+	i32.add 	$push126=, $pop240, $pop321
+	i32.load8_u	$push127=, 0($pop126)
+	i32.store8	0($pop125), $pop127
+	i32.const	$push241=, 160
 	i32.add 	$push242=, $1, $pop241
-	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.const	$push128=, 32
+	i32.add 	$push129=, $pop242, $pop128
+	i32.const	$push243=, 512
 	i32.add 	$push244=, $1, $pop243
-	i32.const	$push409=, 8
-	i32.add 	$push122=, $pop244, $pop409
-	i32.const	$push245=, 696
+	i32.const	$push320=, 32
+	i32.add 	$push130=, $pop244, $pop320
+	i32.load16_u	$push131=, 0($pop130)
+	i32.store16	0($pop129), $pop131
+	i32.const	$push245=, 160
 	i32.add 	$push246=, $1, $pop245
-	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.const	$push319=, 24
+	i32.add 	$push132=, $pop246, $pop319
+	i32.const	$push247=, 512
 	i32.add 	$push248=, $1, $pop247
-	i32.const	$push407=, 8
-	i32.add 	$push125=, $pop248, $pop407
-	i32.const	$push249=, 680
+	i32.const	$push318=, 24
+	i32.add 	$push133=, $pop248, $pop318
+	i64.load	$push134=, 0($pop133)
+	i64.store	0($pop132), $pop134
+	i32.const	$push249=, 160
 	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.const	$push317=, 16
+	i32.add 	$push135=, $pop250, $pop317
+	i32.const	$push251=, 512
 	i32.add 	$push252=, $1, $pop251
-	i32.const	$push405=, 8
-	i32.add 	$push139=, $pop252, $pop405
-	i32.const	$push253=, 616
+	i32.const	$push316=, 16
+	i32.add 	$push136=, $pop252, $pop316
+	i64.load	$push137=, 0($pop136)
+	i64.store	0($pop135), $pop137
+	i32.const	$push253=, 160
 	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.const	$push315=, 8
+	i32.add 	$push138=, $pop254, $pop315
+	i32.const	$push255=, 512
 	i32.add 	$push256=, $1, $pop255
-	i32.const	$push143=, 23
-	i32.add 	$push144=, $pop256, $pop143
-	i32.const	$push257=, 584
+	i32.const	$push314=, 8
+	i32.add 	$push139=, $pop256, $pop314
+	i64.load	$push140=, 0($pop139)
+	i64.store	0($pop138), $pop140
+	i64.load	$push141=, 512($1)
+	i64.store	160($1), $pop141
+	i32.const	$push257=, 88
 	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.const	$push259=, 440
 	i32.add 	$push260=, $1, $pop259
-	i32.const	$push147=, 16
-	i32.add 	$push148=, $pop260, $pop147
-	i32.const	$push261=, 584
+	i32.const	$push142=, 72
+	i32.call	$drop=, memcpy@FUNCTION, $pop258, $pop260, $pop142
+	i32.const	$push143=, 76
+	i32.add 	$push144=, $1, $pop143
+	i32.const	$push261=, 88
 	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.store	0($pop144), $pop262
+	i32.const	$push145=, 68
+	i32.add 	$push146=, $1, $pop145
+	i32.const	$push263=, 200
 	i32.add 	$push264=, $1, $pop263
-	i32.const	$push401=, 8
-	i32.add 	$push151=, $pop264, $pop401
-	i32.const	$push265=, 584
+	i32.store	0($pop146), $pop264
+	i32.const	$push147=, 64
+	i32.add 	$push148=, $1, $pop147
+	i32.const	$push265=, 232
 	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.store	0($pop148), $pop266
+	i32.const	$push149=, 60
+	i32.add 	$push150=, $1, $pop149
+	i32.const	$push267=, 264
 	i32.add 	$push268=, $1, $pop267
-	i32.const	$push155=, 24
-	i32.add 	$push156=, $pop268, $pop155
-	i32.const	$push269=, 552
+	i32.store	0($pop150), $pop268
+	i32.const	$push151=, 56
+	i32.add 	$push152=, $1, $pop151
+	i32.const	$push269=, 280
 	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.store	0($pop152), $pop270
+	i32.const	$push153=, 52
+	i32.add 	$push154=, $1, $pop153
+	i32.const	$push271=, 296
 	i32.add 	$push272=, $1, $pop271
-	i32.const	$push398=, 16
-	i32.add 	$push159=, $pop272, $pop398
-	i32.const	$push273=, 552
+	i32.store	0($pop154), $pop272
+	i32.const	$push155=, 48
+	i32.add 	$push156=, $1, $pop155
+	i32.const	$push273=, 312
 	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.store	0($pop156), $pop274
+	i32.const	$push157=, 44
+	i32.add 	$push158=, $1, $pop157
+	i32.const	$push275=, 328
 	i32.add 	$push276=, $1, $pop275
-	i32.const	$push396=, 8
-	i32.add 	$push162=, $pop276, $pop396
-	i32.const	$push277=, 552
+	i32.store	0($pop158), $pop276
+	i32.const	$push159=, 40
+	i32.add 	$push160=, $1, $pop159
+	i32.const	$push277=, 344
 	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.store	0($pop160), $pop278
+	i32.const	$push161=, 36
+	i32.add 	$push162=, $1, $pop161
+	i32.const	$push279=, 360
 	i32.add 	$push280=, $1, $pop279
-	i32.const	$push166=, 34
-	i32.add 	$push167=, $pop280, $pop166
-	i32.const	$push281=, 512
+	i32.store	0($pop162), $pop280
+	i32.const	$push313=, 32
+	i32.add 	$push163=, $1, $pop313
+	i32.const	$push281=, 376
 	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.store	0($pop163), $pop282
+	i32.const	$push164=, 28
+	i32.add 	$push165=, $1, $pop164
+	i32.const	$push283=, 392
 	i32.add 	$push284=, $1, $pop283
-	i32.const	$push170=, 32
-	i32.add 	$push171=, $pop284, $pop170
-	i32.const	$push285=, 512
+	i32.store	0($pop165), $pop284
+	i32.const	$push312=, 24
+	i32.add 	$push166=, $1, $pop312
+	i32.const	$push285=, 404
 	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.store	0($pop166), $pop286
+	i32.const	$push167=, 20
+	i32.add 	$push168=, $1, $pop167
+	i32.const	$push287=, 412
 	i32.add 	$push288=, $1, $pop287
-	i32.const	$push392=, 24
-	i32.add 	$push174=, $pop288, $pop392
-	i32.const	$push289=, 512
+	i32.store	0($pop168), $pop288
+	i32.const	$push311=, 16
+	i32.add 	$push169=, $1, $pop311
+	i32.const	$push289=, 420
 	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.store	0($pop169), $pop290
+	i32.const	$push310=, 8
+	i32.store	0($1), $pop310
+	i32.const	$push309=, 72
+	i32.add 	$push170=, $1, $pop309
 	i32.const	$push291=, 160
 	i32.add 	$push292=, $1, $pop291
-	i32.const	$push390=, 16
-	i32.add 	$push177=, $pop292, $pop390
-	i32.const	$push293=, 512
+	i32.store	0($pop170), $pop292
+	i32.const	$push293=, 428
 	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.store	12($1), $pop294
+	i32.const	$push295=, 434
 	i32.add 	$push296=, $1, $pop295
-	i32.const	$push388=, 8
-	i32.add 	$push180=, $pop296, $pop388
-	i32.const	$push297=, 512
+	i32.store	8($1), $pop296
+	i32.const	$push297=, 438
 	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
+	i32.store	4($1), $pop298
+	i32.const	$push171=, 21
+	call    	foo@FUNCTION, $pop171, $1
+	i32.const	$push172=, 0
+	call    	exit@FUNCTION, $pop172
 	unreachable
 	.endfunc
 .Lfunc_end2:
@@ -2137,6 +1954,6 @@ bar.lastc:
 	.size	bar.lastc, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 dbc80d47a..8d86b6fb3 100644
--- a/test/torture-s/va-arg-23.c.s
+++ b/test/torture-s/va-arg-23.c.s
@@ -7,14 +7,13 @@
 foo:                                    # @foo
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push10=, 0
+# %bb.0:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push7=, __stack_pointer($pop8)
 	i32.const	$push9=, 16
-	i32.sub 	$push15=, $pop7, $pop9
-	tee_local	$push14=, $8=, $pop15
-	i32.store	__stack_pointer($pop10), $pop14
+	i32.sub 	$8=, $pop7, $pop9
+	i32.const	$push10=, 0
+	i32.store	__stack_pointer($pop10), $8
 	i32.const	$push1=, 4
 	i32.add 	$push2=, $7, $pop1
 	i32.store	12($8), $pop2
@@ -22,12 +21,12 @@ foo:                                    # @foo
 	i32.const	$push3=, 1
 	i32.ne  	$push4=, $6, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.load	$push0=, 0($7)
 	i32.const	$push5=, 2
 	i32.ne  	$push6=, $pop0, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push13=, 0
 	i32.const	$push11=, 16
 	i32.add 	$push12=, $8, $pop11
@@ -48,14 +47,13 @@ foo:                                    # @foo
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
+# %bb.0:                                # %entry
 	i32.const	$push5=, 0
 	i32.load	$push4=, __stack_pointer($pop5)
 	i32.const	$push6=, 32
-	i32.sub 	$push14=, $pop4, $pop6
-	tee_local	$push13=, $0=, $pop14
-	i32.store	__stack_pointer($pop7), $pop13
+	i32.sub 	$0=, $pop4, $pop6
+	i32.const	$push7=, 0
+	i32.store	__stack_pointer($pop7), $0
 	i32.const	$push0=, 2
 	i32.store	0($0), $pop0
 	i64.load	$push1=, 24($0)
@@ -75,5 +73,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/va-arg-24.c.s b/test/torture-s/va-arg-24.c.s
index df1150405..744c5529d 100644
--- a/test/torture-s/va-arg-24.c.s
+++ b/test/torture-s/va-arg-24.c.s
@@ -7,14 +7,13 @@
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push29=, 0
+# %bb.0:                                # %entry
 	i32.const	$push27=, 0
 	i32.load	$push26=, __stack_pointer($pop27)
 	i32.const	$push28=, 288
-	i32.sub 	$push103=, $pop26, $pop28
-	tee_local	$push102=, $0=, $pop103
-	i32.store	__stack_pointer($pop29), $pop102
+	i32.sub 	$0=, $pop26, $pop28
+	i32.const	$push29=, 0
+	i32.store	__stack_pointer($pop29), $0
 	i32.const	$push30=, 240
 	i32.add 	$push31=, $0, $pop30
 	i32.const	$push0=, 32
@@ -155,9 +154,9 @@ main:                                   # @main
 	i32.const	$push72=, 0
 	i32.load	$push25=, errors($pop72)
 	br_if   	0, $pop25       # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push104=, 0
-	call    	exit@FUNCTION, $pop104
+# %bb.1:                                # %if.end
+	i32.const	$push102=, 0
+	call    	exit@FUNCTION, $pop102
 	unreachable
 .LBB0_2:                                # %if.then
 	end_block                       # label0:
@@ -172,14 +171,13 @@ main:                                   # @main
 varargs0:                               # @varargs0
 	.param  	i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $4
 	i32.store	60($4), $1
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $1, $pop28
@@ -213,7 +211,7 @@ varargs0:                               # @varargs0
 	i32.const	$push24=, 0
 	i32.ne  	$push10=, $pop25, $pop24
 	br_if   	0, $pop10       # 0: down to label2
-# BB#1:
+# %bb.1:
 	i32.const	$5=, 1
 	br      	1               # 1: down to label1
 .LBB1_2:
@@ -235,16 +233,15 @@ varargs0:                               # @varargs0
 .LBB1_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB1_3 Depth=1
 	end_block                       # label9:
+	i32.const	$push30=, 1
+	i32.add 	$1=, $1, $pop30
 	i32.load	$3=, 0($2)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $2, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $2, $pop29
 	copy_local	$2=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $1, $pop33
-	tee_local	$push31=, $1=, $pop32
-	i32.eq  	$push11=, $3, $pop31
+	i32.eq  	$push11=, $1, $3
 	br_if   	3, $pop11       # 3: down to label5
-# BB#5:                                 #   in Loop: Header=BB1_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 0
 	br      	5               # 5: up to label3
 .LBB1_6:                                # %if.then.i
@@ -253,26 +250,26 @@ varargs0:                               # @varargs0
 	i32.store	12($4), $1
 	i32.store	8($4), $3
 	i32.store	4($4), $1
-	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	$push35=, .L.str
+	i32.store	0($4), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $4
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push12=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push13=, $pop12, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push14=, $1, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push14=, $1, $pop36
 	br_if   	2, $pop14       # 2: down to label4
-# BB#9:                                 #   in Loop: Header=BB1_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB1_3 Depth=1
 	i32.const	$5=, 3
 	br      	3               # 3: up to label3
 .LBB1_10:                               # %verify.exit
@@ -301,14 +298,13 @@ varargs0:                               # @varargs0
 varargs1:                               # @varargs1
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	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.sub 	$5=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $5
 	i32.store	60($5), $2
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $2, $pop28
@@ -342,7 +338,7 @@ varargs1:                               # @varargs1
 	i32.const	$push25=, 0
 	i32.ne  	$push11=, $pop26, $pop25
 	br_if   	0, $pop11       # 0: down to label11
-# BB#1:
+# %bb.1:
 	i32.const	$6=, 1
 	br      	1               # 1: down to label10
 .LBB2_2:
@@ -364,16 +360,15 @@ varargs1:                               # @varargs1
 .LBB2_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB2_3 Depth=1
 	end_block                       # label18:
+	i32.const	$push30=, 1
+	i32.add 	$2=, $2, $pop30
 	i32.load	$4=, 0($3)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $3, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $3, $pop29
 	copy_local	$3=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $2, $pop33
-	tee_local	$push31=, $2=, $pop32
-	i32.eq  	$push12=, $4, $pop31
+	i32.eq  	$push12=, $2, $4
 	br_if   	3, $pop12       # 3: down to label14
-# BB#5:                                 #   in Loop: Header=BB2_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB2_3 Depth=1
 	i32.const	$6=, 0
 	br      	5               # 5: up to label12
 .LBB2_6:                                # %if.then.i
@@ -382,26 +377,26 @@ varargs1:                               # @varargs1
 	i32.store	12($5), $2
 	i32.store	8($5), $4
 	i32.store	4($5), $2
-	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	$push35=, .L.str.2
+	i32.store	0($5), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $5
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push13=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push14=, $pop13, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push15=, $2, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push15=, $2, $pop36
 	br_if   	2, $pop15       # 2: down to label13
-# BB#9:                                 #   in Loop: Header=BB2_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB2_3 Depth=1
 	i32.const	$6=, 3
 	br      	3               # 3: up to label12
 .LBB2_10:                               # %verify.exit
@@ -430,14 +425,13 @@ varargs1:                               # @varargs1
 varargs2:                               # @varargs2
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	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.sub 	$6=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $6
 	i32.store	60($6), $3
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $3, $pop28
@@ -471,7 +465,7 @@ varargs2:                               # @varargs2
 	i32.const	$push25=, 0
 	i32.ne  	$push11=, $pop26, $pop25
 	br_if   	0, $pop11       # 0: down to label20
-# BB#1:
+# %bb.1:
 	i32.const	$7=, 1
 	br      	1               # 1: down to label19
 .LBB3_2:
@@ -493,16 +487,15 @@ varargs2:                               # @varargs2
 .LBB3_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB3_3 Depth=1
 	end_block                       # label27:
+	i32.const	$push30=, 1
+	i32.add 	$3=, $3, $pop30
 	i32.load	$5=, 0($4)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $4, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $4, $pop29
 	copy_local	$4=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $3, $pop33
-	tee_local	$push31=, $3=, $pop32
-	i32.eq  	$push12=, $5, $pop31
+	i32.eq  	$push12=, $3, $5
 	br_if   	3, $pop12       # 3: down to label23
-# BB#5:                                 #   in Loop: Header=BB3_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$7=, 0
 	br      	5               # 5: up to label21
 .LBB3_6:                                # %if.then.i
@@ -511,26 +504,26 @@ varargs2:                               # @varargs2
 	i32.store	12($6), $3
 	i32.store	8($6), $5
 	i32.store	4($6), $3
-	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	$push35=, .L.str.3
+	i32.store	0($6), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $6
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push13=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push14=, $pop13, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push15=, $3, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push15=, $3, $pop36
 	br_if   	2, $pop15       # 2: down to label22
-# BB#9:                                 #   in Loop: Header=BB3_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB3_3 Depth=1
 	i32.const	$7=, 3
 	br      	3               # 3: up to label21
 .LBB3_10:                               # %verify.exit
@@ -559,17 +552,16 @@ varargs2:                               # @varargs2
 varargs3:                               # @varargs3
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push21=, 0
+# %bb.0:                                # %entry
+	i32.const	$push17=, 0
+	i32.load	$push16=, __stack_pointer($pop17)
+	i32.const	$push18=, 64
+	i32.sub 	$7=, $pop16, $pop18
 	i32.const	$push19=, 0
-	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	__stack_pointer($pop19), $7
 	i32.store	60($7), $4
-	i32.const	$push30=, 4
-	i32.add 	$push1=, $4, $pop30
+	i32.const	$push28=, 4
+	i32.add 	$push1=, $4, $pop28
 	i32.store	60($7), $pop1
 	i64.const	$push2=, 4294967296
 	i64.store	16($7), $pop2
@@ -577,34 +569,30 @@ varargs3:                               # @varargs3
 	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
+	i64.load	$push5=, 8($4):p2align=2
+	i64.store	40($7), $pop5
+	i64.load	$push6=, 16($4):p2align=2
+	i64.store	48($7), $pop6
+	i32.load	$push7=, 24($4)
+	i32.store	56($7), $pop7
+	i32.load	$push8=, 0($4)
+	i32.store	32($7), $pop8
+	i32.const	$push9=, 28
+	i32.add 	$push10=, $4, $pop9
+	i32.store	60($7), $pop10
+	i32.const	$push23=, 16
+	i32.add 	$push24=, $7, $pop23
+	i32.const	$push27=, 4
+	i32.or  	$5=, $pop24, $pop27
 	i32.const	$6=, 0
 	i32.const	$4=, 0
 	block   	
 	block   	
-	i32.const	$push28=, 0
-	i32.const	$push27=, 0
-	i32.ne  	$push13=, $pop28, $pop27
-	br_if   	0, $pop13       # 0: down to label29
-# BB#1:
+	i32.const	$push26=, 0
+	i32.const	$push25=, 0
+	i32.ne  	$push11=, $pop26, $pop25
+	br_if   	0, $pop11       # 0: down to label29
+# %bb.1:
 	i32.const	$8=, 1
 	br      	1               # 1: down to label28
 .LBB4_2:
@@ -626,16 +614,15 @@ varargs3:                               # @varargs3
 .LBB4_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB4_3 Depth=1
 	end_block                       # label36:
+	i32.const	$push30=, 1
+	i32.add 	$4=, $4, $pop30
 	i32.load	$6=, 0($5)
-	i32.const	$push36=, 4
-	i32.add 	$push0=, $5, $pop36
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $5, $pop29
 	copy_local	$5=, $pop0
-	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.eq  	$push12=, $4, $6
+	br_if   	3, $pop12       # 3: down to label32
+# %bb.5:                                #   in Loop: Header=BB4_3 Depth=1
 	i32.const	$8=, 0
 	br      	5               # 5: up to label30
 .LBB4_6:                                # %if.then.i
@@ -644,34 +631,34 @@ varargs3:                               # @varargs3
 	i32.store	12($7), $4
 	i32.store	8($7), $6
 	i32.store	4($7), $4
-	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	$push35=, .L.str.4
+	i32.store	0($7), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $7
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push13=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push14=, $pop13, $pop31
+	i32.store	errors($pop33), $pop14
+# %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	$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	$push36=, 10
+	i32.ne  	$push15=, $4, $pop36
+	br_if   	2, $pop15       # 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	$push24=, 0
-	i32.const	$push22=, 64
-	i32.add 	$push23=, $7, $pop22
-	i32.store	__stack_pointer($pop24), $pop23
+	i32.const	$push22=, 0
+	i32.const	$push20=, 64
+	i32.add 	$push21=, $7, $pop20
+	i32.store	__stack_pointer($pop22), $pop21
 	return
 .LBB4_11:                               #   in Loop: Header=BB4_3 Depth=1
 	end_block                       # label32:
@@ -692,14 +679,13 @@ varargs3:                               # @varargs3
 varargs4:                               # @varargs4
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	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.sub 	$8=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $8
 	i32.const	$push28=, 4
 	i32.store	32($8), $pop28
 	i32.store	60($8), $5
@@ -733,7 +719,7 @@ varargs4:                               # @varargs4
 	i32.const	$push24=, 0
 	i32.ne  	$push10=, $pop25, $pop24
 	br_if   	0, $pop10       # 0: down to label38
-# BB#1:
+# %bb.1:
 	i32.const	$9=, 1
 	br      	1               # 1: down to label37
 .LBB5_2:
@@ -755,16 +741,15 @@ varargs4:                               # @varargs4
 .LBB5_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB5_3 Depth=1
 	end_block                       # label45:
+	i32.const	$push30=, 1
+	i32.add 	$5=, $5, $pop30
 	i32.load	$7=, 0($6)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $6, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $6, $pop29
 	copy_local	$6=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $5, $pop33
-	tee_local	$push31=, $5=, $pop32
-	i32.eq  	$push11=, $7, $pop31
+	i32.eq  	$push11=, $5, $7
 	br_if   	3, $pop11       # 3: down to label41
-# BB#5:                                 #   in Loop: Header=BB5_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB5_3 Depth=1
 	i32.const	$9=, 0
 	br      	5               # 5: up to label39
 .LBB5_6:                                # %if.then.i
@@ -773,26 +758,26 @@ varargs4:                               # @varargs4
 	i32.store	12($8), $5
 	i32.store	8($8), $7
 	i32.store	4($8), $5
-	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	$push35=, .L.str.5
+	i32.store	0($8), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $8
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push12=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push13=, $pop12, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push14=, $5, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push14=, $5, $pop36
 	br_if   	2, $pop14       # 2: down to label40
-# BB#9:                                 #   in Loop: Header=BB5_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB5_3 Depth=1
 	i32.const	$9=, 3
 	br      	3               # 3: up to label39
 .LBB5_10:                               # %verify.exit
@@ -821,14 +806,13 @@ varargs4:                               # @varargs4
 varargs5:                               # @varargs5
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	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.sub 	$9=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $9
 	i32.store	60($9), $6
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $6, $pop28
@@ -862,7 +846,7 @@ varargs5:                               # @varargs5
 	i32.const	$push25=, 0
 	i32.ne  	$push11=, $pop26, $pop25
 	br_if   	0, $pop11       # 0: down to label47
-# BB#1:
+# %bb.1:
 	i32.const	$10=, 1
 	br      	1               # 1: down to label46
 .LBB6_2:
@@ -884,16 +868,15 @@ varargs5:                               # @varargs5
 .LBB6_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB6_3 Depth=1
 	end_block                       # label54:
+	i32.const	$push30=, 1
+	i32.add 	$6=, $6, $pop30
 	i32.load	$8=, 0($7)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $7, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $7, $pop29
 	copy_local	$7=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $6, $pop33
-	tee_local	$push31=, $6=, $pop32
-	i32.eq  	$push12=, $8, $pop31
+	i32.eq  	$push12=, $6, $8
 	br_if   	3, $pop12       # 3: down to label50
-# BB#5:                                 #   in Loop: Header=BB6_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB6_3 Depth=1
 	i32.const	$10=, 0
 	br      	5               # 5: up to label48
 .LBB6_6:                                # %if.then.i
@@ -902,26 +885,26 @@ varargs5:                               # @varargs5
 	i32.store	12($9), $6
 	i32.store	8($9), $8
 	i32.store	4($9), $6
-	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	$push35=, .L.str.6
+	i32.store	0($9), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $9
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push13=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push14=, $pop13, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push15=, $6, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push15=, $6, $pop36
 	br_if   	2, $pop15       # 2: down to label49
-# BB#9:                                 #   in Loop: Header=BB6_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB6_3 Depth=1
 	i32.const	$10=, 3
 	br      	3               # 3: up to label48
 .LBB6_10:                               # %verify.exit
@@ -950,14 +933,13 @@ varargs5:                               # @varargs5
 varargs6:                               # @varargs6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	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.sub 	$10=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $10
 	i32.store	60($10), $7
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $7, $pop28
@@ -991,7 +973,7 @@ varargs6:                               # @varargs6
 	i32.const	$push25=, 0
 	i32.ne  	$push11=, $pop26, $pop25
 	br_if   	0, $pop11       # 0: down to label56
-# BB#1:
+# %bb.1:
 	i32.const	$11=, 1
 	br      	1               # 1: down to label55
 .LBB7_2:
@@ -1013,16 +995,15 @@ varargs6:                               # @varargs6
 .LBB7_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB7_3 Depth=1
 	end_block                       # label63:
+	i32.const	$push30=, 1
+	i32.add 	$7=, $7, $pop30
 	i32.load	$9=, 0($8)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $8, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $8, $pop29
 	copy_local	$8=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $7, $pop33
-	tee_local	$push31=, $7=, $pop32
-	i32.eq  	$push12=, $9, $pop31
+	i32.eq  	$push12=, $7, $9
 	br_if   	3, $pop12       # 3: down to label59
-# BB#5:                                 #   in Loop: Header=BB7_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB7_3 Depth=1
 	i32.const	$11=, 0
 	br      	5               # 5: up to label57
 .LBB7_6:                                # %if.then.i
@@ -1031,26 +1012,26 @@ varargs6:                               # @varargs6
 	i32.store	12($10), $7
 	i32.store	8($10), $9
 	i32.store	4($10), $7
-	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	$push35=, .L.str.7
+	i32.store	0($10), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $10
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push13=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push14=, $pop13, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push15=, $7, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push15=, $7, $pop36
 	br_if   	2, $pop15       # 2: down to label58
-# BB#9:                                 #   in Loop: Header=BB7_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB7_3 Depth=1
 	i32.const	$11=, 3
 	br      	3               # 3: up to label57
 .LBB7_10:                               # %verify.exit
@@ -1079,14 +1060,13 @@ varargs6:                               # @varargs6
 varargs7:                               # @varargs7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 64
-	i32.sub 	$push30=, $pop16, $pop18
-	tee_local	$push29=, $11=, $pop30
-	i32.store	__stack_pointer($pop19), $pop29
+	i32.sub 	$11=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $11
 	i32.store	60($11), $8
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $8, $pop28
@@ -1120,7 +1100,7 @@ varargs7:                               # @varargs7
 	i32.const	$push25=, 0
 	i32.ne  	$push11=, $pop26, $pop25
 	br_if   	0, $pop11       # 0: down to label65
-# BB#1:
+# %bb.1:
 	i32.const	$12=, 1
 	br      	1               # 1: down to label64
 .LBB8_2:
@@ -1142,16 +1122,15 @@ varargs7:                               # @varargs7
 .LBB8_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB8_3 Depth=1
 	end_block                       # label72:
+	i32.const	$push30=, 1
+	i32.add 	$8=, $8, $pop30
 	i32.load	$10=, 0($9)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $9, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $9, $pop29
 	copy_local	$9=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $8, $pop33
-	tee_local	$push31=, $8=, $pop32
-	i32.eq  	$push12=, $10, $pop31
+	i32.eq  	$push12=, $8, $10
 	br_if   	3, $pop12       # 3: down to label68
-# BB#5:                                 #   in Loop: Header=BB8_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB8_3 Depth=1
 	i32.const	$12=, 0
 	br      	5               # 5: up to label66
 .LBB8_6:                                # %if.then.i
@@ -1160,26 +1139,26 @@ varargs7:                               # @varargs7
 	i32.store	12($11), $8
 	i32.store	8($11), $10
 	i32.store	4($11), $8
-	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	$push35=, .L.str.8
+	i32.store	0($11), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $11
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push13=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push14=, $pop13, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push15=, $8, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push15=, $8, $pop36
 	br_if   	2, $pop15       # 2: down to label67
-# BB#9:                                 #   in Loop: Header=BB8_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB8_3 Depth=1
 	i32.const	$12=, 3
 	br      	3               # 3: up to label66
 .LBB8_10:                               # %verify.exit
@@ -1208,14 +1187,13 @@ varargs7:                               # @varargs7
 varargs8:                               # @varargs8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push18=, 0
+# %bb.0:                                # %entry
 	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.sub 	$12=, $pop15, $pop17
+	i32.const	$push18=, 0
+	i32.store	__stack_pointer($pop18), $12
 	i32.store	60($12), $9
 	i32.const	$push28=, 4
 	i32.add 	$push1=, $9, $pop28
@@ -1249,7 +1227,7 @@ varargs8:                               # @varargs8
 	i32.const	$push24=, 0
 	i32.ne  	$push10=, $pop25, $pop24
 	br_if   	0, $pop10       # 0: down to label74
-# BB#1:
+# %bb.1:
 	i32.const	$13=, 1
 	br      	1               # 1: down to label73
 .LBB9_2:
@@ -1271,16 +1249,15 @@ varargs8:                               # @varargs8
 .LBB9_4:                                # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB9_3 Depth=1
 	end_block                       # label81:
+	i32.const	$push30=, 1
+	i32.add 	$9=, $9, $pop30
 	i32.load	$11=, 0($10)
-	i32.const	$push34=, 4
-	i32.add 	$push0=, $10, $pop34
+	i32.const	$push29=, 4
+	i32.add 	$push0=, $10, $pop29
 	copy_local	$10=, $pop0
-	i32.const	$push33=, 1
-	i32.add 	$push32=, $9, $pop33
-	tee_local	$push31=, $9=, $pop32
-	i32.eq  	$push11=, $11, $pop31
+	i32.eq  	$push11=, $9, $11
 	br_if   	3, $pop11       # 3: down to label77
-# BB#5:                                 #   in Loop: Header=BB9_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB9_3 Depth=1
 	i32.const	$13=, 0
 	br      	5               # 5: up to label75
 .LBB9_6:                                # %if.then.i
@@ -1289,26 +1266,26 @@ varargs8:                               # @varargs8
 	i32.store	12($12), $9
 	i32.store	8($12), $11
 	i32.store	4($12), $9
-	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.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	$push35=, .L.str.9
+	i32.store	0($12), $pop35
+	i32.const	$push34=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop34, $12
+	i32.const	$push33=, 0
+	i32.const	$push32=, 0
+	i32.load	$push12=, errors($pop32)
+	i32.const	$push31=, 1
+	i32.add 	$push13=, $pop12, $pop31
+	i32.store	errors($pop33), $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	$push40=, 10
-	i32.ne  	$push14=, $9, $pop40
+	i32.const	$push36=, 10
+	i32.ne  	$push14=, $9, $pop36
 	br_if   	2, $pop14       # 2: down to label76
-# BB#9:                                 #   in Loop: Header=BB9_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB9_3 Depth=1
 	i32.const	$13=, 3
 	br      	3               # 3: up to label75
 .LBB9_10:                               # %verify.exit
@@ -1337,14 +1314,13 @@ varargs8:                               # @varargs8
 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
+# %bb.0:                                # %entry
 	i32.const	$push14=, 0
 	i32.load	$push13=, __stack_pointer($pop14)
 	i32.const	$push15=, 64
-	i32.sub 	$push27=, $pop13, $pop15
-	tee_local	$push26=, $13=, $pop27
-	i32.store	__stack_pointer($pop16), $pop26
+	i32.sub 	$13=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $13
 	i32.store	60($13), $10
 	i32.const	$push25=, 4
 	i32.add 	$push1=, $10, $pop25
@@ -1373,7 +1349,7 @@ varargs9:                               # @varargs9
 	i32.const	$push22=, 0
 	i32.ne  	$push8=, $pop23, $pop22
 	br_if   	0, $pop8        # 0: down to label83
-# BB#1:
+# %bb.1:
 	i32.const	$14=, 1
 	br      	1               # 1: down to label82
 .LBB10_2:
@@ -1395,16 +1371,15 @@ varargs9:                               # @varargs9
 .LBB10_4:                               # %for.inc.i.for.body.i_crit_edge
                                         #   in Loop: Header=BB10_3 Depth=1
 	end_block                       # label90:
+	i32.const	$push27=, 1
+	i32.add 	$10=, $10, $pop27
 	i32.load	$12=, 0($11)
-	i32.const	$push31=, 4
-	i32.add 	$push0=, $11, $pop31
+	i32.const	$push26=, 4
+	i32.add 	$push0=, $11, $pop26
 	copy_local	$11=, $pop0
-	i32.const	$push30=, 1
-	i32.add 	$push29=, $10, $pop30
-	tee_local	$push28=, $10=, $pop29
-	i32.eq  	$push9=, $12, $pop28
+	i32.eq  	$push9=, $10, $12
 	br_if   	3, $pop9        # 3: down to label86
-# BB#5:                                 #   in Loop: Header=BB10_3 Depth=1
+# %bb.5:                                #   in Loop: Header=BB10_3 Depth=1
 	i32.const	$14=, 0
 	br      	5               # 5: up to label84
 .LBB10_6:                               # %if.then.i
@@ -1413,26 +1388,26 @@ varargs9:                               # @varargs9
 	i32.store	12($13), $10
 	i32.store	8($13), $12
 	i32.store	4($13), $10
-	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	$push32=, .L.str.10
+	i32.store	0($13), $pop32
+	i32.const	$push31=, .L.str.1
+	i32.call	$drop=, printf@FUNCTION, $pop31, $13
+	i32.const	$push30=, 0
+	i32.const	$push29=, 0
+	i32.load	$push10=, errors($pop29)
+	i32.const	$push28=, 1
+	i32.add 	$push11=, $pop10, $pop28
+	i32.store	errors($pop30), $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	$push37=, 10
-	i32.ne  	$push12=, $10, $pop37
+	i32.const	$push33=, 10
+	i32.ne  	$push12=, $10, $pop33
 	br_if   	2, $pop12       # 2: down to label85
-# BB#9:                                 #   in Loop: Header=BB10_3 Depth=1
+# %bb.9:                                #   in Loop: Header=BB10_3 Depth=1
 	i32.const	$14=, 3
 	br      	3               # 3: up to label84
 .LBB10_10:                              # %verify.exit
@@ -1520,7 +1495,7 @@ errors:
 	.size	.L.str.10, 9
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 43944633d..32726e652 100644
--- a/test/torture-s/va-arg-26.c.s
+++ b/test/torture-s/va-arg-26.c.s
@@ -7,18 +7,17 @@
 f:                                      # @f
 	.param  	f32, f32, f32, f32, f32, f32, i32
 	.result 	f64
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
+	i32.const	$push0=, 7
+	i32.add 	$push1=, $6, $pop0
+	i32.const	$push2=, -8
+	i32.and 	$6=, $pop1, $pop2
 	i32.const	$push7=, 0
 	i32.load	$push6=, __stack_pointer($pop7)
 	i32.const	$push8=, 16
 	i32.sub 	$push9=, $pop6, $pop8
-	i32.const	$push0=, 7
-	i32.add 	$push1=, $6, $pop0
-	i32.const	$push2=, -8
-	i32.and 	$push11=, $pop1, $pop2
-	tee_local	$push10=, $6=, $pop11
 	i32.const	$push3=, 8
-	i32.add 	$push4=, $pop10, $pop3
+	i32.add 	$push4=, $6, $pop3
 	i32.store	12($pop9), $pop4
 	f64.load	$push5=, 0($6)
                                         # fallthrough-return: $pop5
@@ -33,14 +32,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	f32, i32
-# BB#0:                                 # %entry
-	i32.const	$push8=, 0
+# %bb.0:                                # %entry
 	i32.const	$push6=, 0
 	i32.load	$push5=, __stack_pointer($pop6)
 	i32.const	$push7=, 16
-	i32.sub 	$push10=, $pop5, $pop7
-	tee_local	$push9=, $1=, $pop10
-	i32.store	__stack_pointer($pop8), $pop9
+	i32.sub 	$1=, $pop5, $pop7
+	i32.const	$push8=, 0
+	i32.store	__stack_pointer($pop8), $1
 	i64.const	$push0=, 4619567317775286272
 	i64.store	0($1), $pop0
 	block   	
@@ -48,7 +46,7 @@ main:                                   # @main
 	f64.const	$push2=, 0x1.cp2
 	f64.eq  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	call    	abort@FUNCTION
 	unreachable
 .LBB1_2:                                # %if.end
@@ -61,6 +59,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 8c55e7f42..be49186fb 100644
--- a/test/torture-s/va-arg-4.c.s
+++ b/test/torture-s/va-arg-4.c.s
@@ -7,54 +7,51 @@
 f:                                      # @f
 	.param  	i32, i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
+# %bb.0:                                # %entry
 	i32.const	$push21=, 0
 	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 16
-	i32.sub 	$push28=, $pop20, $pop22
-	tee_local	$push27=, $4=, $pop28
-	i32.store	__stack_pointer($pop23), $pop27
+	i32.sub 	$4=, $pop20, $pop22
+	i32.const	$push23=, 0
+	i32.store	__stack_pointer($pop23), $4
 	block   	
 	i32.load8_u	$push0=, 0($0)
 	i32.const	$push1=, 97
 	i32.ne  	$push2=, $pop0, $pop1
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false
+# %bb.1:                                # %lor.lhs.false
 	i32.load8_u	$push3=, 1($0)
 	i32.const	$push4=, 98
 	i32.ne  	$push5=, $pop3, $pop4
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %lor.lhs.false7
+# %bb.2:                                # %lor.lhs.false7
 	i32.load8_u	$push6=, 2($0)
 	i32.const	$push7=, 99
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end
+# %bb.3:                                # %if.end
 	i32.const	$push9=, 4
-	i32.add 	$push30=, $2, $pop9
-	tee_local	$push29=, $0=, $pop30
-	i32.store	12($4), $pop29
+	i32.add 	$0=, $2, $pop9
+	i32.store	12($4), $0
 	i32.load	$push10=, 0($2)
 	i32.const	$push11=, 42
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#4:                                 # %if.end17
+# %bb.4:                                # %if.end17
 	i32.const	$push13=, 8
-	i32.add 	$push32=, $2, $pop13
-	tee_local	$push31=, $3=, $pop32
-	i32.store	12($4), $pop31
+	i32.add 	$3=, $2, $pop13
+	i32.store	12($4), $3
 	i32.load	$push14=, 0($0)
 	i32.const	$push15=, 120
 	i32.ne  	$push16=, $pop14, $pop15
 	br_if   	0, $pop16       # 0: down to label0
-# BB#5:                                 # %if.end23
+# %bb.5:                                # %if.end23
 	i32.const	$push17=, 12
 	i32.add 	$push18=, $2, $pop17
 	i32.store	12($4), $pop18
 	i32.load	$push19=, 0($3)
 	br_if   	0, $pop19       # 0: down to label0
-# BB#6:                                 # %if.end29
+# %bb.6:                                # %if.end29
 	i32.const	$push26=, 0
 	i32.const	$push24=, 16
 	i32.add 	$push25=, $4, $pop24
@@ -75,14 +72,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push16=, 0
+# %bb.0:                                # %entry
 	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($pop16), $pop23
+	i32.sub 	$0=, $pop13, $pop15
+	i32.const	$push16=, 0
+	i32.store	__stack_pointer($pop16), $0
 	i32.const	$push2=, 40
 	i32.add 	$push3=, $0, $pop2
 	i32.const	$push0=, 0
@@ -122,6 +118,6 @@ main.x:
 	.size	main.x, 32
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 e3d1f2110..d7477c6e9 100644
--- a/test/torture-s/va-arg-5.c.s
+++ b/test/torture-s/va-arg-5.c.s
@@ -8,47 +8,42 @@ va_double:                              # @va_double
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push23=, 0
+# %bb.0:                                # %entry
 	i32.const	$push21=, 0
 	i32.load	$push20=, __stack_pointer($pop21)
 	i32.const	$push22=, 16
-	i32.sub 	$push32=, $pop20, $pop22
-	tee_local	$push31=, $4=, $pop32
-	i32.store	__stack_pointer($pop23), $pop31
+	i32.sub 	$4=, $pop20, $pop22
+	i32.const	$push23=, 0
+	i32.store	__stack_pointer($pop23), $4
 	i32.const	$push0=, 7
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -8
-	i32.and 	$push30=, $pop1, $pop2
-	tee_local	$push29=, $1=, $pop30
+	i32.and 	$1=, $pop1, $pop2
 	i32.const	$push3=, 8
-	i32.add 	$push28=, $pop29, $pop3
-	tee_local	$push27=, $2=, $pop28
-	i32.store	12($4), $pop27
+	i32.add 	$2=, $1, $pop3
+	i32.store	12($4), $2
 	block   	
 	f64.load	$push4=, 0($1)
 	f64.const	$push5=, 0x1.921fafc8b007ap1
 	f64.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push7=, 16
-	i32.add 	$push34=, $1, $pop7
-	tee_local	$push33=, $3=, $pop34
-	i32.store	12($4), $pop33
+	i32.add 	$3=, $1, $pop7
+	i32.store	12($4), $3
 	f64.load	$push8=, 0($2)
 	f64.const	$push9=, 0x1.5bf04577d9557p1
 	f64.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push11=, 24
-	i32.add 	$push36=, $1, $pop11
-	tee_local	$push35=, $2=, $pop36
-	i32.store	12($4), $pop35
+	i32.add 	$2=, $1, $pop11
+	i32.store	12($4), $2
 	f64.load	$push12=, 0($3)
 	f64.const	$push13=, 0x1.1e3779131154cp1
 	f64.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push15=, 32
 	i32.add 	$push16=, $1, $pop15
 	i32.store	12($4), $pop16
@@ -56,7 +51,7 @@ va_double:                              # @va_double
 	f64.const	$push18=, 0x1.12e0be1b5921ep1
 	f64.ne  	$push19=, $pop17, $pop18
 	br_if   	0, $pop19       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push26=, 0
 	i32.const	$push24=, 16
 	i32.add 	$push25=, $4, $pop24
@@ -78,23 +73,20 @@ va_long_double:                         # @va_long_double
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push37=, 0
+# %bb.0:                                # %entry
 	i32.const	$push35=, 0
 	i32.load	$push34=, __stack_pointer($pop35)
 	i32.const	$push36=, 16
-	i32.sub 	$push46=, $pop34, $pop36
-	tee_local	$push45=, $4=, $pop46
-	i32.store	__stack_pointer($pop37), $pop45
+	i32.sub 	$4=, $pop34, $pop36
+	i32.const	$push37=, 0
+	i32.store	__stack_pointer($pop37), $4
 	i32.const	$push0=, 15
 	i32.add 	$push1=, $1, $pop0
 	i32.const	$push2=, -16
-	i32.and 	$push44=, $pop1, $pop2
-	tee_local	$push43=, $1=, $pop44
+	i32.and 	$1=, $pop1, $pop2
 	i32.const	$push3=, 16
-	i32.add 	$push42=, $pop43, $pop3
-	tee_local	$push41=, $2=, $pop42
-	i32.store	12($4), $pop41
+	i32.add 	$2=, $1, $pop3
+	i32.store	12($4), $2
 	block   	
 	i64.load	$push5=, 0($1)
 	i64.load	$push4=, 8($1)
@@ -102,11 +94,10 @@ va_long_double:                         # @va_long_double
 	i64.const	$push6=, 4611846683218194439
 	i32.call	$push8=, __eqtf2@FUNCTION, $pop5, $pop4, $pop7, $pop6
 	br_if   	0, $pop8        # 0: down to label1
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push9=, 32
-	i32.add 	$push48=, $1, $pop9
-	tee_local	$push47=, $3=, $pop48
-	i32.store	12($4), $pop47
+	i32.add 	$3=, $1, $pop9
+	i32.store	12($4), $3
 	i64.load	$push13=, 0($2)
 	i32.const	$push10=, 24
 	i32.add 	$push11=, $1, $pop10
@@ -115,11 +106,10 @@ va_long_double:                         # @va_long_double
 	i64.const	$push14=, 4611787105943148885
 	i32.call	$push16=, __eqtf2@FUNCTION, $pop13, $pop12, $pop15, $pop14
 	br_if   	0, $pop16       # 0: down to label1
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push17=, 48
-	i32.add 	$push50=, $1, $pop17
-	tee_local	$push49=, $2=, $pop50
-	i32.store	12($4), $pop49
+	i32.add 	$2=, $1, $pop17
+	i32.store	12($4), $2
 	i64.load	$push21=, 0($3)
 	i32.const	$push18=, 40
 	i32.add 	$push19=, $1, $pop18
@@ -128,7 +118,7 @@ va_long_double:                         # @va_long_double
 	i64.const	$push22=, 4611719242030715220
 	i32.call	$push24=, __eqtf2@FUNCTION, $pop21, $pop20, $pop23, $pop22
 	br_if   	0, $pop24       # 0: down to label1
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push25=, 64
 	i32.add 	$push26=, $1, $pop25
 	i32.store	12($4), $pop26
@@ -140,7 +130,7 @@ va_long_double:                         # @va_long_double
 	i64.const	$push31=, 4611706774898825505
 	i32.call	$push33=, __eqtf2@FUNCTION, $pop30, $pop29, $pop32, $pop31
 	br_if   	0, $pop33       # 0: down to label1
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push40=, 0
 	i32.const	$push38=, 16
 	i32.add 	$push39=, $4, $pop38
@@ -161,14 +151,13 @@ va_long_double:                         # @va_long_double
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push30=, 0
+# %bb.0:                                # %entry
 	i32.const	$push28=, 0
 	i32.load	$push27=, __stack_pointer($pop28)
 	i32.const	$push29=, 96
-	i32.sub 	$push40=, $pop27, $pop29
-	tee_local	$push39=, $0=, $pop40
-	i32.store	__stack_pointer($pop30), $pop39
+	i32.sub 	$0=, $pop27, $pop29
+	i32.const	$push30=, 0
+	i32.store	__stack_pointer($pop30), $0
 	i32.const	$push31=, 64
 	i32.add 	$push32=, $0, $pop31
 	i32.const	$push0=, 24
@@ -225,6 +214,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ba66717c4..d3d1622bd 100644
--- a/test/torture-s/va-arg-6.c.s
+++ b/test/torture-s/va-arg-6.c.s
@@ -8,112 +8,100 @@ f:                                      # @f
 	.param  	i32, i32
 	.result 	i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push51=, 0
+# %bb.0:                                # %entry
 	i32.const	$push49=, 0
 	i32.load	$push48=, __stack_pointer($pop49)
 	i32.const	$push50=, 16
-	i32.sub 	$push58=, $pop48, $pop50
-	tee_local	$push57=, $4=, $pop58
-	i32.store	__stack_pointer($pop51), $pop57
+	i32.sub 	$4=, $pop48, $pop50
+	i32.const	$push51=, 0
+	i32.store	__stack_pointer($pop51), $4
 	i32.const	$push0=, 4
-	i32.add 	$push56=, $1, $pop0
-	tee_local	$push55=, $2=, $pop56
-	i32.store	12($4), $pop55
+	i32.add 	$2=, $1, $pop0
+	i32.store	12($4), $2
 	block   	
 	i32.load	$push1=, 0($1)
 	i32.const	$push2=, 10
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 7
 	i32.add 	$push5=, $2, $pop4
 	i32.const	$push6=, -8
-	i32.and 	$push62=, $pop5, $pop6
-	tee_local	$push61=, $1=, $pop62
+	i32.and 	$1=, $pop5, $pop6
 	i32.const	$push7=, 8
-	i32.add 	$push60=, $pop61, $pop7
-	tee_local	$push59=, $2=, $pop60
-	i32.store	12($4), $pop59
+	i32.add 	$2=, $1, $pop7
+	i32.store	12($4), $2
 	i64.load	$push8=, 0($1)
 	i64.const	$push9=, 10000000000
 	i64.ne  	$push10=, $pop8, $pop9
 	br_if   	0, $pop10       # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push11=, 12
-	i32.add 	$push64=, $1, $pop11
-	tee_local	$push63=, $1=, $pop64
-	i32.store	12($4), $pop63
+	i32.add 	$1=, $1, $pop11
+	i32.store	12($4), $1
 	i32.load	$push12=, 0($2)
 	i32.const	$push13=, 11
 	i32.ne  	$push14=, $pop12, $pop13
 	br_if   	0, $pop14       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push15=, 15
 	i32.add 	$push16=, $1, $pop15
 	i32.const	$push17=, -16
-	i32.and 	$push68=, $pop16, $pop17
-	tee_local	$push67=, $1=, $pop68
+	i32.and 	$1=, $pop16, $pop17
 	i32.const	$push18=, 16
-	i32.add 	$push66=, $pop67, $pop18
-	tee_local	$push65=, $2=, $pop66
-	i32.store	12($4), $pop65
+	i32.add 	$2=, $1, $pop18
+	i32.store	12($4), $2
 	i64.load	$push20=, 0($1)
 	i64.load	$push19=, 8($1)
 	i64.const	$push22=, -1475739525896764129
 	i64.const	$push21=, 4611846459164112977
 	i32.call	$push23=, __eqtf2@FUNCTION, $pop20, $pop19, $pop22, $pop21
 	br_if   	0, $pop23       # 0: down to label0
-# BB#4:                                 # %if.end16
+# %bb.4:                                # %if.end16
 	i32.const	$push24=, 20
-	i32.add 	$push70=, $1, $pop24
-	tee_local	$push69=, $3=, $pop70
-	i32.store	12($4), $pop69
+	i32.add 	$3=, $1, $pop24
+	i32.store	12($4), $3
 	i32.load	$push25=, 0($2)
 	i32.const	$push26=, 12
 	i32.ne  	$push27=, $pop25, $pop26
 	br_if   	0, $pop27       # 0: down to label0
-# BB#5:                                 # %if.end21
+# %bb.5:                                # %if.end21
 	i32.const	$push28=, 24
-	i32.add 	$push72=, $1, $pop28
-	tee_local	$push71=, $2=, $pop72
-	i32.store	12($4), $pop71
+	i32.add 	$2=, $1, $pop28
+	i32.store	12($4), $2
 	i32.load	$push29=, 0($3)
 	i32.const	$push30=, 13
 	i32.ne  	$push31=, $pop29, $pop30
 	br_if   	0, $pop31       # 0: down to label0
-# BB#6:                                 # %if.end26
+# %bb.6:                                # %if.end26
 	i32.const	$push32=, 32
-	i32.add 	$push74=, $1, $pop32
-	tee_local	$push73=, $3=, $pop74
-	i32.store	12($4), $pop73
+	i32.add 	$3=, $1, $pop32
+	i32.store	12($4), $3
 	i64.load	$push33=, 0($2)
 	i64.const	$push34=, 20000000000
 	i64.ne  	$push35=, $pop33, $pop34
 	br_if   	0, $pop35       # 0: down to label0
-# BB#7:                                 # %if.end31
+# %bb.7:                                # %if.end31
 	i32.const	$push36=, 36
-	i32.add 	$push76=, $1, $pop36
-	tee_local	$push75=, $1=, $pop76
-	i32.store	12($4), $pop75
+	i32.add 	$1=, $1, $pop36
+	i32.store	12($4), $1
 	i32.load	$push37=, 0($3)
 	i32.const	$push38=, 14
 	i32.ne  	$push39=, $pop37, $pop38
 	br_if   	0, $pop39       # 0: down to label0
-# BB#8:                                 # %if.end36
+# %bb.8:                                # %if.end36
 	i32.const	$push40=, 7
 	i32.add 	$push41=, $1, $pop40
 	i32.const	$push42=, -8
-	i32.and 	$push78=, $pop41, $pop42
-	tee_local	$push77=, $1=, $pop78
+	i32.and 	$1=, $pop41, $pop42
 	i32.const	$push43=, 8
-	i32.add 	$push44=, $pop77, $pop43
+	i32.add 	$push44=, $1, $pop43
 	i32.store	12($4), $pop44
 	f64.load	$push45=, 0($1)
 	f64.const	$push46=, 0x1.5c28f5c28f5c3p1
 	f64.ne  	$push47=, $pop45, $pop46
 	br_if   	0, $pop47       # 0: down to label0
-# BB#9:                                 # %if.end41
+# %bb.9:                                # %if.end41
 	i32.const	$push54=, 0
 	i32.const	$push52=, 16
 	i32.add 	$push53=, $4, $pop52
@@ -134,14 +122,13 @@ f:                                      # @f
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push27=, 0
+# %bb.0:                                # %entry
 	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.sub 	$0=, $pop24, $pop26
+	i32.const	$push27=, 0
+	i32.store	__stack_pointer($pop27), $0
 	i32.const	$push0=, 64
 	i32.add 	$push1=, $0, $pop0
 	i64.const	$push2=, 4613307314293241283
@@ -183,6 +170,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9da27da7b..3a92a875d 100644
--- a/test/torture-s/va-arg-7.c.s
+++ b/test/torture-s/va-arg-7.c.s
@@ -7,32 +7,30 @@
 debug:                                  # @debug
 	.param  	i32, i32, i32, i32, i32, i32, i32, f64, f64, f64, f64, f64, f64, f64, f64, f64, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push17=, 0
+# %bb.0:                                # %entry
 	i32.const	$push15=, 0
 	i32.load	$push14=, __stack_pointer($pop15)
 	i32.const	$push16=, 16
-	i32.sub 	$push25=, $pop14, $pop16
-	tee_local	$push24=, $18=, $pop25
-	i32.store	__stack_pointer($pop17), $pop24
+	i32.sub 	$18=, $pop14, $pop16
+	i32.const	$push17=, 0
+	i32.store	__stack_pointer($pop17), $18
 	i32.const	$push0=, 4
-	i32.add 	$push23=, $16, $pop0
-	tee_local	$push22=, $17=, $pop23
-	i32.store	12($18), $pop22
+	i32.add 	$17=, $16, $pop0
+	i32.store	12($18), $17
 	block   	
 	i32.load	$push1=, 0($16)
 	i32.const	$push21=, 8
 	i32.ne  	$push2=, $pop1, $pop21
 	br_if   	0, $pop2        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push26=, 8
-	i32.add 	$push3=, $16, $pop26
+# %bb.1:                                # %if.end
+	i32.const	$push22=, 8
+	i32.add 	$push3=, $16, $pop22
 	i32.store	12($18), $pop3
 	i32.load	$push4=, 0($17)
 	i32.const	$push5=, 9
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push7=, 12
 	i32.add 	$push8=, $16, $pop7
 	i32.store	12($18), $pop8
@@ -42,7 +40,7 @@ debug:                                  # @debug
 	i32.const	$push12=, 10
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	0, $pop13       # 0: down to label0
-# BB#3:                                 # %if.end11
+# %bb.3:                                # %if.end11
 	i32.const	$push20=, 0
 	i32.const	$push18=, 16
 	i32.add 	$push19=, $18, $pop18
@@ -63,14 +61,13 @@ debug:                                  # @debug
 main:                                   # @main
 	.result 	i32
 	.local  	f64, i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $1=, $pop8
-	i32.store	__stack_pointer($pop6), $pop7
+	i32.sub 	$1=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $1
 	i32.const	$push0=, 10
 	i32.store	8($1), $pop0
 	i64.const	$push1=, 38654705672
@@ -84,6 +81,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 81d67834e..c3efd00e2 100644
--- a/test/torture-s/va-arg-8.c.s
+++ b/test/torture-s/va-arg-8.c.s
@@ -7,37 +7,34 @@
 debug:                                  # @debug
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push15=, 0
+# %bb.0:                                # %entry
 	i32.const	$push13=, 0
 	i32.load	$push12=, __stack_pointer($pop13)
 	i32.const	$push14=, 16
-	i32.sub 	$push22=, $pop12, $pop14
-	tee_local	$push21=, $11=, $pop22
-	i32.store	__stack_pointer($pop15), $pop21
+	i32.sub 	$11=, $pop12, $pop14
+	i32.const	$push15=, 0
+	i32.store	__stack_pointer($pop15), $11
 	i32.const	$push0=, 4
-	i32.add 	$push20=, $9, $pop0
-	tee_local	$push19=, $10=, $pop20
-	i32.store	12($11), $pop19
+	i32.add 	$10=, $9, $pop0
+	i32.store	12($11), $10
 	block   	
 	i32.load	$push1=, 0($9)
 	i32.const	$push2=, 10
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 7
 	i32.add 	$push5=, $10, $pop4
 	i32.const	$push6=, -8
-	i32.and 	$push24=, $pop5, $pop6
-	tee_local	$push23=, $9=, $pop24
+	i32.and 	$9=, $pop5, $pop6
 	i32.const	$push7=, 8
-	i32.add 	$push8=, $pop23, $pop7
+	i32.add 	$push8=, $9, $pop7
 	i32.store	12($11), $pop8
 	i64.load	$push9=, 0($9)
 	i64.const	$push10=, 20014547621496
 	i64.ne  	$push11=, $pop9, $pop10
 	br_if   	0, $pop11       # 0: down to label0
-# BB#2:                                 # %if.end6
+# %bb.2:                                # %if.end6
 	i32.const	$push18=, 0
 	i32.const	$push16=, 16
 	i32.add 	$push17=, $11, $pop16
@@ -58,14 +55,13 @@ debug:                                  # @debug
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push6=, 0
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.load	$push3=, __stack_pointer($pop4)
 	i32.const	$push5=, 16
-	i32.sub 	$push8=, $pop3, $pop5
-	tee_local	$push7=, $0=, $pop8
-	i32.store	__stack_pointer($pop6), $pop7
+	i32.sub 	$0=, $pop3, $pop5
+	i32.const	$push6=, 0
+	i32.store	__stack_pointer($pop6), $0
 	i64.const	$push0=, 20014547621496
 	i64.store	8($0), $pop0
 	i32.const	$push1=, 10
@@ -79,6 +75,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 12df8febd..f5fbddd83 100644
--- a/test/torture-s/va-arg-9.c.s
+++ b/test/torture-s/va-arg-9.c.s
@@ -7,12 +7,12 @@
 to_hex:                                 # @to_hex
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push0=, 16
 	i32.ge_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push2=, .L.str
 	i32.add 	$push3=, $0, $pop2
 	i32.load8_s	$push4=, 0($pop3)
@@ -32,46 +32,44 @@ to_hex:                                 # @to_hex
 fap:                                    # @fap
 	.param  	i32, i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	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
+# %bb.1:                                # %if.end
+	i32.load8_u	$0=, 0($1)
 	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
+	i32.eqz 	$push16=, $0
+	br_if   	0, $pop16       # 0: down to label2
+# %bb.2:                                # %while.body.preheader
+	i32.const	$push10=, 1
+	i32.add 	$1=, $1, $pop10
 .LBB1_3:                                # %while.body
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label3:
-	i32.load	$push15=, 0($2)
-	tee_local	$push14=, $3=, $pop15
-	i32.const	$push13=, 16
-	i32.ge_u	$push5=, $pop14, $pop13
+	i32.load	$3=, 0($2)
+	i32.const	$push11=, 16
+	i32.ge_u	$push5=, $3, $pop11
 	br_if   	2, $pop5        # 2: down to label1
-# BB#4:                                 # %to_hex.exit
+# %bb.4:                                # %to_hex.exit
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push17=, .L.str
-	i32.add 	$push7=, $3, $pop17
+	i32.const	$push13=, .L.str
+	i32.add 	$push7=, $3, $pop13
 	i32.load8_u	$push8=, 0($pop7)
-	i32.const	$push16=, 255
-	i32.and 	$push6=, $0, $pop16
+	i32.const	$push12=, 255
+	i32.and 	$push6=, $0, $pop12
 	i32.ne  	$push9=, $pop8, $pop6
 	br_if   	2, $pop9        # 2: down to label1
-# BB#5:                                 # %if.end5
+# %bb.5:                                # %if.end5
                                         #   in Loop: Header=BB1_3 Depth=1
-	i32.const	$push19=, 4
-	i32.add 	$2=, $2, $pop19
+	i32.const	$push15=, 4
+	i32.add 	$2=, $2, $pop15
 	i32.load8_u	$0=, 0($1)
-	i32.const	$push18=, 1
-	i32.add 	$push0=, $1, $pop18
+	i32.const	$push14=, 1
+	i32.add 	$push0=, $1, $pop14
 	copy_local	$1=, $pop0
 	br_if   	0, $0           # 0: up to label3
 .LBB1_6:                                # %while.end
@@ -93,54 +91,51 @@ fap:                                    # @fap
 f0:                                     # @f0
 	.param  	i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $4
 	i32.store	12($4), $1
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$1=, 0($0)
 	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.eqz 	$push22=, $1
+	br_if   	0, $pop22       # 0: down to label5
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$0=, $0, $pop16
 	i32.load	$2=, 12($4)
 .LBB2_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label6:
-	i32.load	$push23=, 0($2)
-	tee_local	$push22=, $3=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$3=, 0($2)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $3, $pop17
 	br_if   	2, $pop4        # 2: down to label4
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB2_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $3, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $3, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $1, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $1, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label4
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB2_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$2=, $2, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$2=, $2, $pop21
 	i32.load8_u	$1=, 0($0)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $0, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $0, $pop20
 	copy_local	$0=, $pop0
 	br_if   	0, $1           # 0: up to label6
 .LBB2_6:                                # %fap.exit
@@ -166,54 +161,51 @@ f0:                                     # @f0
 f1:                                     # @f1
 	.param  	i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$5=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $5
 	i32.store	12($5), $2
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$2=, 0($1)
 	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.eqz 	$push22=, $2
+	br_if   	0, $pop22       # 0: down to label8
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$1=, $1, $pop16
 	i32.load	$3=, 12($5)
 .LBB3_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label9:
-	i32.load	$push23=, 0($3)
-	tee_local	$push22=, $4=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$4=, 0($3)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $4, $pop17
 	br_if   	2, $pop4        # 2: down to label7
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB3_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $4, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $4, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $2, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $2, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label7
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB3_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$3=, $3, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$3=, $3, $pop21
 	i32.load8_u	$2=, 0($1)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $1, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $1, $pop20
 	copy_local	$1=, $pop0
 	br_if   	0, $2           # 0: up to label9
 .LBB3_6:                                # %fap.exit
@@ -239,54 +231,51 @@ f1:                                     # @f1
 f2:                                     # @f2
 	.param  	i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$6=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $6
 	i32.store	12($6), $3
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$3=, 0($2)
 	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.eqz 	$push22=, $3
+	br_if   	0, $pop22       # 0: down to label11
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$2=, $2, $pop16
 	i32.load	$4=, 12($6)
 .LBB4_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label12:
-	i32.load	$push23=, 0($4)
-	tee_local	$push22=, $5=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$5=, 0($4)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $5, $pop17
 	br_if   	2, $pop4        # 2: down to label10
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB4_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $5, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $5, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $3, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $3, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label10
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB4_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$4=, $4, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$4=, $4, $pop21
 	i32.load8_u	$3=, 0($2)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $2, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $2, $pop20
 	copy_local	$2=, $pop0
 	br_if   	0, $3           # 0: up to label12
 .LBB4_6:                                # %fap.exit
@@ -312,54 +301,51 @@ f2:                                     # @f2
 f3:                                     # @f3
 	.param  	i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$7=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $7
 	i32.store	12($7), $4
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$4=, 0($3)
 	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.eqz 	$push22=, $4
+	br_if   	0, $pop22       # 0: down to label14
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$3=, $3, $pop16
 	i32.load	$5=, 12($7)
 .LBB5_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label15:
-	i32.load	$push23=, 0($5)
-	tee_local	$push22=, $6=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$6=, 0($5)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $6, $pop17
 	br_if   	2, $pop4        # 2: down to label13
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB5_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $6, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $6, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $4, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $4, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label13
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB5_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$5=, $5, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$5=, $5, $pop21
 	i32.load8_u	$4=, 0($3)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $3, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $3, $pop20
 	copy_local	$3=, $pop0
 	br_if   	0, $4           # 0: up to label15
 .LBB5_6:                                # %fap.exit
@@ -385,54 +371,51 @@ f3:                                     # @f3
 f4:                                     # @f4
 	.param  	i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$8=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $8
 	i32.store	12($8), $5
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$5=, 0($4)
 	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.eqz 	$push22=, $5
+	br_if   	0, $pop22       # 0: down to label17
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$4=, $4, $pop16
 	i32.load	$6=, 12($8)
 .LBB6_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label18:
-	i32.load	$push23=, 0($6)
-	tee_local	$push22=, $7=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$7=, 0($6)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $7, $pop17
 	br_if   	2, $pop4        # 2: down to label16
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB6_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $7, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $7, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $5, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $5, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label16
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB6_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$6=, $6, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$6=, $6, $pop21
 	i32.load8_u	$5=, 0($4)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $4, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $4, $pop20
 	copy_local	$4=, $pop0
 	br_if   	0, $5           # 0: up to label18
 .LBB6_6:                                # %fap.exit
@@ -458,54 +441,51 @@ f4:                                     # @f4
 f5:                                     # @f5
 	.param  	i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$9=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $9
 	i32.store	12($9), $6
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$6=, 0($5)
 	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.eqz 	$push22=, $6
+	br_if   	0, $pop22       # 0: down to label20
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$5=, $5, $pop16
 	i32.load	$7=, 12($9)
 .LBB7_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label21:
-	i32.load	$push23=, 0($7)
-	tee_local	$push22=, $8=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$8=, 0($7)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $8, $pop17
 	br_if   	2, $pop4        # 2: down to label19
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB7_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $8, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $8, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $6, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $6, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label19
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB7_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$7=, $7, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$7=, $7, $pop21
 	i32.load8_u	$6=, 0($5)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $5, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $5, $pop20
 	copy_local	$5=, $pop0
 	br_if   	0, $6           # 0: up to label21
 .LBB7_6:                                # %fap.exit
@@ -531,54 +511,51 @@ f5:                                     # @f5
 f6:                                     # @f6
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$10=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $10
 	i32.store	12($10), $7
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$7=, 0($6)
 	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.eqz 	$push22=, $7
+	br_if   	0, $pop22       # 0: down to label23
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$6=, $6, $pop16
 	i32.load	$8=, 12($10)
 .LBB8_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label24:
-	i32.load	$push23=, 0($8)
-	tee_local	$push22=, $9=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$9=, 0($8)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $9, $pop17
 	br_if   	2, $pop4        # 2: down to label22
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB8_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $9, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $9, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $7, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $7, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label22
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB8_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$8=, $8, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$8=, $8, $pop21
 	i32.load8_u	$7=, 0($6)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $6, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $6, $pop20
 	copy_local	$6=, $pop0
 	br_if   	0, $7           # 0: up to label24
 .LBB8_6:                                # %fap.exit
@@ -604,54 +581,51 @@ f6:                                     # @f6
 f7:                                     # @f7
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$11=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $11
 	i32.store	12($11), $8
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$8=, 0($7)
 	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.eqz 	$push22=, $8
+	br_if   	0, $pop22       # 0: down to label26
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$7=, $7, $pop16
 	i32.load	$9=, 12($11)
 .LBB9_3:                                # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label27:
-	i32.load	$push23=, 0($9)
-	tee_local	$push22=, $10=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$10=, 0($9)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $10, $pop17
 	br_if   	2, $pop4        # 2: down to label25
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB9_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $10, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $10, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $8, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $8, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label25
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB9_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$9=, $9, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$9=, $9, $pop21
 	i32.load8_u	$8=, 0($7)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $7, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $7, $pop20
 	copy_local	$7=, $pop0
 	br_if   	0, $8           # 0: up to label27
 .LBB9_6:                                # %fap.exit
@@ -677,54 +651,51 @@ f7:                                     # @f7
 f8:                                     # @f8
 	.param  	i32, i32, i32, i32, i32, i32, i32, i32, i32, i32
 	.local  	i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$12=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $12
 	i32.store	12($12), $9
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$9=, 0($8)
 	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.eqz 	$push22=, $9
+	br_if   	0, $pop22       # 0: down to label29
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$8=, $8, $pop16
 	i32.load	$10=, 12($12)
 .LBB10_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label30:
-	i32.load	$push23=, 0($10)
-	tee_local	$push22=, $11=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$11=, 0($10)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $11, $pop17
 	br_if   	2, $pop4        # 2: down to label28
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB10_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $11, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $11, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $9, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $9, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label28
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB10_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$10=, $10, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$10=, $10, $pop21
 	i32.load8_u	$9=, 0($8)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $8, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $8, $pop20
 	copy_local	$8=, $pop0
 	br_if   	0, $9           # 0: up to label30
 .LBB10_6:                               # %fap.exit
@@ -750,54 +721,51 @@ f8:                                     # @f8
 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
+# %bb.0:                                # %entry
 	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.sub 	$13=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $13
 	i32.store	12($13), $10
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$10=, 0($9)
 	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.eqz 	$push22=, $10
+	br_if   	0, $pop22       # 0: down to label32
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$9=, $9, $pop16
 	i32.load	$11=, 12($13)
 .LBB11_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label33:
-	i32.load	$push23=, 0($11)
-	tee_local	$push22=, $12=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$12=, 0($11)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $12, $pop17
 	br_if   	2, $pop4        # 2: down to label31
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB11_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $12, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $12, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $10, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $10, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label31
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB11_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$11=, $11, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$11=, $11, $pop21
 	i32.load8_u	$10=, 0($9)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $9, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $9, $pop20
 	copy_local	$9=, $pop0
 	br_if   	0, $10          # 0: up to label33
 .LBB11_6:                               # %fap.exit
@@ -823,54 +791,51 @@ f9:                                     # @f9
 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
+# %bb.0:                                # %entry
 	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.sub 	$14=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $14
 	i32.store	12($14), $11
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$11=, 0($10)
 	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.eqz 	$push22=, $11
+	br_if   	0, $pop22       # 0: down to label35
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$10=, $10, $pop16
 	i32.load	$12=, 12($14)
 .LBB12_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label36:
-	i32.load	$push23=, 0($12)
-	tee_local	$push22=, $13=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$13=, 0($12)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $13, $pop17
 	br_if   	2, $pop4        # 2: down to label34
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $13, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $13, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $11, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $11, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label34
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB12_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$12=, $12, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$12=, $12, $pop21
 	i32.load8_u	$11=, 0($10)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $10, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $10, $pop20
 	copy_local	$10=, $pop0
 	br_if   	0, $11          # 0: up to label36
 .LBB12_6:                               # %fap.exit
@@ -896,54 +861,51 @@ f10:                                    # @f10
 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
+# %bb.0:                                # %entry
 	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.sub 	$15=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $15
 	i32.store	12($15), $12
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$12=, 0($11)
 	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.eqz 	$push22=, $12
+	br_if   	0, $pop22       # 0: down to label38
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$11=, $11, $pop16
 	i32.load	$13=, 12($15)
 .LBB13_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label39:
-	i32.load	$push23=, 0($13)
-	tee_local	$push22=, $14=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$14=, 0($13)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $14, $pop17
 	br_if   	2, $pop4        # 2: down to label37
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB13_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $14, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $14, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $12, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $12, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label37
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB13_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$13=, $13, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$13=, $13, $pop21
 	i32.load8_u	$12=, 0($11)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $11, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $11, $pop20
 	copy_local	$11=, $pop0
 	br_if   	0, $12          # 0: up to label39
 .LBB13_6:                               # %fap.exit
@@ -969,54 +931,51 @@ f11:                                    # @f11
 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	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$16=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $16
 	i32.store	12($16), $13
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$13=, 0($12)
 	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.eqz 	$push22=, $13
+	br_if   	0, $pop22       # 0: down to label41
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$12=, $12, $pop16
 	i32.load	$14=, 12($16)
 .LBB14_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label42:
-	i32.load	$push23=, 0($14)
-	tee_local	$push22=, $15=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$15=, 0($14)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $15, $pop17
 	br_if   	2, $pop4        # 2: down to label40
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB14_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $15, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $15, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $13, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $13, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label40
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB14_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$14=, $14, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$14=, $14, $pop21
 	i32.load8_u	$13=, 0($12)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $12, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $12, $pop20
 	copy_local	$12=, $pop0
 	br_if   	0, $13          # 0: up to label42
 .LBB14_6:                               # %fap.exit
@@ -1042,54 +1001,51 @@ f12:                                    # @f12
 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
+# %bb.0:                                # %entry
 	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.sub 	$17=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $17
 	i32.store	12($17), $14
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$14=, 0($13)
 	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.eqz 	$push22=, $14
+	br_if   	0, $pop22       # 0: down to label44
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$13=, $13, $pop16
 	i32.load	$15=, 12($17)
 .LBB15_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label45:
-	i32.load	$push23=, 0($15)
-	tee_local	$push22=, $16=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$16=, 0($15)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $16, $pop17
 	br_if   	2, $pop4        # 2: down to label43
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB15_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $16, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $16, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $14, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $14, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label43
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB15_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$15=, $15, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$15=, $15, $pop21
 	i32.load8_u	$14=, 0($13)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $13, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $13, $pop20
 	copy_local	$13=, $pop0
 	br_if   	0, $14          # 0: up to label45
 .LBB15_6:                               # %fap.exit
@@ -1115,54 +1071,51 @@ f13:                                    # @f13
 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
+# %bb.0:                                # %entry
 	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.sub 	$18=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $18
 	i32.store	12($18), $15
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$15=, 0($14)
 	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.eqz 	$push22=, $15
+	br_if   	0, $pop22       # 0: down to label47
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$14=, $14, $pop16
 	i32.load	$16=, 12($18)
 .LBB16_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label48:
-	i32.load	$push23=, 0($16)
-	tee_local	$push22=, $17=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$17=, 0($16)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $17, $pop17
 	br_if   	2, $pop4        # 2: down to label46
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB16_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $17, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $17, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $15, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $15, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label46
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB16_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$16=, $16, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$16=, $16, $pop21
 	i32.load8_u	$15=, 0($14)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $14, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $14, $pop20
 	copy_local	$14=, $pop0
 	br_if   	0, $15          # 0: up to label48
 .LBB16_6:                               # %fap.exit
@@ -1188,54 +1141,51 @@ f14:                                    # @f14
 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	$push12=, 0
+# %bb.0:                                # %entry
 	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.sub 	$19=, $pop9, $pop11
+	i32.const	$push12=, 0
+	i32.store	__stack_pointer($pop12), $19
 	i32.store	12($19), $16
 	block   	
 	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
+# %bb.1:                                # %if.end.i
+	i32.load8_u	$16=, 0($15)
 	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.eqz 	$push22=, $16
+	br_if   	0, $pop22       # 0: down to label50
+# %bb.2:                                # %while.body.i.preheader
+	i32.const	$push16=, 1
+	i32.add 	$15=, $15, $pop16
 	i32.load	$17=, 12($19)
 .LBB17_3:                               # %while.body.i
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label51:
-	i32.load	$push23=, 0($17)
-	tee_local	$push22=, $18=, $pop23
-	i32.const	$push21=, 16
-	i32.ge_u	$push4=, $pop22, $pop21
+	i32.load	$18=, 0($17)
+	i32.const	$push17=, 16
+	i32.ge_u	$push4=, $18, $pop17
 	br_if   	2, $pop4        # 2: down to label49
-# BB#4:                                 # %to_hex.exit.i
+# %bb.4:                                # %to_hex.exit.i
                                         #   in Loop: Header=BB17_3 Depth=1
-	i32.const	$push25=, .L.str
-	i32.add 	$push6=, $18, $pop25
+	i32.const	$push19=, .L.str
+	i32.add 	$push6=, $18, $pop19
 	i32.load8_u	$push7=, 0($pop6)
-	i32.const	$push24=, 255
-	i32.and 	$push5=, $16, $pop24
+	i32.const	$push18=, 255
+	i32.and 	$push5=, $16, $pop18
 	i32.ne  	$push8=, $pop7, $pop5
 	br_if   	2, $pop8        # 2: down to label49
-# BB#5:                                 # %if.end5.i
+# %bb.5:                                # %if.end5.i
                                         #   in Loop: Header=BB17_3 Depth=1
-	i32.const	$push27=, 4
-	i32.add 	$17=, $17, $pop27
+	i32.const	$push21=, 4
+	i32.add 	$17=, $17, $pop21
 	i32.load8_u	$16=, 0($15)
-	i32.const	$push26=, 1
-	i32.add 	$push0=, $15, $pop26
+	i32.const	$push20=, 1
+	i32.add 	$push0=, $15, $pop20
 	copy_local	$15=, $pop0
 	br_if   	0, $16          # 0: up to label51
 .LBB17_6:                               # %fap.exit
@@ -1261,14 +1211,13 @@ f15:                                    # @f15
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push84=, 0
+# %bb.0:                                # %entry
 	i32.const	$push82=, 0
 	i32.load	$push81=, __stack_pointer($pop82)
 	i32.const	$push83=, 640
-	i32.sub 	$push292=, $pop81, $pop83
-	tee_local	$push291=, $0=, $pop292
-	i32.store	__stack_pointer($pop84), $pop291
+	i32.sub 	$0=, $pop81, $pop83
+	i32.const	$push84=, 0
+	i32.store	__stack_pointer($pop84), $0
 	i32.const	$push85=, 576
 	i32.add 	$push86=, $0, $pop85
 	i32.const	$push0=, 56
@@ -1658,7 +1607,7 @@ main:                                   # @main
 	.size	.L.str, 17
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ea627140b..3f3b4f47c 100644
--- a/test/torture-s/va-arg-pack-1.c.s
+++ b/test/torture-s/va-arg-pack-1.c.s
@@ -8,116 +8,108 @@ foo1:                                   # @foo1
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push71=, 0
+# %bb.0:                                # %entry
 	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.sub 	$6=, $pop68, $pop70
+	i32.const	$push71=, 0
+	i32.store	__stack_pointer($pop71), $6
 	i32.store	12($6), $2
 	block   	
 	i32.const	$push0=, 19
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %lor.lhs.false3
+# %bb.1:                                # %lor.lhs.false3
 	i32.const	$push2=, seen
-	i32.add 	$push82=, $0, $pop2
-	tee_local	$push81=, $2=, $pop82
-	i32.load8_u	$push3=, 0($pop81)
+	i32.add 	$2=, $0, $pop2
+	i32.load8_u	$push3=, 0($2)
 	br_if   	0, $pop3        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push4=, 0
 	i32.load	$push5=, cnt($pop4)
 	i32.const	$push6=, 1
-	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.add 	$3=, $pop5, $pop6
+	i32.store8	0($2), $3
+	i32.const	$push79=, 0
+	i32.store	cnt($pop79), $3
 	i32.const	$push7=, 6
 	i32.ne  	$push8=, $1, $pop7
 	br_if   	0, $pop8        # 0: down to label0
-# BB#3:                                 # %if.end9
-	i32.load	$push89=, 12($6)
-	tee_local	$push88=, $1=, $pop89
+# %bb.3:                                # %if.end9
+	i32.load	$2=, 12($6)
 	i32.const	$push9=, 4
-	i32.add 	$push87=, $pop88, $pop9
-	tee_local	$push86=, $2=, $pop87
-	i32.store	12($6), $pop86
-	i32.load	$push10=, 0($1)
+	i32.add 	$3=, $2, $pop9
+	i32.store	12($6), $3
+	i32.load	$push10=, 0($2)
 	i32.const	$push11=, 5
 	i32.ne  	$push12=, $pop10, $pop11
 	br_if   	0, $pop12       # 0: down to label0
-# BB#4:                                 # %if.end13
+# %bb.4:                                # %if.end13
 	block   	
 	i32.const	$push13=, 2
 	i32.eq  	$push14=, $0, $pop13
 	br_if   	0, $pop14       # 0: down to label1
-# BB#5:                                 # %if.end13
+# %bb.5:                                # %if.end13
 	block   	
 	i32.const	$push15=, 1
 	i32.eq  	$push16=, $0, $pop15
 	br_if   	0, $pop16       # 0: down to label2
-# BB#6:                                 # %if.end13
+# %bb.6:                                # %if.end13
 	br_if   	2, $0           # 2: down to label0
-# BB#7:                                 # %sw.bb
+# %bb.7:                                # %sw.bb
 	i32.const	$push41=, 8
-	i32.add 	$push92=, $1, $pop41
-	tee_local	$push91=, $2=, $pop92
-	i32.store	12($6), $pop91
+	i32.add 	$3=, $2, $pop41
+	i32.store	12($6), $3
 	i32.const	$push42=, 4
-	i32.add 	$push43=, $1, $pop42
+	i32.add 	$push43=, $2, $pop42
 	i32.load	$push44=, 0($pop43)
-	i32.const	$push90=, 9
-	i32.ne  	$push45=, $pop44, $pop90
+	i32.const	$push80=, 9
+	i32.ne  	$push45=, $pop44, $pop80
 	br_if   	2, $pop45       # 2: down to label0
-# BB#8:                                 # %sw.bb
+# %bb.8:                                # %sw.bb
 	i32.const	$push46=, 0
 	i32.load	$push40=, v1($pop46)
-	i32.const	$push93=, 9
-	i32.ne  	$push47=, $pop40, $pop93
+	i32.const	$push81=, 9
+	i32.ne  	$push47=, $pop40, $pop81
 	br_if   	2, $pop47       # 2: down to label0
-# BB#9:                                 # %if.end22
+# %bb.9:                                # %if.end22
 	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
+	i32.const	$push83=, 8
+	i32.add 	$push49=, $3, $pop83
 	i64.load	$push50=, 0($pop49):p2align=0
 	i64.store	0($pop51), $pop50
-	i64.load	$push52=, 0($2):p2align=0
+	i64.load	$push52=, 0($3):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.add 	$3=, $2, $pop53
+	i32.store	12($6), $3
 	i32.const	$push77=, 16
 	i32.add 	$push78=, $6, $pop77
-	i32.const	$push94=, v4
+	i32.const	$push82=, v4
 	i32.const	$push54=, 16
-	i32.call	$push55=, memcmp@FUNCTION, $pop78, $pop94, $pop54
+	i32.call	$push55=, memcmp@FUNCTION, $pop78, $pop82, $pop54
 	br_if   	2, $pop55       # 2: down to label0
-# BB#10:                                # %if.end28
+# %bb.10:                               # %if.end28
 	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
+	i32.add 	$1=, $2, $pop56
+	i32.store	12($6), $1
+	i32.load	$push57=, 0($3)
+	i32.const	$push84=, v4
+	i32.ne  	$push58=, $pop57, $pop84
 	br_if   	2, $pop58       # 2: down to label0
-# BB#11:                                # %if.end34
+# %bb.11:                               # %if.end34
 	i32.const	$push60=, 32
-	i32.add 	$push61=, $1, $pop60
+	i32.add 	$push61=, $2, $pop60
 	i32.store	12($6), $pop61
-	i32.load	$push62=, 0($3)
+	i32.load	$push62=, 0($1)
 	i32.const	$push63=, 3
 	i32.ne  	$push64=, $pop62, $pop63
 	br_if   	2, $pop64       # 2: down to label0
-# BB#12:                                # %if.end34
+# %bb.12:                               # %if.end34
 	i32.const	$push65=, 0
 	i32.load	$push59=, v2($pop65)
 	i32.const	$push66=, 4
@@ -127,44 +119,40 @@ foo1:                                   # @foo1
 .LBB0_13:                               # %sw.bb44
 	end_block                       # label2:
 	i32.const	$push19=, 15
-	i32.add 	$push20=, $2, $pop19
+	i32.add 	$push20=, $3, $pop19
 	i32.const	$push21=, -16
-	i32.and 	$push106=, $pop20, $pop21
-	tee_local	$push105=, $1=, $pop106
+	i32.and 	$2=, $pop20, $pop21
 	i32.const	$push22=, 16
-	i32.add 	$push23=, $pop105, $pop22
+	i32.add 	$push23=, $2, $pop22
 	i32.store	12($6), $pop23
-	i64.load	$push104=, 0($1)
-	tee_local	$push103=, $4=, $pop104
-	i64.load	$push102=, 8($1)
-	tee_local	$push101=, $5=, $pop102
+	i64.load	$5=, 8($2)
+	i64.load	$4=, 0($2)
 	i64.const	$push25=, 0
 	i64.const	$push24=, 4612891083171430400
-	i32.call	$push26=, __netf2@FUNCTION, $pop103, $pop101, $pop25, $pop24
+	i32.call	$push26=, __netf2@FUNCTION, $4, $5, $pop25, $pop24
 	br_if   	1, $pop26       # 1: down to label0
-# BB#14:                                # %sw.bb44
+# %bb.14:                               # %sw.bb44
 	i32.const	$push27=, 0
 	i64.load	$push17=, v5($pop27)
-	i32.const	$push107=, 0
-	i64.load	$push18=, v5+8($pop107)
+	i32.const	$push85=, 0
+	i64.load	$push18=, v5+8($pop85)
 	i32.call	$push28=, __eqtf2@FUNCTION, $pop17, $pop18, $4, $5
 	br_if   	1, $pop28       # 1: down to label0
-# BB#15:                                # %if.end53
+# %bb.15:                               # %if.end53
 	i32.const	$push29=, 20
-	i32.add 	$push109=, $1, $pop29
-	tee_local	$push108=, $2=, $pop109
-	i32.store	12($6), $pop108
+	i32.add 	$3=, $2, $pop29
+	i32.store	12($6), $3
 	i32.const	$push30=, 16
-	i32.add 	$push31=, $1, $pop30
+	i32.add 	$push31=, $2, $pop30
 	i32.load	$push32=, 0($pop31)
 	i32.const	$push33=, 8
 	i32.ne  	$push34=, $pop32, $pop33
 	br_if   	1, $pop34       # 1: down to label0
-# BB#16:                                # %if.end59
+# %bb.16:                               # %if.end59
 	i32.const	$push35=, 24
-	i32.add 	$push36=, $1, $pop35
+	i32.add 	$push36=, $2, $pop35
 	i32.store	12($6), $pop36
-	i32.load	$push37=, 0($2)
+	i32.load	$push37=, 0($3)
 	i32.const	$push38=, v2
 	i32.ne  	$push39=, $pop37, $pop38
 	br_if   	1, $pop39       # 1: down to label0
@@ -191,139 +179,130 @@ foo2:                                   # @foo2
 	.param  	i32, i32, i32
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push60=, 0
+# %bb.0:                                # %entry
 	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.sub 	$4=, $pop57, $pop59
+	i32.const	$push60=, 0
+	i32.store	__stack_pointer($pop60), $4
 	i32.store	12($4), $2
 	block   	
 	i32.const	$push0=, 19
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label3
-# BB#1:                                 # %lor.lhs.false3
+# %bb.1:                                # %lor.lhs.false3
 	i32.const	$push2=, seen
-	i32.add 	$push75=, $0, $pop2
-	tee_local	$push74=, $2=, $pop75
-	i32.load8_u	$push3=, 0($pop74)
+	i32.add 	$2=, $0, $pop2
+	i32.load8_u	$push3=, 0($2)
 	br_if   	0, $pop3        # 0: down to label3
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push4=, 0
-	i32.const	$push78=, 0
-	i32.load	$push5=, cnt($pop78)
+	i32.load	$push5=, cnt($pop4)
 	i32.const	$push6=, 1
-	i32.add 	$push77=, $pop5, $pop6
-	tee_local	$push76=, $3=, $pop77
-	i32.store	cnt($pop4), $pop76
+	i32.add 	$3=, $pop5, $pop6
+	i32.const	$push72=, 0
+	i32.store	cnt($pop72), $3
 	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 label3
-# BB#3:                                 # %if.end9
+# %bb.3:                                # %if.end9
 	block   	
 	i32.const	$push11=, 2
 	i32.eq  	$push12=, $0, $pop11
 	br_if   	0, $pop12       # 0: down to label4
-# BB#4:                                 # %if.end9
+# %bb.4:                                # %if.end9
 	i32.const	$push13=, 11
 	i32.eq  	$push14=, $0, $pop13
 	br_if   	0, $pop14       # 0: down to label4
-# BB#5:                                 # %if.end9
+# %bb.5:                                # %if.end9
 	i32.const	$push15=, 12
 	i32.ne  	$push16=, $0, $pop15
 	br_if   	1, $pop16       # 1: down to label3
-# BB#6:                                 # %sw.bb
+# %bb.6:                                # %sw.bb
 	i32.load	$push20=, 12($4)
 	i32.const	$push19=, 15
 	i32.add 	$push21=, $pop20, $pop19
 	i32.const	$push22=, -16
-	i32.and 	$push83=, $pop21, $pop22
-	tee_local	$push82=, $1=, $pop83
+	i32.and 	$2=, $pop21, $pop22
 	i32.const	$push23=, 16
-	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
+	i32.add 	$3=, $2, $pop23
+	i32.store	12($4), $3
+	i64.load	$push25=, 0($2)
+	i64.load	$push24=, 8($2)
+	i64.const	$push73=, 0
 	i64.const	$push26=, 4612891083171430400
-	i32.call	$push27=, __netf2@FUNCTION, $pop25, $pop24, $pop79, $pop26
+	i32.call	$push27=, __netf2@FUNCTION, $pop25, $pop24, $pop73, $pop26
 	br_if   	1, $pop27       # 1: down to label3
-# BB#7:                                 # %sw.bb
+# %bb.7:                                # %sw.bb
 	i32.const	$push28=, 0
 	i64.load	$push17=, v5($pop28)
-	i32.const	$push85=, 0
-	i64.load	$push18=, v5+8($pop85)
-	i64.const	$push84=, 0
+	i32.const	$push75=, 0
+	i64.load	$push18=, v5+8($pop75)
+	i64.const	$push74=, 0
 	i64.const	$push29=, 4612882287078408192
-	i32.call	$push30=, __eqtf2@FUNCTION, $pop17, $pop18, $pop84, $pop29
+	i32.call	$push30=, __eqtf2@FUNCTION, $pop17, $pop18, $pop74, $pop29
 	br_if   	1, $pop30       # 1: down to label3
-# BB#8:                                 # %if.end16
+# %bb.8:                                # %if.end16
 	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
+	i32.const	$push79=, 8
+	i32.add 	$push33=, $pop65, $pop79
+	i32.const	$push78=, 8
+	i32.add 	$push31=, $3, $pop78
 	i64.load	$push32=, 0($pop31):p2align=0
 	i64.store	0($pop33), $pop32
-	i64.load	$push34=, 0($2):p2align=0
+	i64.load	$push34=, 0($3):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.add 	$3=, $2, $pop35
+	i32.store	12($4), $3
 	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
+	i32.const	$push77=, v4
+	i32.const	$push76=, 16
+	i32.call	$push36=, memcmp@FUNCTION, $pop67, $pop77, $pop76
 	br_if   	1, $pop36       # 1: down to label3
-# BB#9:                                 # %if.end22
+# %bb.9:                                # %if.end22
 	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
+	i32.const	$push83=, 8
+	i32.add 	$push39=, $pop69, $pop83
+	i32.const	$push82=, 8
+	i32.add 	$push37=, $3, $pop82
 	i64.load	$push38=, 0($pop37):p2align=0
 	i64.store	0($pop39), $pop38
-	i64.load	$push40=, 0($2):p2align=0
+	i64.load	$push40=, 0($3):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.add 	$3=, $2, $pop41
+	i32.store	12($4), $3
 	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
+	i32.const	$push81=, v4
+	i32.const	$push80=, 16
+	i32.call	$push42=, memcmp@FUNCTION, $pop71, $pop81, $pop80
 	br_if   	1, $pop42       # 1: down to label3
-# BB#10:                                # %if.end31
+# %bb.10:                               # %if.end31
 	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.add 	$2=, $2, $pop43
+	i32.store	12($4), $2
+	i32.load	$push44=, 0($3)
 	i32.const	$push45=, v2
 	i32.ne  	$push46=, $pop44, $pop45
 	br_if   	1, $pop46       # 1: down to label3
-# BB#11:                                # %if.end37
+# %bb.11:                               # %if.end37
 	i32.const	$push47=, 7
-	i32.add 	$push48=, $1, $pop47
+	i32.add 	$push48=, $2, $pop47
 	i32.const	$push49=, -8
-	i32.and 	$push101=, $pop48, $pop49
-	tee_local	$push100=, $1=, $pop101
+	i32.and 	$2=, $pop48, $pop49
 	i32.const	$push50=, 8
-	i32.add 	$push51=, $pop100, $pop50
+	i32.add 	$push51=, $2, $pop50
 	i32.store	12($4), $pop51
-	i64.load	$push52=, 0($1)
+	i64.load	$push52=, 0($2)
 	i64.const	$push53=, 16
 	i64.ne  	$push54=, $pop52, $pop53
 	br_if   	1, $pop54       # 1: down to label3
@@ -350,7 +329,7 @@ foo2:                                   # @foo2
 	.type	foo3,@function
 foo3:                                   # @foo3
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 6
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -364,35 +343,32 @@ foo3:                                   # @foo3
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32, i64, i64, i64, i32
-# BB#0:                                 # %entry
-	i32.const	$push52=, 0
+# %bb.0:                                # %entry
 	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.sub 	$5=, $pop49, $pop51
+	i32.const	$push52=, 0
+	i32.store	__stack_pointer($pop52), $5
 	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
+	i32.const	$push89=, 8
+	i32.add 	$push1=, $pop57, $pop89
+	i32.const	$push88=, 0
+	i64.load	$push0=, v4+8($pop88):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	$push87=, 0
+	i32.load	$push2=, v1($pop87)
+	i32.const	$push86=, 1
+	i32.add 	$0=, $pop2, $pop86
 	i32.const	$push85=, 0
-	i32.load	$push84=, v2($pop85)
-	tee_local	$push83=, $1=, $pop84
+	i32.store	v1($pop85), $0
+	i32.const	$push84=, 0
+	i32.load	$1=, v2($pop84)
+	i32.const	$push83=, 0
 	i32.const	$push82=, 1
-	i32.add 	$push3=, $pop83, $pop82
-	i32.store	v2($pop86), $pop3
+	i32.add 	$push3=, $1, $pop82
+	i32.store	v2($pop83), $pop3
 	i32.const	$push4=, v4
 	i32.store	152($5), $pop4
 	i32.const	$push81=, 0
@@ -409,85 +385,80 @@ main:                                   # @main
 	i32.add 	$push61=, $5, $pop60
 	i32.call	$push6=, bar@FUNCTION, $pop80, $pop61
 	br_if   	0, $pop6        # 0: down to label5
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	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)
+	i32.const	$push98=, 0
+	i64.load	$push8=, v5($pop98)
+	i32.const	$push97=, 0
+	i64.load	$push7=, v5+8($pop97)
 	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.const	$push96=, 0
+	i32.load	$push11=, v3($pop96)
 	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	$push95=, 8
+	i32.store	0($pop15), $pop95
 	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
+	i32.const	$push94=, 8
+	i32.add 	$push16=, $pop65, $pop94
+	i64.load	$2=, 0($pop16)
+	i32.const	$push93=, 0
+	i64.store	v5+8($pop93), $2
+	i64.load	$3=, 96($5)
+	i32.const	$push92=, 0
+	i64.store	v5($pop92), $3
 	i64.store	120($5), $2
 	i64.store	112($5), $3
-	i32.const	$push97=, 1
+	i32.const	$push91=, 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
+	i32.call	$push17=, bar@FUNCTION, $pop91, $pop67
+	i32.const	$push90=, 1
+	i32.ne  	$push18=, $pop17, $pop90
 	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
+# %bb.2:                                # %if.end6
+	i32.const	$push101=, 2
+	i32.const	$push100=, 0
+	i32.call	$push19=, bar@FUNCTION, $pop101, $pop100
+	i32.const	$push99=, 2
+	i32.ne  	$push20=, $pop19, $pop99
 	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
+# %bb.3:                                # %if.end10
+	i32.const	$push104=, 0
+	i32.load	$push21=, v1($pop104)
+	i32.const	$push103=, 2
+	i32.add 	$push22=, $pop21, $pop103
+	i32.const	$push102=, 0
+	i32.call	$push23=, bar@FUNCTION, $pop22, $pop102
 	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
+# %bb.4:                                # %if.end14
+	i32.const	$push115=, 0
+	i64.load	$2=, v5+8($pop115)
+	i32.const	$push114=, 0
+	i64.load	$3=, v5($pop114)
 	i64.const	$push27=, 0
 	i64.const	$push26=, -4611967493404098560
-	call    	__addtf3@FUNCTION, $5, $pop131, $pop128, $pop27, $pop26
+	call    	__addtf3@FUNCTION, $5, $3, $2, $pop27, $pop26
+	i32.const	$push113=, 0
+	i64.load	$4=, v4+8($pop113):p2align=0
 	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
+	i64.store	0($pop29), $4
 	i32.const	$push70=, 64
 	i32.add 	$push71=, $5, $pop70
-	i32.const	$push124=, 8
-	i32.add 	$push30=, $pop71, $pop124
+	i32.const	$push112=, 8
+	i32.add 	$push30=, $pop71, $pop112
 	i64.store	0($pop30), $4
 	i32.const	$push31=, 48
 	i32.add 	$push32=, $5, $pop31
@@ -495,21 +466,20 @@ main:                                   # @main
 	i64.store	0($pop32), $pop33
 	i32.const	$push35=, 40
 	i32.add 	$push36=, $5, $pop35
-	i32.const	$push123=, 0
-	i32.load	$push34=, v3($pop123)
+	i32.const	$push111=, 0
+	i32.load	$push34=, v3($pop111)
 	i32.store	0($pop36), $pop34
-	i32.const	$push122=, 0
-	i32.const	$push121=, 8
-	i32.add 	$push37=, $5, $pop121
+	i32.const	$push110=, 0
+	i32.const	$push109=, 8
+	i32.add 	$push37=, $5, $pop109
 	i64.load	$push38=, 0($pop37)
-	i64.store	v5+8($pop122), $pop38
-	i32.const	$push120=, 0
+	i64.store	v5+8($pop110), $pop38
+	i32.const	$push108=, 0
 	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	v5($pop108), $pop39
+	i32.const	$push107=, 0
+	i64.load	$4=, v4($pop107):p2align=0
+	i64.store	80($5), $4
 	i64.store	64($5), $4
 	i32.const	$push72=, 16
 	i32.add 	$push73=, $5, $pop72
@@ -523,25 +493,25 @@ main:                                   # @main
 	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
-	i32.load	$push44=, v1($pop116)
+	i64.store	24($5), $2
+	i64.store	16($5), $3
+	i32.const	$push106=, 0
+	i32.load	$push44=, v1($pop106)
 	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
+	i32.const	$push105=, 20
+	i32.ne  	$push48=, $pop47, $pop105
 	br_if   	0, $pop48       # 0: down to label5
-# BB#5:                                 # %if.end19
+# %bb.5:                                # %if.end19
 	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
+	i32.const	$push116=, 0
+	return  	$pop116
 .LBB3_6:                                # %if.then
 	end_block                       # label5:
 	call    	abort@FUNCTION
@@ -614,7 +584,7 @@ cnt:
 	.size	cnt, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 81e9d7d88..316b5e869 100644
--- a/test/torture-s/va-arg-trap-1.c.s
+++ b/test/torture-s/va-arg-trap-1.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -20,7 +20,7 @@ foo:                                    # @foo
 	.type	bar,@function
 bar:                                    # @bar
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.store	ap($pop0), $1
 	i32.call	$drop=, foo@FUNCTION
@@ -36,14 +36,13 @@ bar:                                    # @bar
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push4=, 0
+# %bb.0:                                # %entry
 	i32.const	$push2=, 0
 	i32.load	$push1=, __stack_pointer($pop2)
 	i32.const	$push3=, 16
-	i32.sub 	$push6=, $pop1, $pop3
-	tee_local	$push5=, $0=, $pop6
-	i32.store	__stack_pointer($pop4), $pop5
+	i32.sub 	$0=, $pop1, $pop3
+	i32.const	$push4=, 0
+	i32.store	__stack_pointer($pop4), $0
 	i32.const	$push0=, 0
 	i32.store	0($0), $pop0
 	call    	bar@FUNCTION, $0, $0
@@ -71,5 +70,5 @@ f:
 	.size	f, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vfprintf-1.c.s b/test/torture-s/vfprintf-1.c.s
index f55d5db4d..a3b5d3fb7 100644
--- a/test/torture-s/vfprintf-1.c.s
+++ b/test/torture-s/vfprintf-1.c.s
@@ -7,21 +7,20 @@
 inner:                                  # @inner
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push78=, 0
+# %bb.0:                                # %entry
 	i32.const	$push76=, 0
 	i32.load	$push75=, __stack_pointer($pop76)
 	i32.const	$push77=, 16
-	i32.sub 	$push83=, $pop75, $pop77
-	tee_local	$push82=, $2=, $pop83
-	i32.store	__stack_pointer($pop78), $pop82
+	i32.sub 	$2=, $pop75, $pop77
+	i32.const	$push78=, 0
+	i32.store	__stack_pointer($pop78), $2
 	i32.store	8($2), $1
 	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -48,14 +47,13 @@ inner:                                  # @inner
 .LBB0_2:                                # %sw.bb
 	end_block                       # label12:
 	i32.const	$push68=, 0
-	i32.load	$push86=, stdout($pop68)
-	tee_local	$push85=, $0=, $pop86
+	i32.load	$0=, stdout($pop68)
 	i32.const	$push70=, .L.str
 	i32.load	$push69=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop85, $pop70, $pop69
-	i32.const	$push84=, .L.str
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop70, $pop69
+	i32.const	$push82=, .L.str
 	i32.load	$push71=, 8($2)
-	i32.call	$push72=, vfprintf@FUNCTION, $0, $pop84, $pop71
+	i32.call	$push72=, vfprintf@FUNCTION, $0, $pop82, $pop71
 	i32.const	$push73=, 5
 	i32.eq  	$push74=, $pop72, $pop73
 	br_if   	10, $pop74      # 10: down to label1
@@ -63,14 +61,13 @@ inner:                                  # @inner
 .LBB0_3:                                # %sw.bb22
 	end_block                       # label11:
 	i32.const	$push42=, 0
-	i32.load	$push89=, stdout($pop42)
-	tee_local	$push88=, $0=, $pop89
+	i32.load	$0=, stdout($pop42)
 	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.call	$drop=, vfprintf@FUNCTION, $0, $pop44, $pop43
+	i32.const	$push83=, .L.str.4
 	i32.load	$push45=, 8($2)
-	i32.call	$push46=, vfprintf@FUNCTION, $0, $pop87, $pop45
+	i32.call	$push46=, vfprintf@FUNCTION, $0, $pop83, $pop45
 	i32.const	$push47=, 5
 	i32.eq  	$push48=, $pop46, $pop47
 	br_if   	9, $pop48       # 9: down to label1
@@ -78,14 +75,13 @@ inner:                                  # @inner
 .LBB0_4:                                # %sw.bb52
 	end_block                       # label10:
 	i32.const	$push9=, 0
-	i32.load	$push92=, stdout($pop9)
-	tee_local	$push91=, $0=, $pop92
+	i32.load	$0=, stdout($pop9)
 	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.call	$drop=, vfprintf@FUNCTION, $0, $pop11, $pop10
+	i32.const	$push84=, .L.str.6
 	i32.load	$push12=, 8($2)
-	i32.call	$push13=, vfprintf@FUNCTION, $0, $pop90, $pop12
+	i32.call	$push13=, vfprintf@FUNCTION, $0, $pop84, $pop12
 	i32.const	$push14=, 7
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	9, $pop15       # 9: down to label0
@@ -93,14 +89,13 @@ inner:                                  # @inner
 .LBB0_5:                                # %sw.bb4
 	end_block                       # label9:
 	i32.const	$push61=, 0
-	i32.load	$push95=, stdout($pop61)
-	tee_local	$push94=, $0=, $pop95
+	i32.load	$0=, stdout($pop61)
 	i32.const	$push63=, .L.str.1
 	i32.load	$push62=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop94, $pop63, $pop62
-	i32.const	$push93=, .L.str.1
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop63, $pop62
+	i32.const	$push85=, .L.str.1
 	i32.load	$push64=, 8($2)
-	i32.call	$push65=, vfprintf@FUNCTION, $0, $pop93, $pop64
+	i32.call	$push65=, vfprintf@FUNCTION, $0, $pop85, $pop64
 	i32.const	$push66=, 6
 	i32.eq  	$push67=, $pop65, $pop66
 	br_if   	7, $pop67       # 7: down to label1
@@ -108,14 +103,13 @@ inner:                                  # @inner
 .LBB0_6:                                # %sw.bb10
 	end_block                       # label8:
 	i32.const	$push54=, 0
-	i32.load	$push98=, stdout($pop54)
-	tee_local	$push97=, $0=, $pop98
+	i32.load	$0=, stdout($pop54)
 	i32.const	$push56=, .L.str.2
 	i32.load	$push55=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop97, $pop56, $pop55
-	i32.const	$push96=, .L.str.2
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop56, $pop55
+	i32.const	$push86=, .L.str.2
 	i32.load	$push57=, 8($2)
-	i32.call	$push58=, vfprintf@FUNCTION, $0, $pop96, $pop57
+	i32.call	$push58=, vfprintf@FUNCTION, $0, $pop86, $pop57
 	i32.const	$push59=, 1
 	i32.eq  	$push60=, $pop58, $pop59
 	br_if   	6, $pop60       # 6: down to label1
@@ -123,42 +117,39 @@ inner:                                  # @inner
 .LBB0_7:                                # %sw.bb16
 	end_block                       # label7:
 	i32.const	$push49=, 0
-	i32.load	$push101=, stdout($pop49)
-	tee_local	$push100=, $0=, $pop101
+	i32.load	$0=, stdout($pop49)
 	i32.const	$push51=, .L.str.3
 	i32.load	$push50=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop100, $pop51, $pop50
-	i32.const	$push99=, .L.str.3
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop51, $pop50
+	i32.const	$push87=, .L.str.3
 	i32.load	$push52=, 8($2)
-	i32.call	$push53=, vfprintf@FUNCTION, $0, $pop99, $pop52
-	i32.eqz 	$push117=, $pop53
-	br_if   	5, $pop117      # 5: down to label1
+	i32.call	$push53=, vfprintf@FUNCTION, $0, $pop87, $pop52
+	i32.eqz 	$push93=, $pop53
+	br_if   	5, $pop93       # 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.load	$0=, stdout($pop23)
 	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.call	$drop=, vfprintf@FUNCTION, $0, $pop25, $pop24
+	i32.const	$push88=, .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
+	i32.call	$push27=, vfprintf@FUNCTION, $0, $pop88, $pop26
+	i32.eqz 	$push94=, $pop27
+	br_if   	4, $pop94       # 4: down to label1
 	br      	5               # 5: down to label0
 .LBB0_9:                                # %sw.bb28
 	end_block                       # label5:
 	i32.const	$push35=, 0
-	i32.load	$push107=, stdout($pop35)
-	tee_local	$push106=, $0=, $pop107
+	i32.load	$0=, stdout($pop35)
 	i32.const	$push37=, .L.str.4
 	i32.load	$push36=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop106, $pop37, $pop36
-	i32.const	$push105=, .L.str.4
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop37, $pop36
+	i32.const	$push89=, .L.str.4
 	i32.load	$push38=, 8($2)
-	i32.call	$push39=, vfprintf@FUNCTION, $0, $pop105, $pop38
+	i32.call	$push39=, vfprintf@FUNCTION, $0, $pop89, $pop38
 	i32.const	$push40=, 6
 	i32.eq  	$push41=, $pop39, $pop40
 	br_if   	3, $pop41       # 3: down to label1
@@ -166,14 +157,13 @@ inner:                                  # @inner
 .LBB0_10:                               # %sw.bb34
 	end_block                       # label4:
 	i32.const	$push28=, 0
-	i32.load	$push110=, stdout($pop28)
-	tee_local	$push109=, $0=, $pop110
+	i32.load	$0=, stdout($pop28)
 	i32.const	$push30=, .L.str.4
 	i32.load	$push29=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop109, $pop30, $pop29
-	i32.const	$push108=, .L.str.4
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop30, $pop29
+	i32.const	$push90=, .L.str.4
 	i32.load	$push31=, 8($2)
-	i32.call	$push32=, vfprintf@FUNCTION, $0, $pop108, $pop31
+	i32.call	$push32=, vfprintf@FUNCTION, $0, $pop90, $pop31
 	i32.const	$push33=, 1
 	i32.eq  	$push34=, $pop32, $pop33
 	br_if   	2, $pop34       # 2: down to label1
@@ -181,14 +171,13 @@ inner:                                  # @inner
 .LBB0_11:                               # %sw.bb46
 	end_block                       # label3:
 	i32.const	$push16=, 0
-	i32.load	$push113=, stdout($pop16)
-	tee_local	$push112=, $0=, $pop113
+	i32.load	$0=, stdout($pop16)
 	i32.const	$push18=, .L.str.5
 	i32.load	$push17=, 12($2)
-	i32.call	$drop=, vfprintf@FUNCTION, $pop112, $pop18, $pop17
-	i32.const	$push111=, .L.str.5
+	i32.call	$drop=, vfprintf@FUNCTION, $0, $pop18, $pop17
+	i32.const	$push91=, .L.str.5
 	i32.load	$push19=, 8($2)
-	i32.call	$push20=, vfprintf@FUNCTION, $0, $pop111, $pop19
+	i32.call	$push20=, vfprintf@FUNCTION, $0, $pop91, $pop19
 	i32.const	$push21=, 1
 	i32.eq  	$push22=, $pop20, $pop21
 	br_if   	1, $pop22       # 1: down to label1
@@ -196,14 +185,13 @@ inner:                                  # @inner
 .LBB0_12:                               # %sw.bb58
 	end_block                       # label2:
 	i32.const	$push2=, 0
-	i32.load	$push116=, stdout($pop2)
-	tee_local	$push115=, $0=, $pop116
+	i32.load	$0=, stdout($pop2)
 	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.call	$drop=, vfprintf@FUNCTION, $0, $pop4, $pop3
+	i32.const	$push92=, .L.str.7
 	i32.load	$push5=, 8($2)
-	i32.call	$push6=, vfprintf@FUNCTION, $0, $pop114, $pop5
+	i32.call	$push6=, vfprintf@FUNCTION, $0, $pop92, $pop5
 	i32.const	$push7=, 2
 	i32.ne  	$push8=, $pop6, $pop7
 	br_if   	1, $pop8        # 1: down to label0
@@ -229,14 +217,13 @@ inner:                                  # @inner
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop16, $pop18
-	tee_local	$push42=, $0=, $pop43
-	i32.store	__stack_pointer($pop19), $pop42
+	i32.sub 	$0=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $0
 	i32.const	$push0=, 0
 	i32.const	$push41=, 0
 	call    	inner@FUNCTION, $pop0, $pop41
@@ -341,7 +328,7 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	vfprintf, i32, i32, i32, i32
 	.functype	abort, void
 	.import_global	stdout
diff --git a/test/torture-s/vfprintf-chk-1.c.s b/test/torture-s/vfprintf-chk-1.c.s
index 0ce1aac74..20a18dffc 100644
--- a/test/torture-s/vfprintf-chk-1.c.s
+++ b/test/torture-s/vfprintf-chk-1.c.s
@@ -7,12 +7,12 @@
 __vfprintf_chk:                         # @__vfprintf_chk
 	.param  	i32, i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, should_optimize($pop3)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	i32.const	$push1=, 1
 	i32.store	should_optimize($pop4), $pop1
@@ -33,21 +33,20 @@ __vfprintf_chk:                         # @__vfprintf_chk
 inner:                                  # @inner
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push91=, 0
+# %bb.0:                                # %entry
 	i32.const	$push89=, 0
 	i32.load	$push88=, __stack_pointer($pop89)
 	i32.const	$push90=, 16
-	i32.sub 	$push96=, $pop88, $pop90
-	tee_local	$push95=, $2=, $pop96
-	i32.store	__stack_pointer($pop91), $pop95
+	i32.sub 	$2=, $pop88, $pop90
+	i32.const	$push91=, 0
+	i32.store	__stack_pointer($pop91), $2
 	i32.store	8($2), $1
 	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -73,330 +72,319 @@ inner:                                  # @inner
                                         # 10: down to label3
 .LBB1_2:                                # %sw.bb
 	end_block                       # label13:
-	i32.const	$push102=, 0
+	i32.const	$push98=, 0
 	i32.const	$push79=, 1
-	i32.store	should_optimize($pop102), $pop79
-	i32.const	$push101=, 0
-	i32.load	$push100=, stdout($pop101)
-	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
+	i32.store	should_optimize($pop98), $pop79
 	i32.const	$push97=, 0
-	i32.load	$push81=, should_optimize($pop97)
-	i32.eqz 	$push205=, $pop81
-	br_if   	11, $pop205     # 11: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push105=, 0
-	i32.const	$push104=, 0
-	i32.store	should_optimize($pop105), $pop104
-	i32.const	$push103=, .L.str
+	i32.load	$0=, stdout($pop97)
+	i32.const	$push96=, .L.str
+	i32.load	$push80=, 12($2)
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop96, $pop80
+	i32.const	$push95=, 0
+	i32.load	$push81=, should_optimize($pop95)
+	i32.eqz 	$push181=, $pop81
+	br_if   	11, $pop181     # 11: down to label1
+# %bb.3:                                # %if.end
+	i32.const	$push101=, 0
+	i32.const	$push100=, 0
+	i32.store	should_optimize($pop101), $pop100
+	i32.const	$push99=, .L.str
 	i32.load	$push82=, 8($2)
-	i32.call	$push83=, __vfprintf_chk@FUNCTION, $0, $2, $pop103, $pop82
+	i32.call	$push83=, __vfprintf_chk@FUNCTION, $0, $2, $pop99, $pop82
 	i32.const	$push84=, 5
 	i32.ne  	$push85=, $pop83, $pop84
 	br_if   	11, $pop85      # 11: down to label1
-# BB#4:                                 # %if.end5
+# %bb.4:                                # %if.end5
 	i32.const	$push86=, 0
 	i32.load	$push87=, should_optimize($pop86)
 	br_if   	10, $pop87      # 10: down to label2
 	br      	11              # 11: down to label1
 .LBB1_5:                                # %sw.bb9
 	end_block                       # label12:
-	i32.const	$push111=, 0
+	i32.const	$push105=, 0
 	i32.const	$push70=, 1
-	i32.store	should_optimize($pop111), $pop70
-	i32.const	$push110=, 0
-	i32.load	$push109=, stdout($pop110)
-	tee_local	$push108=, $0=, $pop109
-	i32.const	$push107=, .L.str.1
+	i32.store	should_optimize($pop105), $pop70
+	i32.const	$push104=, 0
+	i32.load	$0=, stdout($pop104)
+	i32.const	$push103=, .L.str.1
 	i32.load	$push71=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop108, $2, $pop107, $pop71
-	i32.const	$push106=, 0
-	i32.load	$push72=, should_optimize($pop106)
-	i32.eqz 	$push206=, $pop72
-	br_if   	10, $pop206     # 10: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop103, $pop71
+	i32.const	$push102=, 0
+	i32.load	$push72=, should_optimize($pop102)
+	i32.eqz 	$push182=, $pop72
+	br_if   	10, $pop182     # 10: down to label1
+# %bb.6:                                # %if.end13
+	i32.const	$push108=, 0
+	i32.const	$push107=, 0
+	i32.store	should_optimize($pop108), $pop107
+	i32.const	$push106=, .L.str.1
 	i32.load	$push73=, 8($2)
-	i32.call	$push74=, __vfprintf_chk@FUNCTION, $0, $2, $pop112, $pop73
+	i32.call	$push74=, __vfprintf_chk@FUNCTION, $0, $2, $pop106, $pop73
 	i32.const	$push75=, 6
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	10, $pop76      # 10: down to label1
-# BB#7:                                 # %if.end17
+# %bb.7:                                # %if.end17
 	i32.const	$push77=, 0
 	i32.load	$push78=, should_optimize($pop77)
 	br_if   	9, $pop78       # 9: down to label2
 	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=, $0=, $pop118
-	i32.const	$push116=, .L.str.2
+	i32.const	$push113=, 0
+	i32.const	$push112=, 1
+	i32.store	should_optimize($pop113), $pop112
+	i32.const	$push111=, 0
+	i32.load	$0=, stdout($pop111)
+	i32.const	$push110=, .L.str.2
 	i32.load	$push63=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop117, $2, $pop116, $pop63
-	i32.const	$push115=, 0
-	i32.load	$push64=, should_optimize($pop115)
-	i32.eqz 	$push207=, $pop64
-	br_if   	9, $pop207      # 9: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop110, $pop63
+	i32.const	$push109=, 0
+	i32.load	$push64=, should_optimize($pop109)
+	i32.eqz 	$push183=, $pop64
+	br_if   	9, $pop183      # 9: down to label1
+# %bb.9:                                # %if.end25
+	i32.const	$push117=, 0
+	i32.const	$push116=, 0
+	i32.store	should_optimize($pop117), $pop116
+	i32.const	$push115=, .L.str.2
 	i32.load	$push65=, 8($2)
-	i32.call	$push66=, __vfprintf_chk@FUNCTION, $0, $2, $pop123, $pop65
-	i32.const	$push122=, 1
-	i32.ne  	$push67=, $pop66, $pop122
+	i32.call	$push66=, __vfprintf_chk@FUNCTION, $0, $2, $pop115, $pop65
+	i32.const	$push114=, 1
+	i32.ne  	$push67=, $pop66, $pop114
 	br_if   	9, $pop67       # 9: down to label1
-# BB#10:                                # %if.end29
+# %bb.10:                               # %if.end29
 	i32.const	$push68=, 0
 	i32.load	$push69=, should_optimize($pop68)
 	br_if   	8, $pop69       # 8: down to label2
 	br      	9               # 9: down to label1
 .LBB1_11:                               # %sw.bb33
 	end_block                       # label10:
-	i32.const	$push131=, 0
+	i32.const	$push121=, 0
 	i32.const	$push56=, 1
-	i32.store	should_optimize($pop131), $pop56
-	i32.const	$push130=, 0
-	i32.load	$push129=, stdout($pop130)
-	tee_local	$push128=, $0=, $pop129
-	i32.const	$push127=, .L.str.3
+	i32.store	should_optimize($pop121), $pop56
+	i32.const	$push120=, 0
+	i32.load	$0=, stdout($pop120)
+	i32.const	$push119=, .L.str.3
 	i32.load	$push57=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop128, $2, $pop127, $pop57
-	i32.const	$push126=, 0
-	i32.load	$push58=, should_optimize($pop126)
-	i32.eqz 	$push208=, $pop58
-	br_if   	8, $pop208      # 8: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop119, $pop57
+	i32.const	$push118=, 0
+	i32.load	$push58=, should_optimize($pop118)
+	i32.eqz 	$push184=, $pop58
+	br_if   	8, $pop184      # 8: down to label1
+# %bb.12:                               # %if.end37
+	i32.const	$push124=, 0
+	i32.const	$push123=, 0
+	i32.store	should_optimize($pop124), $pop123
+	i32.const	$push122=, .L.str.3
 	i32.load	$push59=, 8($2)
-	i32.call	$push60=, __vfprintf_chk@FUNCTION, $0, $2, $pop132, $pop59
+	i32.call	$push60=, __vfprintf_chk@FUNCTION, $0, $2, $pop122, $pop59
 	br_if   	8, $pop60       # 8: down to label1
-# BB#13:                                # %if.end41
+# %bb.13:                               # %if.end41
 	i32.const	$push61=, 0
 	i32.load	$push62=, should_optimize($pop61)
 	br_if   	7, $pop62       # 7: down to label2
 	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=, $0=, $pop138
-	i32.const	$push136=, .L.str.4
+	i32.const	$push129=, 0
+	i32.const	$push128=, 0
+	i32.store	should_optimize($pop129), $pop128
+	i32.const	$push127=, 0
+	i32.load	$0=, stdout($pop127)
+	i32.const	$push126=, .L.str.4
 	i32.load	$push48=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop137, $2, $pop136, $pop48
-	i32.const	$push135=, 0
-	i32.load	$push49=, should_optimize($pop135)
-	i32.eqz 	$push209=, $pop49
-	br_if   	7, $pop209      # 7: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop126, $pop48
+	i32.const	$push125=, 0
+	i32.load	$push49=, should_optimize($pop125)
+	i32.eqz 	$push185=, $pop49
+	br_if   	7, $pop185      # 7: down to label1
+# %bb.15:                               # %if.end49
+	i32.const	$push132=, 0
+	i32.const	$push131=, 0
+	i32.store	should_optimize($pop132), $pop131
+	i32.const	$push130=, .L.str.4
 	i32.load	$push50=, 8($2)
-	i32.call	$push51=, __vfprintf_chk@FUNCTION, $0, $2, $pop142, $pop50
+	i32.call	$push51=, __vfprintf_chk@FUNCTION, $0, $2, $pop130, $pop50
 	i32.const	$push52=, 5
 	i32.ne  	$push53=, $pop51, $pop52
 	br_if   	7, $pop53       # 7: down to label1
-# BB#16:                                # %if.end53
+# %bb.16:                               # %if.end53
 	i32.const	$push54=, 0
 	i32.load	$push55=, should_optimize($pop54)
 	br_if   	6, $pop55       # 6: down to label2
 	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=, $0=, $pop148
-	i32.const	$push146=, .L.str.4
+	i32.const	$push137=, 0
+	i32.const	$push136=, 0
+	i32.store	should_optimize($pop137), $pop136
+	i32.const	$push135=, 0
+	i32.load	$0=, stdout($pop135)
+	i32.const	$push134=, .L.str.4
 	i32.load	$push40=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop147, $2, $pop146, $pop40
-	i32.const	$push145=, 0
-	i32.load	$push41=, should_optimize($pop145)
-	i32.eqz 	$push210=, $pop41
-	br_if   	6, $pop210      # 6: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop134, $pop40
+	i32.const	$push133=, 0
+	i32.load	$push41=, should_optimize($pop133)
+	i32.eqz 	$push186=, $pop41
+	br_if   	6, $pop186      # 6: down to label1
+# %bb.18:                               # %if.end61
+	i32.const	$push140=, 0
+	i32.const	$push139=, 0
+	i32.store	should_optimize($pop140), $pop139
+	i32.const	$push138=, .L.str.4
 	i32.load	$push42=, 8($2)
-	i32.call	$push43=, __vfprintf_chk@FUNCTION, $0, $2, $pop152, $pop42
+	i32.call	$push43=, __vfprintf_chk@FUNCTION, $0, $2, $pop138, $pop42
 	i32.const	$push44=, 6
 	i32.ne  	$push45=, $pop43, $pop44
 	br_if   	6, $pop45       # 6: down to label1
-# BB#19:                                # %if.end65
+# %bb.19:                               # %if.end65
 	i32.const	$push46=, 0
 	i32.load	$push47=, should_optimize($pop46)
 	br_if   	5, $pop47       # 5: down to label2
 	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=, $0=, $pop158
-	i32.const	$push156=, .L.str.4
+	i32.const	$push145=, 0
+	i32.const	$push144=, 0
+	i32.store	should_optimize($pop145), $pop144
+	i32.const	$push143=, 0
+	i32.load	$0=, stdout($pop143)
+	i32.const	$push142=, .L.str.4
 	i32.load	$push26=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop157, $2, $pop156, $pop26
-	i32.const	$push155=, 0
-	i32.load	$push27=, should_optimize($pop155)
-	i32.eqz 	$push211=, $pop27
-	br_if   	5, $pop211      # 5: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop142, $pop26
+	i32.const	$push141=, 0
+	i32.load	$push27=, should_optimize($pop141)
+	i32.eqz 	$push187=, $pop27
+	br_if   	5, $pop187      # 5: down to label1
+# %bb.21:                               # %if.end85
+	i32.const	$push148=, 0
+	i32.const	$push147=, 0
+	i32.store	should_optimize($pop148), $pop147
+	i32.const	$push146=, .L.str.4
 	i32.load	$push28=, 8($2)
-	i32.call	$push29=, __vfprintf_chk@FUNCTION, $0, $2, $pop162, $pop28
+	i32.call	$push29=, __vfprintf_chk@FUNCTION, $0, $2, $pop146, $pop28
 	br_if   	5, $pop29       # 5: down to label1
-# BB#22:                                # %if.end89
+# %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=, $0=, $pop168
-	i32.const	$push166=, .L.str.6
+	i32.const	$push153=, 0
+	i32.const	$push152=, 0
+	i32.store	should_optimize($pop153), $pop152
+	i32.const	$push151=, 0
+	i32.load	$0=, stdout($pop151)
+	i32.const	$push150=, .L.str.6
 	i32.load	$push10=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop167, $2, $pop166, $pop10
-	i32.const	$push165=, 0
-	i32.load	$push11=, should_optimize($pop165)
-	i32.eqz 	$push212=, $pop11
-	br_if   	4, $pop212      # 4: down to label1
-# BB#24:                                # %if.end109
-	i32.const	$push174=, 0
-	i32.const	$push173=, 0
-	i32.store	should_optimize($pop174), $pop173
-	i32.const	$push172=, .L.str.6
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop150, $pop10
+	i32.const	$push149=, 0
+	i32.load	$push11=, should_optimize($pop149)
+	i32.eqz 	$push188=, $pop11
+	br_if   	4, $pop188      # 4: down to label1
+# %bb.24:                               # %if.end109
+	i32.const	$push156=, 0
+	i32.const	$push155=, 0
+	i32.store	should_optimize($pop156), $pop155
+	i32.const	$push154=, .L.str.6
 	i32.load	$push12=, 8($2)
-	i32.call	$push13=, __vfprintf_chk@FUNCTION, $0, $2, $pop172, $pop12
+	i32.call	$push13=, __vfprintf_chk@FUNCTION, $0, $2, $pop154, $pop12
 	i32.const	$push14=, 7
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	4, $pop15       # 4: down to label1
-# BB#25:                                # %if.end113
+# %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=, $0=, $pop178
-	i32.const	$push176=, .L.str.4
+	i32.const	$push161=, 0
+	i32.const	$push160=, 0
+	i32.store	should_optimize($pop161), $pop160
+	i32.const	$push159=, 0
+	i32.load	$0=, stdout($pop159)
+	i32.const	$push158=, .L.str.4
 	i32.load	$push32=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop177, $2, $pop176, $pop32
-	i32.const	$push175=, 0
-	i32.load	$push33=, should_optimize($pop175)
-	i32.eqz 	$push213=, $pop33
-	br_if   	3, $pop213      # 3: down to label1
-# BB#27:                                # %if.end73
-	i32.const	$push184=, 0
-	i32.const	$push183=, 0
-	i32.store	should_optimize($pop184), $pop183
-	i32.const	$push182=, .L.str.4
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop158, $pop32
+	i32.const	$push157=, 0
+	i32.load	$push33=, should_optimize($pop157)
+	i32.eqz 	$push189=, $pop33
+	br_if   	3, $pop189      # 3: down to label1
+# %bb.27:                               # %if.end73
+	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, $0, $2, $pop182, $pop34
+	i32.call	$push35=, __vfprintf_chk@FUNCTION, $0, $2, $pop162, $pop34
 	i32.const	$push36=, 1
 	i32.ne  	$push37=, $pop35, $pop36
 	br_if   	3, $pop37       # 3: down to label1
-# BB#28:                                # %if.end77
+# %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=, $0=, $pop188
-	i32.const	$push186=, .L.str.5
+	i32.const	$push169=, 0
+	i32.const	$push168=, 0
+	i32.store	should_optimize($pop169), $pop168
+	i32.const	$push167=, 0
+	i32.load	$0=, stdout($pop167)
+	i32.const	$push166=, .L.str.5
 	i32.load	$push18=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop187, $2, $pop186, $pop18
-	i32.const	$push185=, 0
-	i32.load	$push19=, should_optimize($pop185)
-	i32.eqz 	$push214=, $pop19
-	br_if   	2, $pop214      # 2: down to label1
-# BB#30:                                # %if.end97
-	i32.const	$push194=, 0
-	i32.const	$push193=, 0
-	i32.store	should_optimize($pop194), $pop193
-	i32.const	$push192=, .L.str.5
+	i32.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop166, $pop18
+	i32.const	$push165=, 0
+	i32.load	$push19=, should_optimize($pop165)
+	i32.eqz 	$push190=, $pop19
+	br_if   	2, $pop190      # 2: down to label1
+# %bb.30:                               # %if.end97
+	i32.const	$push172=, 0
+	i32.const	$push171=, 0
+	i32.store	should_optimize($pop172), $pop171
+	i32.const	$push170=, .L.str.5
 	i32.load	$push20=, 8($2)
-	i32.call	$push21=, __vfprintf_chk@FUNCTION, $0, $2, $pop192, $pop20
+	i32.call	$push21=, __vfprintf_chk@FUNCTION, $0, $2, $pop170, $pop20
 	i32.const	$push22=, 1
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	2, $pop23       # 2: down to label1
-# BB#31:                                # %if.end101
+# %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=, $0=, $pop198
-	i32.const	$push196=, .L.str.7
+	i32.const	$push177=, 0
+	i32.const	$push176=, 0
+	i32.store	should_optimize($pop177), $pop176
+	i32.const	$push175=, 0
+	i32.load	$0=, stdout($pop175)
+	i32.const	$push174=, .L.str.7
 	i32.load	$push2=, 12($2)
-	i32.call	$drop=, __vfprintf_chk@FUNCTION, $pop197, $2, $pop196, $pop2
-	i32.const	$push195=, 0
-	i32.load	$push3=, should_optimize($pop195)
-	i32.eqz 	$push215=, $pop3
-	br_if   	1, $pop215      # 1: down to label1
-# 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.call	$drop=, __vfprintf_chk@FUNCTION, $0, $2, $pop174, $pop2
+	i32.const	$push173=, 0
+	i32.load	$push3=, should_optimize($pop173)
+	i32.eqz 	$push191=, $pop3
+	br_if   	1, $pop191      # 1: down to label1
+# %bb.33:                               # %if.end121
+	i32.const	$push180=, 0
+	i32.const	$push179=, 0
+	i32.store	should_optimize($pop180), $pop179
+	i32.const	$push178=, .L.str.7
 	i32.load	$push4=, 8($2)
-	i32.call	$push5=, __vfprintf_chk@FUNCTION, $0, $2, $pop202, $pop4
+	i32.call	$push5=, __vfprintf_chk@FUNCTION, $0, $2, $pop178, $pop4
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	1, $pop7        # 1: down to label1
-# BB#34:                                # %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
+	i32.eqz 	$push192=, $pop9
+	br_if   	1, $pop192      # 1: down to label1
 .LBB1_35:                               # %sw.epilog
 	end_block                       # label2:
 	i32.const	$push94=, 0
@@ -419,14 +407,13 @@ inner:                                  # @inner
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop16, $pop18
-	tee_local	$push42=, $0=, $pop43
-	i32.store	__stack_pointer($pop19), $pop42
+	i32.sub 	$0=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $0
 	i32.const	$push0=, 0
 	i32.const	$push41=, 0
 	call    	inner@FUNCTION, $pop0, $pop41
@@ -540,7 +527,7 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
 	.functype	vfprintf, i32, i32, i32, i32
 	.import_global	stdout
diff --git a/test/torture-s/vla-dealloc-1.c.s b/test/torture-s/vla-dealloc-1.c.s
index a67cf102e..38c6ce3a1 100644
--- a/test/torture-s/vla-dealloc-1.c.s
+++ b/test/torture-s/vla-dealloc-1.c.s
@@ -6,47 +6,56 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-	.local  	i32, i32, i32, i32
-# BB#0:                                 # %entry
-	i32.const	$push7=, 0
-	i32.load	$push9=, __stack_pointer($pop7)
-	tee_local	$push8=, $3=, $pop9
-	copy_local	$drop=, $pop8
-	i32.const	$2=, 0
+	.local  	i32, i32, i32, i32, i32, i32, i32
+# %bb.0:                                # %entry
+	i32.const	$push10=, 0
+	i32.load	$6=, __stack_pointer($pop10)
+	copy_local	$drop=, $6
+	i32.const	$2=, 1000000
+	i32.const	$3=, 0
+	i32.const	$4=, 1
+	i32.const	$5=, 0
 .LBB0_1:                                # %if.end
                                         # =>This Inner Loop Header: Depth=1
 	loop    	                # label0:
-	i32.const	$push24=, 1000
-	i32.rem_s	$push0=, $2, $pop24
-	i32.const	$push23=, 2
-	i32.shl 	$push22=, $pop0, $pop23
-	tee_local	$push21=, $0=, $pop22
-	i32.const	$push20=, 19
-	i32.add 	$push1=, $pop21, $pop20
+	i32.const	$push23=, 1000
+	i32.div_u	$0=, $5, $pop23
+	i32.const	$push22=, 1000
+	i32.mul 	$push0=, $0, $pop22
+	i32.sub 	$push1=, $4, $pop0
+	i32.const	$push21=, 2
+	i32.shl 	$push2=, $pop1, $pop21
+	i32.const	$push20=, 15
+	i32.add 	$push3=, $pop2, $pop20
 	i32.const	$push19=, -16
-	i32.and 	$push2=, $pop1, $pop19
-	i32.sub 	$push18=, $3, $pop2
-	tee_local	$push17=, $1=, $pop18
-	copy_local	$drop=, $pop17
-	i32.const	$push16=, 1
-	i32.store	0($1), $pop16
-	i32.const	$push15=, 0
-	i32.store	p($pop15), $1
-	i32.add 	$push4=, $1, $0
-	i32.const	$push14=, 2
-	i32.store	0($pop4), $pop14
-	copy_local	$push3=, $3
-	copy_local	$3=, $pop3
-	i32.const	$push13=, 1
-	i32.add 	$push12=, $2, $pop13
-	tee_local	$push11=, $2=, $pop12
-	i32.const	$push10=, 1000000
-	i32.ne  	$push5=, $pop11, $pop10
-	br_if   	0, $pop5        # 0: up to label0
-# BB#2:                                 # %cleanup5
+	i32.and 	$push4=, $pop3, $pop19
+	i32.sub 	$1=, $6, $pop4
+	copy_local	$drop=, $1
+	i32.const	$push18=, 1
+	i32.store	0($1), $pop18
+	i32.const	$push17=, 0
+	i32.store	p($pop17), $1
+	i32.const	$push16=, 4000
+	i32.mul 	$push6=, $0, $pop16
+	i32.sub 	$push7=, $3, $pop6
+	i32.add 	$push8=, $1, $pop7
+	i32.const	$push15=, 2
+	i32.store	0($pop8), $pop15
+	i32.const	$push14=, -1
+	i32.add 	$2=, $2, $pop14
+	i32.const	$push13=, 4
+	i32.add 	$3=, $3, $pop13
+	i32.const	$push12=, 1
+	i32.add 	$4=, $4, $pop12
+	i32.const	$push11=, 1
+	i32.add 	$5=, $5, $pop11
+	copy_local	$push5=, $6
+	copy_local	$6=, $pop5
+	br_if   	0, $2           # 0: up to label0
+# %bb.2:                                # %cleanup5
 	end_loop
-	i32.const	$push6=, 0
-                                        # fallthrough-return: $pop6
+	i32.const	$push9=, 0
+                                        # fallthrough-return: $pop9
 	.endfunc
 .Lfunc_end0:
 	.size	main, .Lfunc_end0-main
@@ -61,4 +70,4 @@ p:
 	.size	p, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/torture-s/vprintf-1.c.s b/test/torture-s/vprintf-1.c.s
index 05434f798..58a2d6fcb 100644
--- a/test/torture-s/vprintf-1.c.s
+++ b/test/torture-s/vprintf-1.c.s
@@ -7,21 +7,20 @@
 inner:                                  # @inner
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push67=, 0
+# %bb.0:                                # %entry
 	i32.const	$push65=, 0
 	i32.load	$push64=, __stack_pointer($pop65)
 	i32.const	$push66=, 16
-	i32.sub 	$push72=, $pop64, $pop66
-	tee_local	$push71=, $2=, $pop72
-	i32.store	__stack_pointer($pop67), $pop71
+	i32.sub 	$2=, $pop64, $pop66
+	i32.const	$push67=, 0
+	i32.store	__stack_pointer($pop67), $2
 	i32.store	8($2), $1
 	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -50,9 +49,9 @@ inner:                                  # @inner
 	i32.const	$push59=, .L.str
 	i32.load	$push58=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop59, $pop58
-	i32.const	$push73=, .L.str
+	i32.const	$push71=, .L.str
 	i32.load	$push60=, 8($2)
-	i32.call	$push61=, vprintf@FUNCTION, $pop73, $pop60
+	i32.call	$push61=, vprintf@FUNCTION, $pop71, $pop60
 	i32.const	$push62=, 5
 	i32.eq  	$push63=, $pop61, $pop62
 	br_if   	10, $pop63      # 10: down to label1
@@ -62,9 +61,9 @@ inner:                                  # @inner
 	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.const	$push72=, .L.str.4
 	i32.load	$push38=, 8($2)
-	i32.call	$push39=, vprintf@FUNCTION, $pop74, $pop38
+	i32.call	$push39=, vprintf@FUNCTION, $pop72, $pop38
 	i32.const	$push40=, 5
 	i32.eq  	$push41=, $pop39, $pop40
 	br_if   	9, $pop41       # 9: down to label1
@@ -74,9 +73,9 @@ inner:                                  # @inner
 	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.const	$push73=, .L.str.6
 	i32.load	$push10=, 8($2)
-	i32.call	$push11=, vprintf@FUNCTION, $pop75, $pop10
+	i32.call	$push11=, vprintf@FUNCTION, $pop73, $pop10
 	i32.const	$push12=, 7
 	i32.ne  	$push13=, $pop11, $pop12
 	br_if   	9, $pop13       # 9: down to label0
@@ -86,9 +85,9 @@ inner:                                  # @inner
 	i32.const	$push53=, .L.str.1
 	i32.load	$push52=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop53, $pop52
-	i32.const	$push76=, .L.str.1
+	i32.const	$push74=, .L.str.1
 	i32.load	$push54=, 8($2)
-	i32.call	$push55=, vprintf@FUNCTION, $pop76, $pop54
+	i32.call	$push55=, vprintf@FUNCTION, $pop74, $pop54
 	i32.const	$push56=, 6
 	i32.eq  	$push57=, $pop55, $pop56
 	br_if   	7, $pop57       # 7: down to label1
@@ -98,9 +97,9 @@ inner:                                  # @inner
 	i32.const	$push47=, .L.str.2
 	i32.load	$push46=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop47, $pop46
-	i32.const	$push77=, .L.str.2
+	i32.const	$push75=, .L.str.2
 	i32.load	$push48=, 8($2)
-	i32.call	$push49=, vprintf@FUNCTION, $pop77, $pop48
+	i32.call	$push49=, vprintf@FUNCTION, $pop75, $pop48
 	i32.const	$push50=, 1
 	i32.eq  	$push51=, $pop49, $pop50
 	br_if   	6, $pop51       # 6: down to label1
@@ -110,31 +109,31 @@ inner:                                  # @inner
 	i32.const	$push43=, .L.str.3
 	i32.load	$push42=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop43, $pop42
-	i32.const	$push78=, .L.str.3
+	i32.const	$push76=, .L.str.3
 	i32.load	$push44=, 8($2)
-	i32.call	$push45=, vprintf@FUNCTION, $pop78, $pop44
-	i32.eqz 	$push84=, $pop45
-	br_if   	5, $pop84       # 5: down to label1
+	i32.call	$push45=, vprintf@FUNCTION, $pop76, $pop44
+	i32.eqz 	$push82=, $pop45
+	br_if   	5, $pop82       # 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.const	$push77=, .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
+	i32.call	$push23=, vprintf@FUNCTION, $pop77, $pop22
+	i32.eqz 	$push83=, $pop23
+	br_if   	4, $pop83       # 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	$push80=, .L.str.4
+	i32.const	$push78=, .L.str.4
 	i32.load	$push32=, 8($2)
-	i32.call	$push33=, vprintf@FUNCTION, $pop80, $pop32
+	i32.call	$push33=, vprintf@FUNCTION, $pop78, $pop32
 	i32.const	$push34=, 6
 	i32.eq  	$push35=, $pop33, $pop34
 	br_if   	3, $pop35       # 3: down to label1
@@ -144,9 +143,9 @@ inner:                                  # @inner
 	i32.const	$push25=, .L.str.4
 	i32.load	$push24=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop25, $pop24
-	i32.const	$push81=, .L.str.4
+	i32.const	$push79=, .L.str.4
 	i32.load	$push26=, 8($2)
-	i32.call	$push27=, vprintf@FUNCTION, $pop81, $pop26
+	i32.call	$push27=, vprintf@FUNCTION, $pop79, $pop26
 	i32.const	$push28=, 1
 	i32.eq  	$push29=, $pop27, $pop28
 	br_if   	2, $pop29       # 2: down to label1
@@ -156,9 +155,9 @@ inner:                                  # @inner
 	i32.const	$push15=, .L.str.5
 	i32.load	$push14=, 12($2)
 	i32.call	$drop=, vprintf@FUNCTION, $pop15, $pop14
-	i32.const	$push82=, .L.str.5
+	i32.const	$push80=, .L.str.5
 	i32.load	$push16=, 8($2)
-	i32.call	$push17=, vprintf@FUNCTION, $pop82, $pop16
+	i32.call	$push17=, vprintf@FUNCTION, $pop80, $pop16
 	i32.const	$push18=, 1
 	i32.eq  	$push19=, $pop17, $pop18
 	br_if   	1, $pop19       # 1: down to label1
@@ -168,9 +167,9 @@ inner:                                  # @inner
 	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.const	$push81=, .L.str.7
 	i32.load	$push4=, 8($2)
-	i32.call	$push5=, vprintf@FUNCTION, $pop83, $pop4
+	i32.call	$push5=, vprintf@FUNCTION, $pop81, $pop4
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	1, $pop7        # 1: down to label0
@@ -196,14 +195,13 @@ inner:                                  # @inner
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop16, $pop18
-	tee_local	$push42=, $0=, $pop43
-	i32.store	__stack_pointer($pop19), $pop42
+	i32.sub 	$0=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $0
 	i32.const	$push0=, 0
 	i32.const	$push41=, 0
 	call    	inner@FUNCTION, $pop0, $pop41
@@ -308,6 +306,6 @@ main:                                   # @main
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 673c30c20..ceef75c3b 100644
--- a/test/torture-s/vprintf-chk-1.c.s
+++ b/test/torture-s/vprintf-chk-1.c.s
@@ -7,12 +7,12 @@
 __vprintf_chk:                          # @__vprintf_chk
 	.param  	i32, i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push3=, 0
 	i32.load	$push0=, should_optimize($pop3)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push4=, 0
 	i32.const	$push1=, 1
 	i32.store	should_optimize($pop4), $pop1
@@ -33,21 +33,20 @@ __vprintf_chk:                          # @__vprintf_chk
 inner:                                  # @inner
 	.param  	i32, i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push90=, 0
+# %bb.0:                                # %entry
 	i32.const	$push88=, 0
 	i32.load	$push87=, __stack_pointer($pop88)
 	i32.const	$push89=, 16
-	i32.sub 	$push95=, $pop87, $pop89
-	tee_local	$push94=, $2=, $pop95
-	i32.store	__stack_pointer($pop90), $pop94
+	i32.sub 	$2=, $pop87, $pop89
+	i32.const	$push90=, 0
+	i32.store	__stack_pointer($pop90), $2
 	i32.store	8($2), $1
 	i32.store	12($2), $1
 	block   	
 	i32.const	$push0=, 10
 	i32.gt_u	$push1=, $0, $pop0
 	br_if   	0, $pop1        # 0: down to label1
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	block   	
 	block   	
 	block   	
@@ -73,297 +72,297 @@ inner:                                  # @inner
                                         # 10: down to label3
 .LBB1_2:                                # %sw.bb
 	end_block                       # label13:
-	i32.const	$push99=, 0
-	i32.const	$push98=, 0
-	i32.store	should_optimize($pop99), $pop98
-	i32.const	$push97=, .L.str
-	i32.load	$push79=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop97, $pop79
+	i32.const	$push97=, 0
 	i32.const	$push96=, 0
-	i32.load	$push80=, should_optimize($pop96)
-	i32.eqz 	$push172=, $pop80
-	br_if   	11, $pop172     # 11: down to label1
-# BB#3:                                 # %if.end
-	i32.const	$push102=, 0
-	i32.const	$push101=, 0
-	i32.store	should_optimize($pop102), $pop101
-	i32.const	$push100=, .L.str
+	i32.store	should_optimize($pop97), $pop96
+	i32.const	$push95=, .L.str
+	i32.load	$push79=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop95, $pop79
+	i32.const	$push94=, 0
+	i32.load	$push80=, should_optimize($pop94)
+	i32.eqz 	$push170=, $pop80
+	br_if   	11, $pop170     # 11: down to label1
+# %bb.3:                                # %if.end
+	i32.const	$push100=, 0
+	i32.const	$push99=, 0
+	i32.store	should_optimize($pop100), $pop99
+	i32.const	$push98=, .L.str
 	i32.load	$push81=, 8($2)
-	i32.call	$push82=, __vprintf_chk@FUNCTION, $2, $pop100, $pop81
+	i32.call	$push82=, __vprintf_chk@FUNCTION, $2, $pop98, $pop81
 	i32.const	$push83=, 5
 	i32.ne  	$push84=, $pop82, $pop83
 	br_if   	11, $pop84      # 11: down to label1
-# BB#4:                                 # %if.end5
+# %bb.4:                                # %if.end5
 	i32.const	$push85=, 0
 	i32.load	$push86=, should_optimize($pop85)
 	br_if   	10, $pop86      # 10: down to label2
 	br      	11              # 11: down to label1
 .LBB1_5:                                # %sw.bb9
 	end_block                       # label12:
-	i32.const	$push105=, 0
+	i32.const	$push103=, 0
 	i32.const	$push70=, 1
-	i32.store	should_optimize($pop105), $pop70
-	i32.const	$push104=, .L.str.1
+	i32.store	should_optimize($pop103), $pop70
+	i32.const	$push102=, .L.str.1
 	i32.load	$push71=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop104, $pop71
-	i32.const	$push103=, 0
-	i32.load	$push72=, should_optimize($pop103)
-	i32.eqz 	$push173=, $pop72
-	br_if   	10, $pop173     # 10: down to label1
-# BB#6:                                 # %if.end13
-	i32.const	$push108=, 0
-	i32.const	$push107=, 0
-	i32.store	should_optimize($pop108), $pop107
-	i32.const	$push106=, .L.str.1
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop102, $pop71
+	i32.const	$push101=, 0
+	i32.load	$push72=, should_optimize($pop101)
+	i32.eqz 	$push171=, $pop72
+	br_if   	10, $pop171     # 10: down to label1
+# %bb.6:                                # %if.end13
+	i32.const	$push106=, 0
+	i32.const	$push105=, 0
+	i32.store	should_optimize($pop106), $pop105
+	i32.const	$push104=, .L.str.1
 	i32.load	$push73=, 8($2)
-	i32.call	$push74=, __vprintf_chk@FUNCTION, $2, $pop106, $pop73
+	i32.call	$push74=, __vprintf_chk@FUNCTION, $2, $pop104, $pop73
 	i32.const	$push75=, 6
 	i32.ne  	$push76=, $pop74, $pop75
 	br_if   	10, $pop76      # 10: down to label1
-# BB#7:                                 # %if.end17
+# %bb.7:                                # %if.end17
 	i32.const	$push77=, 0
 	i32.load	$push78=, should_optimize($pop77)
 	br_if   	9, $pop78       # 9: down to label2
 	br      	10              # 10: down to label1
 .LBB1_8:                                # %sw.bb21
 	end_block                       # label11:
-	i32.const	$push112=, 0
-	i32.const	$push111=, 1
-	i32.store	should_optimize($pop112), $pop111
-	i32.const	$push110=, .L.str.2
+	i32.const	$push110=, 0
+	i32.const	$push109=, 1
+	i32.store	should_optimize($pop110), $pop109
+	i32.const	$push108=, .L.str.2
 	i32.load	$push63=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop110, $pop63
-	i32.const	$push109=, 0
-	i32.load	$push64=, should_optimize($pop109)
-	i32.eqz 	$push174=, $pop64
-	br_if   	9, $pop174      # 9: down to label1
-# BB#9:                                 # %if.end25
-	i32.const	$push116=, 0
-	i32.const	$push115=, 0
-	i32.store	should_optimize($pop116), $pop115
-	i32.const	$push114=, .L.str.2
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop108, $pop63
+	i32.const	$push107=, 0
+	i32.load	$push64=, should_optimize($pop107)
+	i32.eqz 	$push172=, $pop64
+	br_if   	9, $pop172      # 9: down to label1
+# %bb.9:                                # %if.end25
+	i32.const	$push114=, 0
+	i32.const	$push113=, 0
+	i32.store	should_optimize($pop114), $pop113
+	i32.const	$push112=, .L.str.2
 	i32.load	$push65=, 8($2)
-	i32.call	$push66=, __vprintf_chk@FUNCTION, $2, $pop114, $pop65
-	i32.const	$push113=, 1
-	i32.ne  	$push67=, $pop66, $pop113
+	i32.call	$push66=, __vprintf_chk@FUNCTION, $2, $pop112, $pop65
+	i32.const	$push111=, 1
+	i32.ne  	$push67=, $pop66, $pop111
 	br_if   	9, $pop67       # 9: down to label1
-# BB#10:                                # %if.end29
+# %bb.10:                               # %if.end29
 	i32.const	$push68=, 0
 	i32.load	$push69=, should_optimize($pop68)
 	br_if   	8, $pop69       # 8: down to label2
 	br      	9               # 9: down to label1
 .LBB1_11:                               # %sw.bb33
 	end_block                       # label10:
-	i32.const	$push119=, 0
+	i32.const	$push117=, 0
 	i32.const	$push56=, 1
-	i32.store	should_optimize($pop119), $pop56
-	i32.const	$push118=, .L.str.3
+	i32.store	should_optimize($pop117), $pop56
+	i32.const	$push116=, .L.str.3
 	i32.load	$push57=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop118, $pop57
-	i32.const	$push117=, 0
-	i32.load	$push58=, should_optimize($pop117)
-	i32.eqz 	$push175=, $pop58
-	br_if   	8, $pop175      # 8: down to label1
-# BB#12:                                # %if.end37
-	i32.const	$push122=, 0
-	i32.const	$push121=, 0
-	i32.store	should_optimize($pop122), $pop121
-	i32.const	$push120=, .L.str.3
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop116, $pop57
+	i32.const	$push115=, 0
+	i32.load	$push58=, should_optimize($pop115)
+	i32.eqz 	$push173=, $pop58
+	br_if   	8, $pop173      # 8: down to label1
+# %bb.12:                               # %if.end37
+	i32.const	$push120=, 0
+	i32.const	$push119=, 0
+	i32.store	should_optimize($pop120), $pop119
+	i32.const	$push118=, .L.str.3
 	i32.load	$push59=, 8($2)
-	i32.call	$push60=, __vprintf_chk@FUNCTION, $2, $pop120, $pop59
+	i32.call	$push60=, __vprintf_chk@FUNCTION, $2, $pop118, $pop59
 	br_if   	8, $pop60       # 8: down to label1
-# BB#13:                                # %if.end41
+# %bb.13:                               # %if.end41
 	i32.const	$push61=, 0
 	i32.load	$push62=, should_optimize($pop61)
 	br_if   	7, $pop62       # 7: down to label2
 	br      	8               # 8: down to label1
 .LBB1_14:                               # %sw.bb45
 	end_block                       # label9:
-	i32.const	$push126=, 0
-	i32.const	$push125=, 0
-	i32.store	should_optimize($pop126), $pop125
-	i32.const	$push124=, .L.str.4
-	i32.load	$push48=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop124, $pop48
+	i32.const	$push124=, 0
 	i32.const	$push123=, 0
-	i32.load	$push49=, should_optimize($pop123)
-	i32.eqz 	$push176=, $pop49
-	br_if   	7, $pop176      # 7: down to label1
-# BB#15:                                # %if.end49
-	i32.const	$push129=, 0
-	i32.const	$push128=, 0
-	i32.store	should_optimize($pop129), $pop128
-	i32.const	$push127=, .L.str.4
+	i32.store	should_optimize($pop124), $pop123
+	i32.const	$push122=, .L.str.4
+	i32.load	$push48=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop122, $pop48
+	i32.const	$push121=, 0
+	i32.load	$push49=, should_optimize($pop121)
+	i32.eqz 	$push174=, $pop49
+	br_if   	7, $pop174      # 7: down to label1
+# %bb.15:                               # %if.end49
+	i32.const	$push127=, 0
+	i32.const	$push126=, 0
+	i32.store	should_optimize($pop127), $pop126
+	i32.const	$push125=, .L.str.4
 	i32.load	$push50=, 8($2)
-	i32.call	$push51=, __vprintf_chk@FUNCTION, $2, $pop127, $pop50
+	i32.call	$push51=, __vprintf_chk@FUNCTION, $2, $pop125, $pop50
 	i32.const	$push52=, 5
 	i32.ne  	$push53=, $pop51, $pop52
 	br_if   	7, $pop53       # 7: down to label1
-# BB#16:                                # %if.end53
+# %bb.16:                               # %if.end53
 	i32.const	$push54=, 0
 	i32.load	$push55=, should_optimize($pop54)
 	br_if   	6, $pop55       # 6: down to label2
 	br      	7               # 7: down to label1
 .LBB1_17:                               # %sw.bb57
 	end_block                       # label8:
-	i32.const	$push133=, 0
-	i32.const	$push132=, 0
-	i32.store	should_optimize($pop133), $pop132
-	i32.const	$push131=, .L.str.4
-	i32.load	$push40=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop131, $pop40
+	i32.const	$push131=, 0
 	i32.const	$push130=, 0
-	i32.load	$push41=, should_optimize($pop130)
-	i32.eqz 	$push177=, $pop41
-	br_if   	6, $pop177      # 6: down to label1
-# BB#18:                                # %if.end61
-	i32.const	$push136=, 0
-	i32.const	$push135=, 0
-	i32.store	should_optimize($pop136), $pop135
-	i32.const	$push134=, .L.str.4
+	i32.store	should_optimize($pop131), $pop130
+	i32.const	$push129=, .L.str.4
+	i32.load	$push40=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop129, $pop40
+	i32.const	$push128=, 0
+	i32.load	$push41=, should_optimize($pop128)
+	i32.eqz 	$push175=, $pop41
+	br_if   	6, $pop175      # 6: down to label1
+# %bb.18:                               # %if.end61
+	i32.const	$push134=, 0
+	i32.const	$push133=, 0
+	i32.store	should_optimize($pop134), $pop133
+	i32.const	$push132=, .L.str.4
 	i32.load	$push42=, 8($2)
-	i32.call	$push43=, __vprintf_chk@FUNCTION, $2, $pop134, $pop42
+	i32.call	$push43=, __vprintf_chk@FUNCTION, $2, $pop132, $pop42
 	i32.const	$push44=, 6
 	i32.ne  	$push45=, $pop43, $pop44
 	br_if   	6, $pop45       # 6: down to label1
-# BB#19:                                # %if.end65
+# %bb.19:                               # %if.end65
 	i32.const	$push46=, 0
 	i32.load	$push47=, should_optimize($pop46)
 	br_if   	5, $pop47       # 5: down to label2
 	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	$push26=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop138, $pop26
+	i32.const	$push138=, 0
 	i32.const	$push137=, 0
-	i32.load	$push27=, should_optimize($pop137)
-	i32.eqz 	$push178=, $pop27
-	br_if   	5, $pop178      # 5: down to label1
-# 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.store	should_optimize($pop138), $pop137
+	i32.const	$push136=, .L.str.4
+	i32.load	$push26=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop136, $pop26
+	i32.const	$push135=, 0
+	i32.load	$push27=, should_optimize($pop135)
+	i32.eqz 	$push176=, $pop27
+	br_if   	5, $pop176      # 5: down to label1
+# %bb.21:                               # %if.end85
+	i32.const	$push141=, 0
+	i32.const	$push140=, 0
+	i32.store	should_optimize($pop141), $pop140
+	i32.const	$push139=, .L.str.4
 	i32.load	$push28=, 8($2)
-	i32.call	$push29=, __vprintf_chk@FUNCTION, $2, $pop141, $pop28
+	i32.call	$push29=, __vprintf_chk@FUNCTION, $2, $pop139, $pop28
 	br_if   	5, $pop29       # 5: down to label1
-# BB#22:                                # %if.end89
+# %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.6
-	i32.load	$push10=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop145, $pop10
+	i32.const	$push145=, 0
 	i32.const	$push144=, 0
-	i32.load	$push11=, should_optimize($pop144)
-	i32.eqz 	$push179=, $pop11
-	br_if   	4, $pop179      # 4: down to label1
-# BB#24:                                # %if.end109
-	i32.const	$push150=, 0
-	i32.const	$push149=, 0
-	i32.store	should_optimize($pop150), $pop149
-	i32.const	$push148=, .L.str.6
+	i32.store	should_optimize($pop145), $pop144
+	i32.const	$push143=, .L.str.6
+	i32.load	$push10=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop143, $pop10
+	i32.const	$push142=, 0
+	i32.load	$push11=, should_optimize($pop142)
+	i32.eqz 	$push177=, $pop11
+	br_if   	4, $pop177      # 4: down to label1
+# %bb.24:                               # %if.end109
+	i32.const	$push148=, 0
+	i32.const	$push147=, 0
+	i32.store	should_optimize($pop148), $pop147
+	i32.const	$push146=, .L.str.6
 	i32.load	$push12=, 8($2)
-	i32.call	$push13=, __vprintf_chk@FUNCTION, $2, $pop148, $pop12
+	i32.call	$push13=, __vprintf_chk@FUNCTION, $2, $pop146, $pop12
 	i32.const	$push14=, 7
 	i32.ne  	$push15=, $pop13, $pop14
 	br_if   	4, $pop15       # 4: down to label1
-# BB#25:                                # %if.end113
+# %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.4
-	i32.load	$push32=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop152, $pop32
+	i32.const	$push152=, 0
 	i32.const	$push151=, 0
-	i32.load	$push33=, should_optimize($pop151)
-	i32.eqz 	$push180=, $pop33
-	br_if   	3, $pop180      # 3: down to label1
-# BB#27:                                # %if.end73
-	i32.const	$push157=, 0
-	i32.const	$push156=, 0
-	i32.store	should_optimize($pop157), $pop156
-	i32.const	$push155=, .L.str.4
+	i32.store	should_optimize($pop152), $pop151
+	i32.const	$push150=, .L.str.4
+	i32.load	$push32=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop150, $pop32
+	i32.const	$push149=, 0
+	i32.load	$push33=, should_optimize($pop149)
+	i32.eqz 	$push178=, $pop33
+	br_if   	3, $pop178      # 3: down to label1
+# %bb.27:                               # %if.end73
+	i32.const	$push155=, 0
+	i32.const	$push154=, 0
+	i32.store	should_optimize($pop155), $pop154
+	i32.const	$push153=, .L.str.4
 	i32.load	$push34=, 8($2)
-	i32.call	$push35=, __vprintf_chk@FUNCTION, $2, $pop155, $pop34
+	i32.call	$push35=, __vprintf_chk@FUNCTION, $2, $pop153, $pop34
 	i32.const	$push36=, 1
 	i32.ne  	$push37=, $pop35, $pop36
 	br_if   	3, $pop37       # 3: down to label1
-# BB#28:                                # %if.end77
+# %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.5
-	i32.load	$push18=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop159, $pop18
+	i32.const	$push159=, 0
 	i32.const	$push158=, 0
-	i32.load	$push19=, should_optimize($pop158)
-	i32.eqz 	$push181=, $pop19
-	br_if   	2, $pop181      # 2: down to label1
-# BB#30:                                # %if.end97
-	i32.const	$push164=, 0
-	i32.const	$push163=, 0
-	i32.store	should_optimize($pop164), $pop163
-	i32.const	$push162=, .L.str.5
+	i32.store	should_optimize($pop159), $pop158
+	i32.const	$push157=, .L.str.5
+	i32.load	$push18=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop157, $pop18
+	i32.const	$push156=, 0
+	i32.load	$push19=, should_optimize($pop156)
+	i32.eqz 	$push179=, $pop19
+	br_if   	2, $pop179      # 2: down to label1
+# %bb.30:                               # %if.end97
+	i32.const	$push162=, 0
+	i32.const	$push161=, 0
+	i32.store	should_optimize($pop162), $pop161
+	i32.const	$push160=, .L.str.5
 	i32.load	$push20=, 8($2)
-	i32.call	$push21=, __vprintf_chk@FUNCTION, $2, $pop162, $pop20
+	i32.call	$push21=, __vprintf_chk@FUNCTION, $2, $pop160, $pop20
 	i32.const	$push22=, 1
 	i32.ne  	$push23=, $pop21, $pop22
 	br_if   	2, $pop23       # 2: down to label1
-# BB#31:                                # %if.end101
+# %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
-	i32.store	should_optimize($pop168), $pop167
-	i32.const	$push166=, .L.str.7
-	i32.load	$push2=, 12($2)
-	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop166, $pop2
+	i32.const	$push166=, 0
 	i32.const	$push165=, 0
-	i32.load	$push3=, should_optimize($pop165)
-	i32.eqz 	$push182=, $pop3
-	br_if   	1, $pop182      # 1: down to label1
-# BB#33:                                # %if.end121
-	i32.const	$push171=, 0
-	i32.const	$push170=, 0
-	i32.store	should_optimize($pop171), $pop170
-	i32.const	$push169=, .L.str.7
+	i32.store	should_optimize($pop166), $pop165
+	i32.const	$push164=, .L.str.7
+	i32.load	$push2=, 12($2)
+	i32.call	$drop=, __vprintf_chk@FUNCTION, $2, $pop164, $pop2
+	i32.const	$push163=, 0
+	i32.load	$push3=, should_optimize($pop163)
+	i32.eqz 	$push180=, $pop3
+	br_if   	1, $pop180      # 1: down to label1
+# %bb.33:                               # %if.end121
+	i32.const	$push169=, 0
+	i32.const	$push168=, 0
+	i32.store	should_optimize($pop169), $pop168
+	i32.const	$push167=, .L.str.7
 	i32.load	$push4=, 8($2)
-	i32.call	$push5=, __vprintf_chk@FUNCTION, $2, $pop169, $pop4
+	i32.call	$push5=, __vprintf_chk@FUNCTION, $2, $pop167, $pop4
 	i32.const	$push6=, 2
 	i32.ne  	$push7=, $pop5, $pop6
 	br_if   	1, $pop7        # 1: down to label1
-# BB#34:                                # %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
+	i32.eqz 	$push181=, $pop9
+	br_if   	1, $pop181      # 1: down to label1
 .LBB1_35:                               # %sw.epilog
 	end_block                       # label2:
 	i32.const	$push93=, 0
@@ -386,14 +385,13 @@ inner:                                  # @inner
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push19=, 0
+# %bb.0:                                # %entry
 	i32.const	$push17=, 0
 	i32.load	$push16=, __stack_pointer($pop17)
 	i32.const	$push18=, 112
-	i32.sub 	$push43=, $pop16, $pop18
-	tee_local	$push42=, $0=, $pop43
-	i32.store	__stack_pointer($pop19), $pop42
+	i32.sub 	$0=, $pop16, $pop18
+	i32.const	$push19=, 0
+	i32.store	__stack_pointer($pop19), $0
 	i32.const	$push0=, 0
 	i32.const	$push41=, 0
 	call    	inner@FUNCTION, $pop0, $pop41
@@ -507,6 +505,6 @@ should_optimize:
 	.size	.L.str.7, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 75d4a06b6..88df491c1 100644
--- a/test/torture-s/vrp-1.c.s
+++ b/test/torture-s/vrp-1.c.s
@@ -7,7 +7,7 @@
 f:                                      # @f
 	.param  	i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, -2
 	i32.ne  	$push1=, $0, $pop0
                                         # fallthrough-return: $pop1
@@ -22,7 +22,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -31,5 +31,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-2.c.s b/test/torture-s/vrp-2.c.s
index 6155385c8..b8372726b 100644
--- a/test/torture-s/vrp-2.c.s
+++ b/test/torture-s/vrp-2.c.s
@@ -8,24 +8,23 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 1
 	block   	
 	i32.const	$push4=, 2
 	i32.eq  	$push0=, $0, $pop4
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.then
+# %bb.1:                                # %if.then
 	i32.const	$push1=, 31
-	i32.shr_s	$push7=, $0, $pop1
-	tee_local	$push6=, $1=, $pop7
-	i32.add 	$push2=, $0, $pop6
+	i32.shr_s	$1=, $0, $pop1
+	i32.add 	$push2=, $0, $1
 	i32.xor 	$push3=, $pop2, $1
 	i32.const	$push5=, 2
 	i32.ne  	$1=, $pop3, $pop5
 .LBB0_2:                                # %return
 	end_block                       # label0:
-	copy_local	$push8=, $1
-                                        # fallthrough-return: $pop8
+	copy_local	$push6=, $1
+                                        # fallthrough-return: $pop6
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -37,7 +36,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -46,5 +45,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-3.c.s b/test/torture-s/vrp-3.c.s
index 13f6ffbb0..0d9ca10e5 100644
--- a/test/torture-s/vrp-3.c.s
+++ b/test/torture-s/vrp-3.c.s
@@ -8,7 +8,7 @@ f:                                      # @f
 	.param  	i32
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$1=, 1
 	block   	
 	i32.const	$push0=, 14
@@ -16,18 +16,17 @@ f:                                      # @f
 	i32.const	$push2=, 25
 	i32.gt_u	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %if.then2
+# %bb.1:                                # %if.then2
 	i32.const	$push4=, 31
-	i32.shr_s	$push9=, $0, $pop4
-	tee_local	$push8=, $1=, $pop9
-	i32.add 	$push5=, $0, $pop8
+	i32.shr_s	$1=, $0, $pop4
+	i32.add 	$push5=, $0, $1
 	i32.xor 	$push6=, $pop5, $1
 	i32.const	$push7=, 2
 	i32.ne  	$1=, $pop6, $pop7
 .LBB0_2:                                # %return
 	end_block                       # label0:
-	copy_local	$push10=, $1
-                                        # fallthrough-return: $pop10
+	copy_local	$push8=, $1
+                                        # fallthrough-return: $pop8
 	.endfunc
 .Lfunc_end0:
 	.size	f, .Lfunc_end0-f
@@ -39,7 +38,7 @@ f:                                      # @f
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %if.end
+# %bb.0:                                # %if.end
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -48,5 +47,5 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/vrp-4.c.s b/test/torture-s/vrp-4.c.s
index 0d8630433..3f984db01 100644
--- a/test/torture-s/vrp-4.c.s
+++ b/test/torture-s/vrp-4.c.s
@@ -6,21 +6,21 @@
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 1
 	i32.eq  	$push0=, $0, $pop5
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 1
 	i32.eq  	$push1=, $1, $pop6
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
 	i32.div_s	$push2=, $0, $1
 	i32.const	$push3=, 1
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %if.end6
+# %bb.3:                                # %if.end6
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -36,7 +36,7 @@ test:                                   # @test
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -45,6 +45,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 a5e558bfd..0a0d64151 100644
--- a/test/torture-s/vrp-5.c.s
+++ b/test/torture-s/vrp-5.c.s
@@ -6,21 +6,21 @@
 	.type	test,@function
 test:                                   # @test
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 4
 	i32.le_u	$push0=, $0, $pop5
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 4
 	i32.le_u	$push1=, $1, $pop6
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
 	i32.const	$push2=, 0
 	i32.sub 	$push3=, $pop2, $1
 	i32.ne  	$push4=, $pop3, $0
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %if.end6
+# %bb.3:                                # %if.end6
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -37,7 +37,7 @@ test:                                   # @test
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -46,6 +46,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end1-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 5a8ad2a39..a3579ed2e 100644
--- a/test/torture-s/vrp-6.c.s
+++ b/test/torture-s/vrp-6.c.s
@@ -6,21 +6,21 @@
 	.type	test01,@function
 test01:                                 # @test01
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push5=, 4
 	i32.le_u	$push0=, $0, $pop5
 	br_if   	0, $pop0        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push6=, 4
 	i32.le_u	$push1=, $1, $pop6
 	br_if   	0, $pop1        # 0: down to label0
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
 	i32.sub 	$push2=, $0, $1
 	i32.const	$push3=, 5
 	i32.ne  	$push4=, $pop2, $pop3
 	br_if   	0, $pop4        # 0: down to label0
-# BB#3:                                 # %if.end6
+# %bb.3:                                # %if.end6
 	return
 .LBB0_4:                                # %if.then
 	end_block                       # label0:
@@ -36,17 +36,17 @@ test01:                                 # @test01
 	.type	test02,@function
 test02:                                 # @test02
 	.param  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	block   	
 	i32.const	$push1=, 12
 	i32.lt_u	$push2=, $0, $pop1
 	br_if   	0, $pop2        # 0: down to label2
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push3=, 16
 	i32.lt_u	$push4=, $1, $pop3
 	br_if   	0, $pop4        # 0: down to label2
-# BB#2:                                 # %entry
+# %bb.2:                                # %entry
 	i32.sub 	$push0=, $0, $1
 	i32.const	$push5=, -17
 	i32.le_u	$push6=, $pop0, $pop5
@@ -69,7 +69,7 @@ test02:                                 # @test02
 main:                                   # @main
 	.param  	i32, i32
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -78,6 +78,6 @@ main:                                   # @main
 	.size	main, .Lfunc_end2-main
                                         # -- End function
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 9ad653992..54f20946d 100644
--- a/test/torture-s/vrp-7.c.s
+++ b/test/torture-s/vrp-7.c.s
@@ -6,7 +6,7 @@
 	.type	foo,@function
 foo:                                    # @foo
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push4=, 0
 	i32.const	$push9=, 0
 	i32.load8_u	$push5=, t($pop9)
@@ -29,7 +29,7 @@ foo:                                    # @foo
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 16
 	call    	foo@FUNCTION, $pop0
 	block   	
@@ -39,7 +39,7 @@ main:                                   # @main
 	i32.and 	$push3=, $pop1, $pop2
 	i32.eqz 	$push6=, $pop3
 	br_if   	0, $pop6        # 0: down to label0
-# BB#1:                                 # %if.end
+# %bb.1:                                # %if.end
 	i32.const	$push5=, 0
 	return  	$pop5
 .LBB1_2:                                # %if.then
@@ -60,5 +60,5 @@ t:
 	.size	t, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/wchar_t-1.c.s b/test/torture-s/wchar_t-1.c.s
index 867650608..0a2e1f452 100644
--- a/test/torture-s/wchar_t-1.c.s
+++ b/test/torture-s/wchar_t-1.c.s
@@ -6,24 +6,24 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	block   	
 	i32.const	$push7=, 0
 	i32.load	$push1=, x($pop7)
 	i32.const	$push2=, 196
 	i32.ne  	$push3=, $pop1, $pop2
 	br_if   	0, $pop3        # 0: down to label0
-# BB#1:                                 # %entry
+# %bb.1:                                # %entry
 	i32.const	$push8=, 0
 	i32.load	$push0=, x+4($pop8)
 	br_if   	0, $pop0        # 0: down to label0
-# BB#2:                                 # %if.end
+# %bb.2:                                # %if.end
 	i32.const	$push9=, 0
 	i32.load	$push4=, y($pop9)
 	i32.const	$push5=, 196
 	i32.ne  	$push6=, $pop4, $pop5
 	br_if   	0, $pop6        # 0: down to label0
-# BB#3:                                 # %if.end4
+# %bb.3:                                # %if.end4
 	i32.const	$push10=, 0
 	call    	exit@FUNCTION, $pop10
 	unreachable
@@ -55,6 +55,6 @@ y:
 	.size	y, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 ac58abb92..d771fbb9b 100644
--- a/test/torture-s/widechar-1.c.s
+++ b/test/torture-s/widechar-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	call    	exit@FUNCTION, $pop0
 	unreachable
@@ -15,5 +15,5 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.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 7cbac054b..d05d8c018 100644
--- a/test/torture-s/zero-struct-1.c.s
+++ b/test/torture-s/zero-struct-1.c.s
@@ -5,7 +5,7 @@
 	.globl	h
 	.type	h,@function
 h:                                      # @h
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push9=, 0
 	i32.load	$push1=, f($pop9)
@@ -30,30 +30,28 @@ h:                                      # @h
 main:                                   # @main
 	.result 	i32
 	.local  	i32, i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
-	i32.const	$push15=, 0
-	i32.load	$push1=, f($pop15)
+	i32.load	$push1=, f($pop0)
 	i32.const	$push2=, 2
-	i32.add 	$push14=, $pop1, $pop2
-	tee_local	$push13=, $1=, $pop14
-	i32.store	f($pop0), $pop13
-	i32.const	$push12=, 0
+	i32.add 	$1=, $pop1, $pop2
 	i32.const	$push11=, 0
-	i32.load	$push3=, ff($pop11)
-	i32.const	$push10=, 2
-	i32.add 	$push9=, $pop3, $pop10
-	tee_local	$push8=, $0=, $pop9
-	i32.store	ff($pop12), $pop8
+	i32.store	f($pop11), $1
+	i32.const	$push10=, 0
+	i32.load	$push3=, ff($pop10)
+	i32.const	$push9=, 2
+	i32.add 	$0=, $pop3, $pop9
+	i32.const	$push8=, 0
+	i32.store	ff($pop8), $0
 	block   	
 	i32.const	$push7=, y+2
 	i32.ne  	$push4=, $1, $pop7
 	br_if   	0, $pop4        # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push16=, y+2
-	i32.ne  	$push5=, $0, $pop16
+# %bb.1:                                # %if.end
+	i32.const	$push12=, y+2
+	i32.ne  	$push5=, $0, $pop12
 	br_if   	0, $pop5        # 0: down to label0
-# BB#2:                                 # %if.end3
+# %bb.2:                                # %if.end3
 	i32.const	$push6=, 0
 	return  	$pop6
 .LBB1_3:                                # %if.then
@@ -91,5 +89,5 @@ ff:
 	.size	ff, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/zero-struct-2.c.s b/test/torture-s/zero-struct-2.c.s
index b69184dba..d9d15ee3c 100644
--- a/test/torture-s/zero-struct-2.c.s
+++ b/test/torture-s/zero-struct-2.c.s
@@ -5,7 +5,7 @@
 	.globl	one_raw_spinlock
 	.type	one_raw_spinlock,@function
 one_raw_spinlock:                       # @one_raw_spinlock
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
 	i32.const	$push4=, 0
 	i32.load	$push1=, ii($pop4)
@@ -24,19 +24,18 @@ one_raw_spinlock:                       # @one_raw_spinlock
 main:                                   # @main
 	.result 	i32
 	.local  	i32
-# BB#0:                                 # %entry
-	i32.const	$push5=, 0
-	i32.const	$push4=, 0
-	i32.load	$push3=, ii($pop4)
-	tee_local	$push2=, $0=, $pop3
+# %bb.0:                                # %entry
+	i32.const	$push3=, 0
+	i32.load	$0=, ii($pop3)
+	i32.const	$push2=, 0
 	i32.const	$push0=, 1
-	i32.add 	$push1=, $pop2, $pop0
-	i32.store	ii($pop5), $pop1
+	i32.add 	$push1=, $0, $pop0
+	i32.store	ii($pop2), $pop1
 	block   	
 	br_if   	0, $0           # 0: down to label0
-# BB#1:                                 # %if.end
-	i32.const	$push6=, 0
-	return  	$pop6
+# %bb.1:                                # %if.end
+	i32.const	$push4=, 0
+	return  	$pop4
 .LBB1_2:                                # %if.then
 	end_block                       # label0:
 	call    	abort@FUNCTION
@@ -55,5 +54,5 @@ ii:
 	.size	ii, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	abort, void
diff --git a/test/torture-s/zerolen-1.c.s b/test/torture-s/zerolen-1.c.s
index 68952dbc6..ba69837ec 100644
--- a/test/torture-s/zerolen-1.c.s
+++ b/test/torture-s/zerolen-1.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %if.then
+# %bb.0:                                # %if.then
 	i32.const	$push1=, 0
 	i32.const	$push0=, 1
 	i32.store16	entry($pop1):p2align=0, $pop0
@@ -23,7 +23,7 @@ main:                                   # @main
 	.type	set,@function
 set:                                    # @set
 	.param  	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 1
 	i32.store16	0($0):p2align=0, $pop0
                                         # fallthrough-return
@@ -40,5 +40,5 @@ entry:
 	.size	entry, 4
 
 
-	.ident	"clang version 6.0.0 (https://llvm.googlesource.com/clang.git a1774cccdccfa673c057f93ccf23bc2d8cb04932) (https://llvm.googlesource.com/llvm.git fc50e1c6121255333bc42d6faf2b524c074eae25)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
 	.functype	exit, void, i32
diff --git a/test/torture-s/zerolen-2.c.s b/test/torture-s/zerolen-2.c.s
index de3a64c53..e2a738ac2 100644
--- a/test/torture-s/zerolen-2.c.s
+++ b/test/torture-s/zerolen-2.c.s
@@ -6,7 +6,7 @@
 	.type	main,@function
 main:                                   # @main
 	.result 	i32
-# BB#0:                                 # %entry
+# %bb.0:                                # %entry
 	i32.const	$push0=, 0
                                         # fallthrough-return: $pop0
 	.endfunc
@@ -14,4 +14,4 @@ main:                                   # @main
 	.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)"
+	.ident	"clang version 7.0.0 (https://llvm.googlesource.com/clang.git 1f874ca3c3f27c2149b6b33ca4a5966b3577280d) (https://llvm.googlesource.com/llvm.git 2e4bd2aa729dd2c33cdca2b39c971c675e914001)"
diff --git a/test/waterfall b/test/waterfall
-Subproject 900646fc880d526160b0df9b78bc9dd4f02dc1a
+Subproject f15a09a5a2cd5a9fcd4f68e5be21305f3bc2c08