[ctor-eval] Eval functions with a return value (#4443)

This is necessary for e.g. main() which returns an i32.

3 files changed, 97 insertions, 12 deletions

diff --git a/test/ctor-eval/results.wast b/test/ctor-eval/results.wast
index a01904149..bbc48db3c 100644
--- a/test/ctor-eval/results.wast
+++ b/test/ctor-eval/results.wast
@@ -1,7 +1,11 @@
 (module
+  (import "import" "import" (func $import))
+
   (global $global1 (mut i32) (i32.const 1))
   (global $global2 (mut i32) (i32.const 2))
   (global $global3 (mut i32) (i32.const 3))
+  (global $global4 (mut i32) (i32.const 4))
+  (global $global5 (mut i32) (i32.const 5))
 
   (func $test1 (export "test1")
     ;; This function can be evalled. But in this test we keep this export,
@@ -24,14 +28,41 @@
   )
 
   (func $test3 (export "test3") (result i32)
-    ;; The presence of a result stops us from evalling this function (at least
-    ;; for now). Not even the global set will be evalled.
+    ;; The global.set can be evalled. We must then keep returning the 42.
     (global.set $global3
       (i32.const 13)
     )
     (i32.const 42)
   )
 
+  (func $test4 (export "test4") (result i32)
+    ;; Similar to the above, but not in a toplevel block format that we can
+    ;; eval one item at a time. We will eval this entire function at once, and
+    ;; we should succeed. After that we should keep returning the constant 55
+    (if (result i32)
+      (i32.const 1)
+      (block (result i32)
+        (global.set $global4
+          (i32.const 14)
+        )
+        (i32.const 55)
+      )
+      (i32.const 99)
+    )
+  )
+
+  (func $test5 (export "test5") (result i32)
+    ;; Tests partial evalling with a return value at the end. We never reach
+    ;; that return value, but we should eval the global.set.
+    (global.set $global5
+      (i32.const 15)
+    )
+
+    (call $import)
+
+    (i32.const 100)
+  )
+
   (func "keepalive" (result i32)
     ;; Keep everything alive to see the changes.
 
@@ -43,12 +74,27 @@
     (drop
       (call $test3)
     )
+    (drop
+      (call $test4)
+    )
+    (drop
+      (call $test5)
+    )
 
     ;; Keeping these alive should show the changes to the globals (that should
     ;; contain 11, 12, and 3).
     (i32.add
-      (global.get $global1)
-      (global.get $global2)
+      (i32.add
+        (global.get $global1)
+        (global.get $global2)
+      )
+      (i32.add
+        (global.get $global3)
+        (i32.add
+          (global.get $global4)
+          (global.get $global5)
+        )
+      )
     )
   )
 )
diff --git a/test/ctor-eval/results.wast.ctors b/test/ctor-eval/results.wast.ctors
index c7060ede5..94f950267 100644
--- a/test/ctor-eval/results.wast.ctors
+++ b/test/ctor-eval/results.wast.ctors
@@ -1 +1 @@
-test1,test2,test3
+test1,test2,test3,test4,test5
diff --git a/test/ctor-eval/results.wast.out b/test/ctor-eval/results.wast.out
index b4c947eb7..ae5172324 100644
--- a/test/ctor-eval/results.wast.out
+++ b/test/ctor-eval/results.wast.out
@@ -1,12 +1,16 @@
 (module
- (type $none_=>_none (func))
  (type $none_=>_i32 (func (result i32)))
+ (type $none_=>_none (func))
+ (import "import" "import" (func $import))
  (global $global1 (mut i32) (i32.const 11))
  (global $global2 (mut i32) (i32.const 12))
- (global $global3 (mut i32) (i32.const 3))
+ (global $global3 (mut i32) (i32.const 13))
+ (global $global4 (mut i32) (i32.const 14))
+ (global $global5 (mut i32) (i32.const 15))
  (export "test1" (func $test1_0))
- (export "test3" (func $test3))
- (export "keepalive" (func $3))
+ (export "test3" (func $test3_0))
+ (export "test5" (func $test5_0))
+ (export "keepalive" (func $5))
  (func $test1
   (global.set $global1
    (i32.const 11)
@@ -23,18 +27,53 @@
   )
   (i32.const 42)
  )
- (func $3 (result i32)
+ (func $test4 (result i32)
+  (global.set $global4
+   (i32.const 14)
+  )
+  (i32.const 55)
+ )
+ (func $test5 (result i32)
+  (global.set $global5
+   (i32.const 15)
+  )
+  (call $import)
+  (i32.const 100)
+ )
+ (func $5 (result i32)
   (call $test1)
   (call $test2)
   (drop
    (call $test3)
   )
+  (drop
+   (call $test4)
+  )
+  (drop
+   (call $test5)
+  )
   (i32.add
-   (global.get $global1)
-   (global.get $global2)
+   (i32.add
+    (global.get $global1)
+    (global.get $global2)
+   )
+   (i32.add
+    (global.get $global3)
+    (i32.add
+     (global.get $global4)
+     (global.get $global5)
+    )
+   )
   )
  )
  (func $test1_0
   (nop)
  )
+ (func $test3_0 (result i32)
+  (i32.const 42)
+ )
+ (func $test5_0 (result i32)
+  (call $import)
+  (i32.const 100)
+ )
 )