Always do a full roundtrip in run-roundtrip.py (#1661)

Even when the result is to be printed rather than compared byte for byte
with the first version its still good to process the resulting wat
output file so that we know we can parse what we generate.

Case in point, this changed caused me to fix two latent bugs:

1. We were not correctly parsing events with inline import/export.
2. We were output element segment names even when bulk memory
   was not enabled (See #1651)

The fix for (2) is a little more involved that we might like since for
the first time the wat writer needs to know what features are enabled.

Fixes: #1651

1 files changed, 8 insertions, 3 deletions

diff --git a/src/wast-parser.cc b/src/wast-parser.cc
index e9c0687e..de754ea1 100644
--- a/src/wast-parser.cc
+++ b/src/wast-parser.cc
@@ -1351,6 +1351,8 @@ Result WastParser::ParseTagModuleField(Module* module) {
   }
   EXPECT(Lpar);
   EXPECT(Tag);
+  Location loc = GetLocation();
+
   std::string name;
   ParseBindVarOpt(&name);
 
@@ -1360,20 +1362,23 @@ Result WastParser::ParseTagModuleField(Module* module) {
   if (PeekMatchLpar(TokenType::Import)) {
     CheckImportOrdering(module);
     auto import = std::make_unique<TagImport>(name);
+    Tag& tag = import->tag;
     CHECK_RESULT(ParseInlineImport(import.get()));
-    CHECK_RESULT(ParseTypeUseOpt(&import->tag.decl));
-    CHECK_RESULT(ParseUnboundFuncSignature(&import->tag.decl.sig));
+    CHECK_RESULT(ParseTypeUseOpt(&tag.decl));
+    CHECK_RESULT(ParseUnboundFuncSignature(&tag.decl.sig));
+    CHECK_RESULT(ErrorIfLpar({"type", "param", "result"}));
     auto field =
         std::make_unique<ImportModuleField>(std::move(import), GetLocation());
     module->AppendField(std::move(field));
   } else {
-    auto field = std::make_unique<TagModuleField>(GetLocation(), name);
+    auto field = std::make_unique<TagModuleField>(loc, name);
     CHECK_RESULT(ParseTypeUseOpt(&field->tag.decl));
     CHECK_RESULT(ParseUnboundFuncSignature(&field->tag.decl.sig));
     module->AppendField(std::move(field));
   }
 
   AppendInlineExportFields(module, &export_fields, module->tags.size() - 1);
+
   EXPECT(Rpar);
   return Result::Ok;
 }