fix bug with fully evaluated ctors

Author: tlively

src/tools/wasm-ctor-eval.cpp

@@ -1179,14 +1179,14 @@ EvalCtorOutcome evalCtor(EvallingModuleRunner& instance,
       }
     }
 
-    // If we have return-called to a different function, have precomputed values
-    // for the current return-called function (even if it is the same as the
-    // original function), or have partially computed the current function, then
-    // we can replace the export with a new function that does less work than
-    // the original.
-    if (func->name != funcName ||
-        (localExprs.size() && func->getParams() != Type::none) ||
-        (successes > 0 && successes < block->list.size())) {
+    // If we have not fully evaluated the current function, but we have
+    // evaluated part of it, have return-called to a different function, or have
+    // precomputed values for the current return-called function, then we can
+    // replace the export with a new function that does less work than the
+    // original.
+    if ((func->imported() || successes < block->list.size()) &&
+        (successes > 0 || func->name != funcName ||
+         (localExprs.size() && func->getParams() != Type::none))) {
       auto originalFuncType = wasm.getFunction(funcName)->type;
       auto copyName = Names::getValidFunctionName(wasm, funcName);
       wasm.getExport(exportName)->value = copyName;

test/lit/ctor-eval/return_call.wast

@@ -1,6 +1,25 @@
 ;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.
 ;; RUN: foreach %s %t wasm-ctor-eval --ctors=test --kept-exports=test --ignore-external-input --quiet -all -g -S -o - | filecheck %s
 
+(module
+  ;; Simplest possible return call.
+
+  (func $test (export "test") (result i32)
+    (return_call $test2)
+  )
+
+  (func $test2 (result i32)
+    (i32.const 42)
+  )
+)
+
+;; CHECK:      (type $0 (func (result i32)))
+
+;; CHECK:      (export "test" (func $test_2))
+
+;; CHECK:      (func $test_2 (type $0) (result i32)
+;; CHECK-NEXT:  (i32.const 42)
+;; CHECK-NEXT: )
 (module
   ;; Basic return call (followed by unreachable import call, setting global as proof it was executed)
 
@@ -34,9 +53,9 @@
 
 ;; CHECK:      (export "g2" (global $g2))
 
-;; CHECK:      (export "test" (func $test_3_4))
+;; CHECK:      (export "test" (func $test_3))
 
-;; CHECK:      (func $test_3_4 (type $0)
+;; CHECK:      (func $test_3 (type $0)
 ;; CHECK-NEXT:  (nop)
 ;; CHECK-NEXT: )
 (module
@@ -129,9 +148,9 @@
 
 ;; CHECK:      (export "g2" (global $g2))
 
-;; CHECK:      (export "test" (func $test_3_4))
+;; CHECK:      (export "test" (func $test_3))
 
-;; CHECK:      (func $test_3_4 (type $f)
+;; CHECK:      (func $test_3 (type $f)
 ;; CHECK-NEXT:  (nop)
 ;; CHECK-NEXT: )
 (module