feedback

Author: sbc100

src/parser/context-decls.cpp

@@ -84,7 +84,7 @@ Result<Table*> ParseDeclsCtx::addTableDecl(Index pos,
                                            ImportNames* importNames,
                                            TableType type) {
   auto t = std::make_unique<Table>();
-  t->indexType = type.type;
+  t->indexType = type.indexType;
   t->initial = type.limits.initial;
   t->max = type.limits.max ? *type.limits.max : Table::kUnlimitedSize;
   if (name.is()) {
@@ -139,7 +139,7 @@ Result<Memory*> ParseDeclsCtx::addMemoryDecl(Index pos,
                                              ImportNames* importNames,
                                              MemType type) {
   auto m = std::make_unique<Memory>();
-  m->indexType = type.type;
+  m->indexType = type.indexType;
   m->initial = type.limits.initial;
   m->max = type.limits.max ? *type.limits.max : Memory::kUnlimitedSize;
   m->shared = type.shared;

src/parser/contexts.h

@@ -46,7 +46,7 @@ struct Limits {
 };
 
 struct MemType {
-  Type type;
+  Type indexType;
   Limits limits;
   bool shared;
 };
@@ -57,7 +57,7 @@ struct Memarg {
 };
 
 struct TableType {
-  Type type;
+  Type indexType;
   Limits limits;
 };
 
@@ -947,7 +947,9 @@ struct ParseDeclsCtx : NullTypeParserCtx, NullInstrParserCtx {
 
   Limits getLimitsFromElems(Index elems) { return {elems, elems}; }
 
-  TableType makeTableType(Type type, Limits limits, TypeT) { return {type, limits}; }
+  TableType makeTableType(Type indexType, Limits limits, TypeT) {
+    return {indexType, limits};
+  }
 
   std::vector<char> makeDataString() { return {}; }
   void appendDataString(std::vector<char>& data, std::string_view str) {
@@ -959,8 +961,8 @@ struct ParseDeclsCtx : NullTypeParserCtx, NullInstrParserCtx {
     return {size, size};
   }
 
-  MemType makeMemType(Type type, Limits limits, bool shared) {
-    return {type, limits, shared};
+  MemType makeMemType(Type indexType, Limits limits, bool shared) {
+    return {indexType, limits, shared};
   }
 
   Result<TypeUseT>
@@ -980,8 +982,10 @@ struct ParseDeclsCtx : NullTypeParserCtx, NullInstrParserCtx {
                    std::vector<Annotation>&&,
                    Index pos);
 
-  Result<Table*>
-  addTableDecl(Index pos, Name name, ImportNames* importNames, TableType limits);
+  Result<Table*> addTableDecl(Index pos,
+                              Name name,
+                              ImportNames* importNames,
+                              TableType limits);
   Result<>
   addTable(Name, const std::vector<Name>&, ImportNames*, TableType, Index);
 

src/parser/parsers.h

@@ -817,7 +817,7 @@ Result<typename Ctx::MemTypeT> memtypeContinued(Ctx& ctx, Type indexType) {
   return ctx.makeMemType(indexType, *limits, shared);
 }
 
-// tabletype ::= limits32 reftype
+// tabletype ::= (limits32 | 'i32' limits32 | 'i64' limit64) reftype
 template<typename Ctx> Result<typename Ctx::TableTypeT> tabletype(Ctx& ctx) {
   Type indexType = Type::i32;
   if (ctx.in.takeKeyword("i64"sv)) {
@@ -828,7 +828,6 @@ template<typename Ctx> Result<typename Ctx::TableTypeT> tabletype(Ctx& ctx) {
   return tabletypeContinued(ctx, indexType);
 }
 
-// tabletype ::= limits32 reftype
 template<typename Ctx>
 Result<typename Ctx::TableTypeT> tabletypeContinued(Ctx& ctx, Type indexType) {
   auto limits = indexType == Type::i32 ? limits32(ctx) : limits64(ctx);
@@ -3064,8 +3063,8 @@ template<typename Ctx> MaybeResult<> func(Ctx& ctx) {
 }
 
 // table ::= '(' 'table' id? ('(' 'export' name ')')*
-//               '(' 'import' mod:name nm:name ')'? tabletype ')'
-//         | '(' 'table' id? ('(' 'export' name ')')*
+//               '(' 'import' mod:name nm:name ')'? index_type? tabletype ')'
+//         | '(' 'table' id? ('(' 'export' name ')')* index_type?
 //               reftype '(' 'elem' (elemexpr* | funcidx*) ')' ')'
 template<typename Ctx> MaybeResult<> table(Ctx& ctx) {
   auto pos = ctx.in.getPos();
@@ -3146,10 +3145,10 @@ template<typename Ctx> MaybeResult<> table(Ctx& ctx) {
   return Ok{};
 }
 
-// mem ::= '(' 'memory' id? ('(' 'export' name ')')* index_type?
-//             ('(' 'data' b:datastring ')' | memtype) ')'
-//       | '(' 'memory' id? ('(' 'export' name ')')*
-//             '(' 'import' mod:name nm:name ')' memtype ')'
+// memory ::= '(' 'memory' id? ('(' 'export' name ')')* index_type?
+//                ('(' 'data' b:datastring ')' | memtype) ')'
+//          | '(' 'memory' id? ('(' 'export' name ')')*
+//                '(' 'import' mod:name nm:name ')' index_type? memtype ')'
 template<typename Ctx> MaybeResult<> memory(Ctx& ctx) {
   auto pos = ctx.in.getPos();
   if (!ctx.in.takeSExprStart("memory"sv)) {

src/wasm/wasm-validator.cpp

@@ -949,12 +949,17 @@ void FunctionValidator::visitCallIndirect(CallIndirect* curr) {
   validateReturnCall(curr);
 
   auto* table = getModule()->getTableOrNull(curr->table);
+  if (!shouldBeTrue(!!table, curr, "call-indirect table must exist")) {
+    return;
+  }
+  std::cerr << "got table " << table << "\n";
+  std::cerr << table->indexType << "\n";
 
   shouldBeEqualOrFirstIsUnreachable(
     curr->target->type,
     table->indexType,
     curr,
-    "indirect call target must match the table index type");
+    "call-indirect call target must match the table index type");
 
   if (curr->target->type != Type::unreachable) {
     auto* table = getModule()->getTableOrNull(curr->table);

test/example/c-api-kitchen-sink.c

@@ -1603,8 +1603,9 @@ void test_core() {
 
 void test_unreachable() {
   BinaryenModuleRef module = BinaryenModuleCreate();
+  BinaryenAddTable(module, "tab", 0, 100, BinaryenTypeFuncref());
   BinaryenExpressionRef body = BinaryenCallIndirect(module,
-                                                    "invalid-table",
+                                                    "tab",
                                                     BinaryenUnreachable(module),
                                                     NULL,
                                                     0,

test/example/c-api-kitchen-sink.txt

@@ -2608,6 +2608,7 @@ BinaryenFeatureAll: 131071
 (module
  (type $0 (func (result i32)))
  (type $1 (func (result i64)))
+ (table $tab 0 100 funcref)
  (func $unreachable-fn (result i32)
   (call_indirect (type $1)
    (unreachable)