1 files changed, 129 insertions, 21 deletions
diff --git a/test/lit/passes/string-lowering-instructions.wast b/test/lit/passes/string-lowering-instructions.wast
index 05d555ef0..8d0094231 100644
--- a/test/lit/passes/string-lowering-instructions.wast
+++ b/test/lit/passes/string-lowering-instructions.wast
@@ -3,28 +3,60 @@
 ;; RUN: foreach %s %t wasm-opt --string-lowering  -all -S -o - | filecheck %s
 
 (module
-  ;; CHECK:      (type $0 (func))
-
   ;; CHECK:      (type $array16 (array (mut i16)))
   (type $array16 (array (mut i16)))
 
+  ;; CHECK:      (type $1 (func (param externref externref) (result i32)))
+
   ;; CHECK:      (rec
-  ;; CHECK-NEXT:  (type $2 (func (param (ref $array16))))
+  ;; CHECK-NEXT:  (type $2 (func (param externref) (result externref)))
+
+  ;; CHECK:       (type $3 (func (param externref) (result i32)))
+
+  ;; CHECK:       (type $4 (func (param externref externref) (result i32)))
+
+  ;; CHECK:       (type $5 (func (param externref (ref $array16)) (result i32)))
+
+  ;; CHECK:       (type $6 (func (result externref)))
+
+  ;; CHECK:       (type $7 (func (param (ref $array16))))
 
-  ;; CHECK:       (type $3 (func (param externref externref externref externref)))
+  ;; CHECK:       (type $8 (func (param externref externref externref externref)))
 
-  ;; CHECK:      (type $4 (func (param (ref null $array16) i32 i32) (result (ref extern))))
+  ;; CHECK:      (type $9 (func))
 
-  ;; CHECK:      (type $5 (func (param i32) (result (ref extern))))
+  ;; CHECK:      (type $10 (func (param (ref null $array16) i32 i32) (result (ref extern))))
 
-  ;; CHECK:      (import "colliding" "name" (func $fromCodePoint (type $0)))
+  ;; CHECK:      (type $11 (func (param i32) (result (ref extern))))
+
+  ;; CHECK:      (type $12 (func (param externref (ref null $array16) i32) (result i32)))
+
+  ;; CHECK:      (type $13 (func (param externref) (result i32)))
+
+  ;; CHECK:      (type $14 (func (param externref i32) (result i32)))
+
+  ;; CHECK:      (type $15 (func (param externref i32 i32) (result (ref extern))))
+
+  ;; CHECK:      (import "colliding" "name" (func $fromCodePoint (type $9)))
   (import "colliding" "name" (func $fromCodePoint))
 
-  ;; CHECK:      (import "wasm:js-string" "fromCharCodeArray" (func $fromCharCodeArray (type $4) (param (ref null $array16) i32 i32) (result (ref extern))))
+  ;; CHECK:      (import "wasm:js-string" "fromCharCodeArray" (func $fromCharCodeArray (type $10) (param (ref null $array16) i32 i32) (result (ref extern))))
+
+  ;; CHECK:      (import "wasm:js-string" "fromCodePoint" (func $fromCodePoint_11 (type $11) (param i32) (result (ref extern))))
+
+  ;; CHECK:      (import "wasm:js-string" "intoCharCodeArray" (func $intoCharCodeArray (type $12) (param externref (ref null $array16) i32) (result i32)))
 
-  ;; CHECK:      (import "wasm:js-string" "fromCodePoint" (func $fromCodePoint_5 (type $5) (param i32) (result (ref extern))))
+  ;; CHECK:      (import "wasm:js-string" "equals" (func $equals (type $1) (param externref externref) (result i32)))
 
-  ;; CHECK:      (func $string.as (type $3) (param $a externref) (param $b externref) (param $c externref) (param $d externref)
+  ;; CHECK:      (import "wasm:js-string" "compare" (func $compare (type $1) (param externref externref) (result i32)))
+
+  ;; CHECK:      (import "wasm:js-string" "length" (func $length (type $13) (param externref) (result i32)))
+
+  ;; CHECK:      (import "wasm:js-string" "codePointAt" (func $codePointAt (type $14) (param externref i32) (result i32)))
+
+  ;; CHECK:      (import "wasm:js-string" "substring" (func $substring (type $15) (param externref i32 i32) (result (ref extern))))
+
+  ;; CHECK:      (func $string.as (type $8) (param $a externref) (param $b externref) (param $c externref) (param $d externref)
   ;; CHECK-NEXT:  (local.set $b
   ;; CHECK-NEXT:   (local.get $a)
   ;; CHECK-NEXT:  )
@@ -59,7 +91,7 @@
     )
   )
 
-  ;; CHECK:      (func $string.new.gc (type $2) (param $array16 (ref $array16))
+  ;; CHECK:      (func $string.new.gc (type $7) (param $array16 (ref $array16))
   ;; CHECK-NEXT:  (drop
   ;; CHECK-NEXT:   (call $fromCharCodeArray
   ;; CHECK-NEXT:    (local.get $array16)
@@ -78,18 +110,94 @@
     )
   )
 
-  ;; CHECK:      (func $string.from_code_point (type $0)
-  ;; CHECK-NEXT:  (drop
-  ;; CHECK-NEXT:   (call $fromCodePoint_5
-  ;; CHECK-NEXT:    (i32.const 1)
-  ;; CHECK-NEXT:   )
+  ;; CHECK:      (func $string.from_code_point (type $6) (result externref)
+  ;; CHECK-NEXT:  (call $fromCodePoint_11
+  ;; CHECK-NEXT:   (i32.const 1)
   ;; CHECK-NEXT:  )
   ;; CHECK-NEXT: )
-  (func $string.from_code_point
-    (drop
-      (string.from_code_point
-        (i32.const 1)
-      )
+  (func $string.from_code_point (result stringref)
+    (string.from_code_point
+      (i32.const 1)
+    )
+  )
+
+  ;; CHECK:      (func $string.encode (type $5) (param $ref externref) (param $array16 (ref $array16)) (result i32)
+  ;; CHECK-NEXT:  (call $intoCharCodeArray
+  ;; CHECK-NEXT:   (local.get $ref)
+  ;; CHECK-NEXT:   (local.get $array16)
+  ;; CHECK-NEXT:   (i32.const 10)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $string.encode (param $ref stringref) (param $array16 (ref $array16)) (result i32)
+    (string.encode_wtf16_array
+      (local.get $ref)
+      (local.get $array16)
+      (i32.const 10)
+    )
+  )
+
+  ;; CHECK:      (func $string.eq (type $4) (param $a externref) (param $b externref) (result i32)
+  ;; CHECK-NEXT:  (call $equals
+  ;; CHECK-NEXT:   (local.get $a)
+  ;; CHECK-NEXT:   (local.get $b)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $string.eq (param $a stringref) (param $b stringref) (result i32)
+    (string.eq
+      (local.get $a)
+      (local.get $b)
+    )
+  )
+
+  ;; CHECK:      (func $string.compare (type $4) (param $a externref) (param $b externref) (result i32)
+  ;; CHECK-NEXT:  (call $compare
+  ;; CHECK-NEXT:   (local.get $a)
+  ;; CHECK-NEXT:   (local.get $b)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $string.compare (param $a stringref) (param $b stringref) (result i32)
+    (string.compare
+      (local.get $a)
+      (local.get $b)
+    )
+  )
+
+  ;; CHECK:      (func $string.length (type $3) (param $ref externref) (result i32)
+  ;; CHECK-NEXT:  (call $length
+  ;; CHECK-NEXT:   (local.get $ref)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $string.length (param $ref stringview_wtf16) (result i32)
+    (stringview_wtf16.length
+      (local.get $ref)
+    )
+  )
+
+  ;; CHECK:      (func $string.get_codeunit (type $3) (param $ref externref) (result i32)
+  ;; CHECK-NEXT:  (call $codePointAt
+  ;; CHECK-NEXT:   (local.get $ref)
+  ;; CHECK-NEXT:   (i32.const 2)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $string.get_codeunit (param $ref stringview_wtf16) (result i32)
+    (stringview_wtf16.get_codeunit
+      (local.get $ref)
+      (i32.const 2)
+    )
+  )
+
+  ;; CHECK:      (func $string.slice (type $2) (param $ref externref) (result externref)
+  ;; CHECK-NEXT:  (call $substring
+  ;; CHECK-NEXT:   (local.get $ref)
+  ;; CHECK-NEXT:   (i32.const 2)
+  ;; CHECK-NEXT:   (i32.const 3)
+  ;; CHECK-NEXT:  )
+  ;; CHECK-NEXT: )
+  (func $string.slice (param $ref stringview_wtf16) (result stringref)
+    (stringview_wtf16.slice
+      (local.get $ref)
+      (i32.const 2)
+      (i32.const 3)
     )
   )
 )