Revert "[WebAssembly] Update WebAssemblyAsmTypeCheck for table.get"

This reverts commit 6b2482f6f4729a76776a48ac3b4a3fcd401a880e due to
test failures on AArch64 bots:
https://lab.llvm.org/buildbot/#/builders/183/builds/3684

diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
index 3eb74c1..128ce5c 100644 (file)
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.cpp
@@ -182,20 +182,6 @@ bool WebAssemblyAsmTypeCheck::getGlobal(SMLoc ErrorLoc, const MCInst &Inst,
   return false;
 }
 
-bool WebAssemblyAsmTypeCheck::getTable(SMLoc ErrorLoc, const MCInst &Inst,
-                                       wasm::ValType &Type) {
-  const MCSymbolRefExpr *SymRef;
-  if (getSymRef(ErrorLoc, Inst, SymRef))
-    return true;
-  auto WasmSym = cast<MCSymbolWasm>(&SymRef->getSymbol());
-  if (WasmSym->getType().getValueOr(wasm::WASM_SYMBOL_TYPE_DATA) !=
-      wasm::WASM_SYMBOL_TYPE_TABLE)
-    return typeError(ErrorLoc, StringRef("symbol ") + WasmSym->getName() +
-                                   " missing .tabletype");
-  Type = static_cast<wasm::ValType>(WasmSym->getTableType().ElemType);
-  return false;
-}
-
 bool WebAssemblyAsmTypeCheck::endOfFunction(SMLoc ErrorLoc) {
   // Check the return types.
   for (auto RVT : llvm::reverse(ReturnTypes)) {
@@ -239,19 +225,6 @@ bool WebAssemblyAsmTypeCheck::typeCheck(SMLoc ErrorLoc, const MCInst &Inst) {
       return true;
     if (popType(ErrorLoc, Type))
       return true;
-  } else if (Name == "table.get") {
-    if (getTable(ErrorLoc, Inst, Type))
-      return true;
-    if (popType(ErrorLoc, wasm::ValType::I32))
-      return true;
-    Stack.push_back(Type);
-  } else if (Name == "table.set") {
-    if (getTable(ErrorLoc, Inst, Type))
-      return true;
-    if (popType(ErrorLoc, Type))
-      return true;
-    if (popType(ErrorLoc, wasm::ValType::I32))
-      return true;
   } else if (Name == "drop") {
     if (popType(ErrorLoc, {}))
       return true;

diff --git a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.h b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.h
index a186762..2b07faf 100644 (file)
--- a/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.h
+++ b/llvm/lib/Target/WebAssembly/AsmParser/WebAssemblyAsmTypeCheck.h
@@ -44,7 +44,6 @@ class WebAssemblyAsmTypeCheck final {
   bool getSymRef(SMLoc ErrorLoc, const MCInst &Inst,
                  const MCSymbolRefExpr *&SymRef);
   bool getGlobal(SMLoc ErrorLoc, const MCInst &Inst, wasm::ValType &Type);
-  bool getTable(SMLoc ErrorLoc, const MCInst &Inst, wasm::ValType &Type);
 
 public:
   WebAssemblyAsmTypeCheck(MCAsmParser &Parser, const MCInstrInfo &MII, bool is64);

diff --git a/llvm/test/MC/WebAssembly/funcref-from-table.s b/llvm/test/MC/WebAssembly/funcref-from-table.s
deleted file mode 100644 (file)
index 39581f5..0000000
--- a/llvm/test/MC/WebAssembly/funcref-from-table.s
+++ /dev/null
@@ -1,23 +0,0 @@
-# RUN: llvm-mc -mattr=+reference-types -triple=wasm32-unknown-unknown -filetype=obj -o %t.o %s
-# RUN: wasm-ld --no-entry --export obtain_funcref_from_table_index %t.o -o %t.wasm
-# RUN: obj2yaml %t.wasm | FileCheck %s
-
-.globl __indirect_function_table
-.tabletype __indirect_function_table, funcref
-
-.globl obtain_funcref_from_table_index
-
-obtain_funcref_from_table_index:
-  .functype obtain_funcref_from_table_index(i32) -> (funcref)
-  local.get 0
-  table.get __indirect_function_table
-  end_function
-
-#      CHECK:  Sections:
-# CHECK-NEXT:    - Type:            TYPE
-# CHECK-NEXT:      Signatures:
-# CHECK-NEXT:        - Index:           0
-# CHECK-NEXT:          ParamTypes:
-# CHECK-NEXT:            - I32
-# CHECK-NEXT:          ReturnTypes:
-# CHECK-NEXT:            - FUNCREF