[decompiler] fixed blocks with params. (#1497)

It would previously assume the blocktype is "simple" (at most a single result value), but now also supports function signatures.
Also fixed it ignoring the validator result.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/tools/wasm-decompile.cc b/src/tools/wasm-decompile.cc
index 62e69d45..74491e55 100644
--- a/src/tools/wasm-decompile.cc
+++ b/src/tools/wasm-decompile.cc
@@ -83,15 +83,17 @@ int ProgramMain(int argc, char** argv) {
     result = ReadBinaryIr(infile.c_str(), file_data.data(), file_data.size(),
                           options, &errors, &module);
     if (Succeeded(result)) {
+      ValidateOptions options(features);
+      result = ValidateModule(&module, &errors, options);
       if (Succeeded(result)) {
-        ValidateOptions options(features);
-        result = ValidateModule(&module, &errors, options);
+        result = GenerateNames(&module,
+                               static_cast<NameOpts>(NameOpts::AlphaNames));
+      }
+      if (Succeeded(result)) {
+        // Must be called after ReadBinaryIr & GenerateNames, and before
+        // ApplyNames, see comments at definition.
+        RenameAll(module);
       }
-      result = GenerateNames(&module,
-                             static_cast<NameOpts>(NameOpts::AlphaNames));
-      // Must be called after ReadBinaryIr & GenerateNames, and before
-      // ApplyNames, see comments at definition.
-      RenameAll(module);
       if (Succeeded(result)) {
         /* TODO(binji): This shouldn't fail; if a name can't be applied
          * (because the index is invalid, say) it should just be skipped. */