summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <azakai@google.com>2023-01-31 13:07:01 -0800
committerGitHub <noreply@github.com>2023-01-31 13:07:01 -0800
commita6f4b00141c994c744c6cb148d3ae60f271977f6 (patch)
treec78ac8fd8d6c37e6216a820ffa79faf90a9686a4
parentbc2eb23da2b96201a1af416684b5929dd6a99e12 (diff)
downloadbinaryen-a6f4b00141c994c744c6cb148d3ae60f271977f6.tar.gz
binaryen-a6f4b00141c994c744c6cb148d3ae60f271977f6.tar.bz2
binaryen-a6f4b00141c994c744c6cb148d3ae60f271977f6.zip
RemoveUnusedModuleElements: Handle changes to tables (#5469)
This is a long-standing bug - we ignored the possibility of table.set in this pass. We have few tests for this so it took a while for the fuzzer to notice it I suppose.
-rw-r--r--src/passes/RemoveUnusedModuleElements.cpp5
-rw-r--r--test/lit/passes/remove-unused-module-elements-refs.wast61
2 files changed, 66 insertions, 0 deletions
diff --git a/src/passes/RemoveUnusedModuleElements.cpp b/src/passes/RemoveUnusedModuleElements.cpp
index 02aed4904..6070d8bce 100644
--- a/src/passes/RemoveUnusedModuleElements.cpp
+++ b/src/passes/RemoveUnusedModuleElements.cpp
@@ -101,6 +101,11 @@ struct ReferenceFinder : public PostWalker<ReferenceFinder> {
void visitCallIndirect(CallIndirect* curr) {
note(ModuleElement(ModuleElementKind::Table, curr->table));
+ // Note a possible call of a function reference as well, as something might
+ // be written into the table during runtime. With precise tracking of what
+ // is written into the table we could do better here; we could also see
+ // which tables are immutable. TODO
+ noteCallRef(curr->heapType);
}
void visitCallRef(CallRef* curr) {
diff --git a/test/lit/passes/remove-unused-module-elements-refs.wast b/test/lit/passes/remove-unused-module-elements-refs.wast
index f7e49b90e..f0b90a7bb 100644
--- a/test/lit/passes/remove-unused-module-elements-refs.wast
+++ b/test/lit/passes/remove-unused-module-elements-refs.wast
@@ -346,6 +346,67 @@
)
)
+;; call_indirect can reach things in the table, or that are written to the table
+;; during runtime.
+(module
+ ;; CHECK: (type $none_=>_none (func))
+ ;; OPEN_WORLD: (type $none_=>_none (func))
+ (type $none_=>_none (func))
+
+ ;; CHECK: (table $table 22 funcref)
+ ;; OPEN_WORLD: (table $table 22 funcref)
+ (table $table 22 funcref)
+
+ ;; CHECK: (elem declare func $func)
+
+ ;; CHECK: (export "run" (func $run))
+
+ ;; CHECK: (func $run (type $none_=>_none)
+ ;; CHECK-NEXT: (table.set $table
+ ;; CHECK-NEXT: (i32.const 0)
+ ;; CHECK-NEXT: (ref.func $func)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: (call_indirect $table (type $none_=>_none)
+ ;; CHECK-NEXT: (i32.const 0)
+ ;; CHECK-NEXT: )
+ ;; CHECK-NEXT: )
+ ;; OPEN_WORLD: (elem declare func $func)
+
+ ;; OPEN_WORLD: (export "run" (func $run))
+
+ ;; OPEN_WORLD: (func $run (type $none_=>_none)
+ ;; OPEN_WORLD-NEXT: (table.set $table
+ ;; OPEN_WORLD-NEXT: (i32.const 0)
+ ;; OPEN_WORLD-NEXT: (ref.func $func)
+ ;; OPEN_WORLD-NEXT: )
+ ;; OPEN_WORLD-NEXT: (call_indirect $table (type $none_=>_none)
+ ;; OPEN_WORLD-NEXT: (i32.const 0)
+ ;; OPEN_WORLD-NEXT: )
+ ;; OPEN_WORLD-NEXT: )
+ (func $run (export "run")
+ ;; Set something in the table, and call it.
+ (table.set $table
+ (i32.const 0)
+ (ref.func $func)
+ )
+ (call_indirect $table (type $none_=>_none)
+ (i32.const 0)
+ )
+ )
+
+ ;; CHECK: (func $func (type $none_=>_none)
+ ;; CHECK-NEXT: (nop)
+ ;; CHECK-NEXT: )
+ ;; OPEN_WORLD: (func $func (type $none_=>_none)
+ ;; OPEN_WORLD-NEXT: (nop)
+ ;; OPEN_WORLD-NEXT: )
+ (func $func (type $none_=>_none)
+ ;; This function will be called indirectly from |run|, so it is reachable
+ ;; and this should not be turned into |unreachable|.
+ (nop)
+ )
+)
+
;; The call.without.effects intrinsic does a call to the reference given to it,
;; but for now other imports do not (until we add a flag for closed-world).
(module