fix

2025-07-30 21:52:18 +00:00 · 2019-05-23 03:08:25 +02:00
parent d94b4fca50
commit 51fdf9db4f
182 changed files with 81381 additions and 95410 deletions
--- a/tests/compiler/assert-nonnull.untouched.wat
+++ b/tests/compiler/assert-nonnull.untouched.wat
@@ -1,12 +1,15 @@
 (module
 (type $FUNCSIG$ii (func (param i32) (result i32)))
+ (type $FUNCSIG$vi (func (param i32)))
 (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
 (type $FUNCSIG$viiii (func (param i32 i32 i32 i32)))
 (type $FUNCSIG$i (func (result i32)))
 (type $FUNCSIG$v (func))
 (import "env" "abort" (func $~lib/builtins/abort (param i32 i32 i32 i32)))
 (memory $0 1)
- (data (i32.const 8) "\10\00\00\00\1a\00\00\00\00\00\00\00\00\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s\00")
+ (data (i32.const 8) "^\00\00\00\01\00\00\00\01\00\00\00^\00\00\00E\00l\00e\00m\00e\00n\00t\00 \00t\00y\00p\00e\00 \00m\00u\00s\00t\00 \00b\00e\00 \00n\00u\00l\00l\00a\00b\00l\00e\00 \00i\00f\00 \00a\00r\00r\00a\00y\00 \00i\00s\00 \00h\00o\00l\00e\00y\00")
+ (data (i32.const 120) "\1a\00\00\00\01\00\00\00\01\00\00\00\1a\00\00\00~\00l\00i\00b\00/\00a\00r\00r\00a\00y\00.\00t\00s\00")
+ (data (i32.const 168) "$\00\00\00\01\00\00\00\01\00\00\00$\00\00\00I\00n\00d\00e\00x\00 \00o\00u\00t\00 \00o\00f\00 \00r\00a\00n\00g\00e\00")
 (table $0 1 funcref)
 (elem (i32.const 0) $null)
 (global $~lib/argc (mut i32) (i32.const 0))
@@ -23,19 +26,36 @@
 (export "testRet" (func $assert-nonnull/testRet))
 (export "testObjFn" (func $assert-nonnull/testObjFn))
 (export "testObjRet" (func $assert-nonnull/testObjRet))
- (func $assert-nonnull/testVar (; 1 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $~lib/rt/stub/__retain (; 1 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  local.get $0
+ )
+ (func $~lib/rt/stub/__release (; 2 ;) (type $FUNCSIG$vi) (param $0 i32)
+  nop
+ )
+ (func $assert-nonnull/testVar (; 3 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
  local.tee $1
  if (result i32)
   local.get $1
  else   
   unreachable
  end
+  call $~lib/rt/stub/__retain
+  local.set $1
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $1
 )
- (func $assert-nonnull/testObj (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assert-nonnull/testObj (; 4 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
  local.tee $1
  if (result i32)
   local.get $1
@@ -43,10 +63,18 @@
   unreachable
  end
  i32.load
+  call $~lib/rt/stub/__retain
+  local.set $1
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $1
 )
- (func $assert-nonnull/testProp (; 3 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assert-nonnull/testProp (; 5 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
  i32.load
  local.tee $1
  if (result i32)
@@ -54,8 +82,13 @@
  else   
   unreachable
  end
+  call $~lib/rt/stub/__retain
+  local.set $1
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $1
 )
- (func $~lib/array/Array<assert-nonnull/Foo>#__unchecked_get (; 4 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo>#__unchecked_get (; 6 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
  local.get $0
  i32.load offset=4
  local.get $1
@@ -63,16 +96,17 @@
  i32.shl
  i32.add
  i32.load
+  call $~lib/rt/stub/__retain
 )
- (func $~lib/array/Array<assert-nonnull/Foo>#__get (; 5 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo>#__get (; 7 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
  local.get $1
  local.get $0
  i32.load offset=12
  i32.ge_u
  if
-   i32.const 0
   i32.const 24
-   i32.const 96
+   i32.const 136
+   i32.const 97
   i32.const 45
   call $~lib/builtins/abort
   unreachable
@@ -84,9 +118,9 @@
  i32.shr_u
  i32.ge_u
  if
-   i32.const 0
-   i32.const 24
-   i32.const 99
+   i32.const 184
+   i32.const 136
+   i32.const 100
   i32.const 61
   call $~lib/builtins/abort
   unreachable
@@ -95,9 +129,12 @@
  local.get $1
  call $~lib/array/Array<assert-nonnull/Foo>#__unchecked_get
 )
- (func $assert-nonnull/testArr (; 6 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assert-nonnull/testArr (; 8 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
  local.tee $1
  if (result i32)
   local.get $1
@@ -106,8 +143,12 @@
  end
  i32.const 0
  call $~lib/array/Array<assert-nonnull/Foo>#__get
+  local.set $1
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $1
 )
- (func $~lib/array/Array<assert-nonnull/Foo | null>#__unchecked_get (; 7 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo | null>#__unchecked_get (; 9 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
  local.get $0
  i32.load offset=4
  local.get $1
@@ -115,8 +156,9 @@
  i32.shl
  i32.add
  i32.load
+  call $~lib/rt/stub/__retain
 )
- (func $~lib/array/Array<assert-nonnull/Foo | null>#__get (; 8 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
+ (func $~lib/array/Array<assert-nonnull/Foo | null>#__get (; 10 ;) (type $FUNCSIG$iii) (param $0 i32) (param $1 i32) (result i32)
  local.get $1
  local.get $0
  i32.load offset=8
@@ -124,9 +166,9 @@
  i32.shr_u
  i32.ge_u
  if
-   i32.const 0
-   i32.const 24
-   i32.const 99
+   i32.const 184
+   i32.const 136
+   i32.const 100
   i32.const 61
   call $~lib/builtins/abort
   unreachable
@@ -135,78 +177,107 @@
  local.get $1
  call $~lib/array/Array<assert-nonnull/Foo | null>#__unchecked_get
 )
- (func $assert-nonnull/testElem (; 9 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
-  (local $1 i32)
-  local.get $0
-  i32.const 0
-  call $~lib/array/Array<assert-nonnull/Foo | null>#__get
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
- )
- (func $assert-nonnull/testAll (; 10 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
-  (local $1 i32)
-  local.get $0
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
-  i32.const 0
-  call $~lib/array/Array<assert-nonnull/Foo | null>#__get
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
-  i32.load
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
- )
- (func $assert-nonnull/testAll2 (; 11 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
-  (local $1 i32)
-  local.get $0
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
-  i32.const 0
-  call $~lib/array/Array<assert-nonnull/Foo | null>#__get
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
-  i32.load
-  local.tee $1
-  if (result i32)
-   local.get $1
-  else   
-   unreachable
-  end
- )
- (func $assert-nonnull/testFn (; 12 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
-  i32.const 0
-  global.set $~lib/argc
-  local.get $0
-  call_indirect (type $FUNCSIG$i)
- )
- (func $assert-nonnull/testFn2 (; 13 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assert-nonnull/testElem (; 11 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
  (local $2 i32)
  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
+  i32.const 0
+  call $~lib/array/Array<assert-nonnull/Foo | null>#__get
+  local.tee $1
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $2
+ )
+ (func $assert-nonnull/testAll (; 12 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
+  local.tee $1
+  if (result i32)
+   local.get $1
+  else   
+   unreachable
+  end
+  i32.const 0
+  call $~lib/array/Array<assert-nonnull/Foo | null>#__get
+  local.tee $1
+  i32.load
+  local.tee $2
+  if (result i32)
+   local.get $2
+  else   
+   unreachable
+  end
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $2
+ )
+ (func $assert-nonnull/testAll2 (; 13 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  local.get $0
+  local.tee $1
+  if (result i32)
+   local.get $1
+  else   
+   unreachable
+  end
+  i32.const 0
+  call $~lib/array/Array<assert-nonnull/Foo | null>#__get
+  local.tee $1
+  i32.load
+  local.tee $2
+  if (result i32)
+   local.get $2
+  else   
+   unreachable
+  end
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $2
+ )
+ (func $assert-nonnull/testFn (; 14 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  block (result i32)
+   i32.const 0
+   global.set $~lib/argc
+   local.get $0
+   call_indirect (type $FUNCSIG$i)
+   local.tee $1
+  end
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $2
+ )
+ (func $assert-nonnull/testFn2 (; 15 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  (local $3 i32)
+  local.get $0
  local.tee $1
  if (result i32)
   local.get $1
@@ -214,49 +285,91 @@
   unreachable
  end
  local.set $2
-  i32.const 0
-  global.set $~lib/argc
-  local.get $2
-  call_indirect (type $FUNCSIG$i)
+  block (result i32)
+   i32.const 0
+   global.set $~lib/argc
+   local.get $2
+   call_indirect (type $FUNCSIG$i)
+   local.tee $1
+  end
+  call $~lib/rt/stub/__retain
+  local.set $3
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $3
 )
- (func $assert-nonnull/testRet (; 14 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assert-nonnull/testRet (; 16 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
+  (local $2 i32)
  block (result i32)
   i32.const 0
   global.set $~lib/argc
   local.get $0
   call_indirect (type $FUNCSIG$i)
+   local.tee $1
  end
-  local.tee $1
+  local.tee $2
  if (result i32)
-   local.get $1
+   local.get $2
  else   
   unreachable
  end
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $2
 )
- (func $assert-nonnull/testObjFn (; 15 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
-  i32.const 0
-  global.set $~lib/argc
-  local.get $0
-  i32.load offset=4
-  call_indirect (type $FUNCSIG$i)
- )
- (func $assert-nonnull/testObjRet (; 16 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+ (func $assert-nonnull/testObjFn (; 17 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
  (local $1 i32)
+  (local $2 i32)
+  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
  block (result i32)
   i32.const 0
   global.set $~lib/argc
   local.get $0
   i32.load offset=4
   call_indirect (type $FUNCSIG$i)
+   local.tee $1
  end
-  local.tee $1
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $2
+ )
+ (func $assert-nonnull/testObjRet (; 18 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
+  (local $1 i32)
+  (local $2 i32)
+  local.get $0
+  call $~lib/rt/stub/__retain
+  drop
+  block (result i32)
+   i32.const 0
+   global.set $~lib/argc
+   local.get $0
+   i32.load offset=4
+   call_indirect (type $FUNCSIG$i)
+   local.tee $1
+  end
+  local.tee $2
  if (result i32)
-   local.get $1
+   local.get $2
  else   
   unreachable
  end
+  call $~lib/rt/stub/__retain
+  local.set $2
+  local.get $1
+  call $~lib/rt/stub/__release
+  local.get $0
+  call $~lib/rt/stub/__release
+  local.get $2
 )
- (func $null (; 17 ;) (type $FUNCSIG$v)
+ (func $null (; 19 ;) (type $FUNCSIG$v)
 )
 )