[wasm] Experimental: Add support for multiple non-homogeneous tables

src/wasm/ast-decoder.cc

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/signature.h"
 
 #include "src/bit-vector.h"
 #include "src/flags.h"
 #include "src/handles.h"
 #include "src/zone-containers.h"
@@ skipping 129 matching lines @@
         return false;
       }
       return true;
     }
     error(pc, pc + 1, "invalid function index");
     return false;
   }
 
   inline bool Complete(const byte* pc, CallIndirectOperand& operand) {
     ModuleEnv* m = module_;
-    if (m && m->module && operand.index < m->module->signatures.size()) {
-      operand.sig = m->module->signatures[operand.index];
+    if (m && m->module && operand.sig_index < m->module->signatures.size() &&
+        operand.table_index < m->module->function_tables.size()) {
+      operand.sig = m->module->signatures[operand.sig_index];
+      operand.table =
+          m->module->signatures[m->module->function_tables[operand.table_index]
+                                    .sig_index];
       return true;
     }
     return false;
   }
 
   inline bool Validate(const byte* pc, CallIndirectOperand& operand) {
     if (Complete(pc, operand)) {
       uint32_t expected = static_cast<uint32_t>(operand.sig->parameter_count());
+      uint32_t table_sig =
+          module_->module->function_tables[operand.table_index].sig_index;
       if (operand.arity != expected) {
         error(pc, pc + 1,
               "arity mismatch in indirect function call (expected %u, got %u)",
               expected, operand.arity);
         return false;
+      } else if (!isAnyFuncType(operand.table) &&
+                 operand.sig_index != table_sig) {
+        error(pc, pc + 1,
+              "signature mismatch in indirect function call (expected %u, got "
+              "%u)",
+              operand.sig_index, table_sig);
       }
       return true;
     }
     error(pc, pc + 1, "invalid signature index");
     return false;
   }
 
   inline bool Complete(const byte* pc, CallImportOperand& operand) {
     ModuleEnv* m = module_;
     if (m && m->module && operand.index < m->module->import_table.size()) {
@@ skipping 795 matching lines @@
             }
             len = 1 + operand.length;
             break;
           }
           case kExprCallIndirect: {
             CallIndirectOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
               TFNode** buffer = PopArgs(operand.sig);
               Value index = Pop(0, kAstI32);
               if (buffer) buffer[0] = index.node;
-              TFNode* call =
-                  BUILD(CallIndirect, operand.index, buffer, position());
+              TFNode* call = BUILD(CallIndirect, operand.sig_index,
+                                   operand.table_index, buffer, position());
               Push(GetReturnType(operand.sig), call);
             }
             len = 1 + operand.length;
             break;
           }
           case kExprCallImport: {
             CallImportOperand operand(this, pc_);
             if (Validate(pc_, operand)) {
               TFNode** buffer = PopArgs(operand.sig);
               TFNode* call =
@@ skipping 616 matching lines @@
       }
       case kExprBrTable: {
         BranchTableOperand operand(&i, i.pc());
         os << "   // arity=" << operand.arity
            << " entries=" << operand.table_count;
         break;
       }
       case kExprCallIndirect: {
         CallIndirectOperand operand(&i, i.pc());
         if (decoder.Complete(i.pc(), operand)) {
-          os << "   // sig #" << operand.index << ": " << *operand.sig;
+          os << "   // sig #" << operand.sig_index << ": " << *operand.sig
+             << ", table # " << operand.table_index;
         } else {
-          os << " // arity=" << operand.arity << " sig #" << operand.index;
+          os << " // arity=" << operand.arity << " sig #" << operand.sig_index
+             << "table # " << operand.table_index;
         }
         break;
       }
       case kExprCallImport: {
         CallImportOperand operand(&i, i.pc());
         if (decoder.Complete(i.pc(), operand)) {
           os << "   // import #" << operand.index << ": " << *operand.sig;
         } else {
           os << " // arity=" << operand.arity << " import #" << operand.index;
         }
@@ skipping 26 matching lines @@
 BitVector* AnalyzeLoopAssignmentForTesting(Zone* zone, size_t num_locals,
                                            const byte* start, const byte* end) {
   FunctionBody body = {nullptr, nullptr, nullptr, start, end};
   WasmFullDecoder decoder(zone, nullptr, body);
   return decoder.AnalyzeLoopAssignmentForTesting(start, num_locals);
 }
 
 }  // namespace wasm
 }  // namespace internal
 }  // namespace v8