[PATCH] D96872: [WebAssembly][lld] --importTable flag only imports table if needed
Andy Wingo via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Wed Feb 17 08:52:34 PST 2021
wingo updated this revision to Diff 324327.
wingo added a comment.
Remove unused function
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D96872/new/
https://reviews.llvm.org/D96872
Files:
lld/test/wasm/import-table.test
lld/wasm/Driver.cpp
Index: lld/wasm/Driver.cpp
===================================================================
--- lld/wasm/Driver.cpp
+++ lld/wasm/Driver.cpp
@@ -799,21 +799,6 @@
return sym;
}
-static TableSymbol *createUndefinedIndirectFunctionTable(StringRef name) {
- WasmLimits limits{0, 0, 0}; // Set by the writer.
- WasmTableType *type = make<WasmTableType>();
- type->ElemType = uint8_t(ValType::FUNCREF);
- type->Limits = limits;
- StringRef module(defaultModule);
- uint32_t flags = config->exportTable ? 0 : WASM_SYMBOL_VISIBILITY_HIDDEN;
- flags |= WASM_SYMBOL_UNDEFINED;
- Symbol *sym =
- symtab->addUndefinedTable(name, name, module, flags, nullptr, type);
- sym->markLive();
- sym->forceExport = config->exportTable;
- return cast<TableSymbol>(sym);
-}
-
static TableSymbol *resolveIndirectFunctionTable() {
Symbol *existing = symtab->find(functionTableName);
if (existing) {
@@ -830,10 +815,7 @@
}
if (config->importTable) {
- if (existing)
- return cast<TableSymbol>(existing);
- else
- return createUndefinedIndirectFunctionTable(functionTableName);
+ return cast_or_null<TableSymbol>(existing);
} else if ((existing && existing->isLive()) || config->exportTable) {
// A defined table is required. Either because the user request an exported
// table or because the table symbol is already live. The existing table is
Index: lld/test/wasm/import-table.test
===================================================================
--- lld/test/wasm/import-table.test
+++ lld/test/wasm/import-table.test
@@ -1,7 +1,15 @@
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %p/Inputs/start.s -o %t.start.o
-# RUN: wasm-ld --import-table -o %t.wasm %t.start.o
+# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o
+# RUN: wasm-ld --export-all --import-table -o %t.wasm %t.start.o %t.o
# RUN: obj2yaml %t.wasm | FileCheck %s
+.globl require_function_table
+require_function_table:
+.functype require_function_table () -> ()
+ i32.const 1
+ call_indirect () -> ()
+ end_function
+
# Verify the --import-table flag creates a table import
# CHECK: - Type: IMPORT
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D96872.324327.patch
Type: text/x-patch
Size: 2202 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210217/6fda689d/attachment.bin>
More information about the llvm-commits
mailing list