Merge branch 'master' into runtime

std/assembly/bindings/wasi.ts

@@ -0,0 +1 @@
+export * from "./wasi_unstable";

std/assembly/string.ts

@@ -95,7 +95,13 @@ import { ArrayBufferView } from "./arraybuffer";
     return !compareImpl(left, 0, right, 0, leftLength);
   }
 
-  @operator("!=") private static __ne(left: String | null, right: String | null): bool {
+  @operator.prefix("!")
+  private static __not(str: String): bool {
+    return str === null || !str.length;
+  }
+
+  @operator("!=")
+  private static __ne(left: String, right: String): bool {
     return !this.__eq(left, right);
   }
 

tests/compiler/number.optimized.wat

@@ -2358,7 +2358,7 @@
   if
    i32.const 0
    i32.const 1648
-   i32.const 191
+   i32.const 197
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/number.untouched.wat

@@ -3416,7 +3416,7 @@
   if
    i32.const 0
    i32.const 1648
-   i32.const 191
+   i32.const 197
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/array-access.optimized.wat

@@ -142,7 +142,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 166
+   i32.const 172
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/array-access.untouched.wat

@@ -218,7 +218,7 @@
   if
    i32.const 0
    i32.const 64
-   i32.const 166
+   i32.const 172
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/array.optimized.wat

@@ -6294,7 +6294,7 @@
   if
    i32.const 0
    i32.const 4376
-   i32.const 191
+   i32.const 197
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/array.untouched.wat

@@ -9713,7 +9713,7 @@
   if
    i32.const 0
    i32.const 4376
-   i32.const 191
+   i32.const 197
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/string-utf8.optimized.wat

@@ -1551,7 +1551,7 @@
       if
        i32.const 0
        i32.const 96
-       i32.const 449
+       i32.const 455
        i32.const 8
        call $~lib/env/abort
        unreachable
@@ -1598,7 +1598,7 @@
        if
         i32.const 0
         i32.const 96
-        i32.const 453
+        i32.const 459
         i32.const 8
         call $~lib/env/abort
         unreachable
@@ -1677,7 +1677,7 @@
        if
         i32.const 0
         i32.const 96
-        i32.const 465
+        i32.const 471
         i32.const 8
         call $~lib/env/abort
         unreachable
@@ -1732,7 +1732,7 @@
   if
    i32.const 0
    i32.const 96
-   i32.const 474
+   i32.const 480
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/string-utf8.untouched.wat

@@ -2033,7 +2033,7 @@
         if
          i32.const 0
          i32.const 96
-         i32.const 449
+         i32.const 455
          i32.const 8
          call $~lib/env/abort
          unreachable
@@ -2087,7 +2087,7 @@
          if
           i32.const 0
           i32.const 96
-          i32.const 453
+          i32.const 459
           i32.const 8
           call $~lib/env/abort
           unreachable
@@ -2182,7 +2182,7 @@
          if
           i32.const 0
           i32.const 96
-          i32.const 465
+          i32.const 471
           i32.const 8
           call $~lib/env/abort
           unreachable
@@ -2245,7 +2245,7 @@
   if
    i32.const 0
    i32.const 96
-   i32.const 474
+   i32.const 480
    i32.const 4
    call $~lib/env/abort
    unreachable

tests/compiler/std/string.ts

@@ -19,6 +19,10 @@ assert(changetype<usize>(str) == changetype<usize>("hi, I'm a string"));
 assert(str.length == 16);
 assert(str.charCodeAt(0) == 0x68);
 
+assert(!!"" == false);
+assert(!!"\0" == true);
+assert(!!"a" == true);
+
 assert(String.fromCharCode(0) == "\0");
 assert(String.fromCharCode(54) == "6");
 assert(String.fromCharCode(0x10000 + 54) == "6");

tests/compiler/wasi.optimized.wat

@@ -0,0 +1,25 @@
+(module
+ (type $FUNCSIG$vi (func (param i32)))
+ (type $FUNCSIG$v (func))
+ (memory $0 1)
+ (data (i32.const 8) "\01\00\00\00\0e")
+ (data (i32.const 24) "w\00a\00s\00i\00.\00t\00s")
+ (table $0 2 funcref)
+ (elem (i32.const 0) $null $~lib/string/String~traverse)
+ (global $wasi/sig (mut i32) (i32.const 1))
+ (global $~lib/capabilities i32 (i32.const 2))
+ (export "memory" (memory $0))
+ (export "table" (table $0))
+ (export ".capabilities" (global $~lib/capabilities))
+ (start $start)
+ (func $~lib/string/String~traverse (; 0 ;) (type $FUNCSIG$vi) (param $0 i32)
+  nop
+ )
+ (func $start (; 1 ;) (type $FUNCSIG$v)
+  i32.const 9
+  global.set $wasi/sig
+ )
+ (func $null (; 2 ;) (type $FUNCSIG$v)
+  nop
+ )
+)

tests/compiler/wasi.ts

@@ -0,0 +1,73 @@
+import { dirent, rwevent, fdstat, filestat, iovec, clocksubscription, fdsubscription, signal, dirprestat } from "bindings/wasi";
+
+const WASM32 = 1;
+const WASM64 = 2;
+
+assert(offsetof<dirent>("next") == 0);
+assert(offsetof<dirent>("ino") == 8);
+assert(offsetof<dirent>("namlen") == 16);
+assert(offsetof<dirent>("type") == 20);
+assert(offsetof<dirent>() == 24);
+
+assert(offsetof<rwevent>("userdata") == 0);
+assert(offsetof<rwevent>("error") == 8);
+assert(offsetof<rwevent>("type") == 10);
+assert(offsetof<rwevent>("nbytes") == 16);
+assert(offsetof<rwevent>("flags") == 24);
+assert(offsetof<rwevent>() == 32);
+
+assert(offsetof<fdstat>("filetype") == 0);
+assert(offsetof<fdstat>("flags") == 2);
+assert(offsetof<fdstat>("rights_base") == 8);
+assert(offsetof<fdstat>("rights_inheriting") == 16);
+assert(offsetof<fdstat>() == 24);
+
+assert(offsetof<filestat>("dev") == 0);
+assert(offsetof<filestat>("ino") == 8);
+assert(offsetof<filestat>("filetype") == 16);
+assert(offsetof<filestat>("nlink") == 20);
+assert(offsetof<filestat>("size") == 24);
+assert(offsetof<filestat>("atim") == 32);
+assert(offsetof<filestat>("mtim") == 40);
+assert(offsetof<filestat>("ctim") == 48);
+assert(offsetof<filestat>() == 56);
+
+assert(offsetof<iovec>("buf") == 0);
+if (ASC_TARGET == WASM32) {
+  assert(offsetof<iovec>("buf_len") == 4);
+  assert(offsetof<iovec>() == 8);
+} else if (ASC_TARGET == WASM64) {
+  assert(offsetof<iovec>("buf_len") == 8);
+  assert(offsetof<iovec>() == 16);
+} else {
+  assert(false);
+}
+
+assert(offsetof<clocksubscription>("userdata") == 0);
+assert(offsetof<clocksubscription>("type") == 8);
+assert(offsetof<clocksubscription>("identifier") == 16);
+assert(offsetof<clocksubscription>("clock_id") == 24);
+assert(offsetof<clocksubscription>("timeout") == 32);
+assert(offsetof<clocksubscription>("precision") == 40);
+assert(offsetof<clocksubscription>("flags") == 48);
+assert(offsetof<clocksubscription>() == 56);
+
+assert(offsetof<fdsubscription>("userdata") == 0);
+assert(offsetof<fdsubscription>("type") == 8);
+assert(offsetof<fdsubscription>("fd") == 16);
+assert(offsetof<fdsubscription>() == 20);
+
+assert(offsetof<dirprestat>("type") == 0);
+if (ASC_TARGET == WASM32) {
+  assert(offsetof<dirprestat>("name_len") == 4);
+  assert(offsetof<dirprestat>() == 8);
+} else if (ASC_TARGET == WASM64) {
+  assert(offsetof<dirprestat>("name_len") == 8);
+  assert(offsetof<dirprestat>() == 16);
+} else {
+  assert(false);
+}
+
+// check assignability of mimicked typed enums
+var sig: signal = signal.HUP;
+sig = signal.KILL;

tests/compiler/wasi.untouched.wat

@@ -0,0 +1,552 @@
+(module
+ (type $FUNCSIG$viiii (func (param i32 i32 i32 i32)))
+ (type $FUNCSIG$vi (func (param i32)))
+ (type $FUNCSIG$v (func))
+ (import "env" "abort" (func $~lib/env/abort (param i32 i32 i32 i32)))
+ (memory $0 1)
+ (data (i32.const 8) "\01\00\00\00\0e\00\00\00\00\00\00\00\00\00\00\00w\00a\00s\00i\00.\00t\00s\00")
+ (table $0 2 funcref)
+ (elem (i32.const 0) $null $~lib/string/String~traverse)
+ (global $wasi/WASM32 i32 (i32.const 1))
+ (global $wasi/WASM64 i32 (i32.const 2))
+ (global $~lib/ASC_TARGET i32 (i32.const 0))
+ (global $wasi/sig (mut i32) (i32.const 1))
+ (global $~lib/memory/HEAP_BASE i32 (i32.const 40))
+ (global $~lib/capabilities i32 (i32.const 2))
+ (export "memory" (memory $0))
+ (export "table" (table $0))
+ (export ".capabilities" (global $~lib/capabilities))
+ (start $start)
+ (func $~lib/string/String~traverse (; 1 ;) (type $FUNCSIG$vi) (param $0 i32)
+  (local $1 i32)
+ )
+ (func $start:wasi (; 2 ;) (type $FUNCSIG$v)
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 6
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 8
+  i32.const 8
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 7
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 16
+  i32.const 16
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 8
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 20
+  i32.const 20
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 9
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 24
+  i32.const 24
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 10
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 12
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 8
+  i32.const 8
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 13
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 10
+  i32.const 10
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 14
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 16
+  i32.const 16
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 15
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 24
+  i32.const 24
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 16
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 32
+  i32.const 32
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 17
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 19
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 2
+  i32.const 2
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 20
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 8
+  i32.const 8
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 21
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 16
+  i32.const 16
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 22
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 24
+  i32.const 24
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 23
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 25
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 8
+  i32.const 8
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 26
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 16
+  i32.const 16
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 27
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 20
+  i32.const 20
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 28
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 24
+  i32.const 24
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 29
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 32
+  i32.const 32
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 30
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 40
+  i32.const 40
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 31
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 48
+  i32.const 48
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 32
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 56
+  i32.const 56
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 33
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 35
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  block
+   i32.const 4
+   i32.const 4
+   i32.eq
+   i32.eqz
+   if
+    i32.const 0
+    i32.const 24
+    i32.const 37
+    i32.const 2
+    call $~lib/env/abort
+    unreachable
+   end
+   i32.const 8
+   i32.const 8
+   i32.eq
+   i32.eqz
+   if
+    i32.const 0
+    i32.const 24
+    i32.const 38
+    i32.const 2
+    call $~lib/env/abort
+    unreachable
+   end
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 46
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 8
+  i32.const 8
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 47
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 16
+  i32.const 16
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 48
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 24
+  i32.const 24
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 49
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 32
+  i32.const 32
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 50
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 40
+  i32.const 40
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 51
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 48
+  i32.const 48
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 52
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 56
+  i32.const 56
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 53
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 55
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 8
+  i32.const 8
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 56
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 16
+  i32.const 16
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 57
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 20
+  i32.const 20
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 58
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  i32.const 0
+  i32.const 0
+  i32.eq
+  i32.eqz
+  if
+   i32.const 0
+   i32.const 24
+   i32.const 60
+   i32.const 0
+   call $~lib/env/abort
+   unreachable
+  end
+  block
+   i32.const 4
+   i32.const 4
+   i32.eq
+   i32.eqz
+   if
+    i32.const 0
+    i32.const 24
+    i32.const 62
+    i32.const 2
+    call $~lib/env/abort
+    unreachable
+   end
+   i32.const 8
+   i32.const 8
+   i32.eq
+   i32.eqz
+   if
+    i32.const 0
+    i32.const 24
+    i32.const 63
+    i32.const 2
+    call $~lib/env/abort
+    unreachable
+   end
+  end
+  i32.const 9
+  global.set $wasi/sig
+ )
+ (func $start (; 3 ;) (type $FUNCSIG$v)
+  call $start:wasi
+ )
+ (func $null (; 4 ;) (type $FUNCSIG$v)
+ )
+)