Skip to content

Directize: Handle nulls written by element segments #8873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kripken merged 2 commits into from
Jun 29, 2026
+60 −3
Merged

Directize: Handle nulls written by element segments #8873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
588393c
fix
kripken Jun 29, 2026
48f3e36
fix
kripken Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/ir/table-utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#ifndef wasm_ir_table_h
#define wasm_ir_table_h

#include "ir/element-utils.h"
#include "ir/literal-utils.h"
#include "ir/module-utils.h"
#include "support/stdckdint.h"
Expand Down Expand Up @@ -51,8 +50,19 @@ struct FlatTable {
if (end > names.size()) {
names.resize(end);
}
ElementUtils::iterElementSegmentFunctionNames(
segment, [&](Name entry, Index i) { names[start + i] = entry; });
for (Index i = 0; i < segment->data.size(); i++) {
auto* item = segment->data[i];
Comment thread
stevenfontanella marked this conversation as resolved.
if (auto* refFunc = item->dynCast<RefFunc>()) {
names[start + i] = refFunc->func;
} else if (item->is<RefNull>()) {
names[start + i] = Name();
} else {
Comment thread
stevenfontanella marked this conversation as resolved.
// Anything else, we can't represent.
// TODO: mark only this index as unoptimizable?
valid = false;
return;
}
}
});
}
};
Expand Down
47 changes: 47 additions & 0 deletions test/lit/passes/directize_all-features.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2148,3 +2148,50 @@
(func $target
)
)

;; Set a function using one elem, then trample it with a null. We should use the
;; null for the call_indirect.
(module
;; CHECK: (type $func (func))
;; IMMUT: (type $func (func))
(type $func (func))

;; CHECK: (table $table 6 funcref)
;; IMMUT: (table $table 6 funcref)
(table $table 6 funcref)

;; CHECK: (elem $5 (i32.const 0) $nop)
;; IMMUT: (elem $5 (i32.const 0) $nop)
(elem $5 (i32.const 0) $nop)

;; CHECK: (elem $6 (table $table) (i32.const 0) funcref (item (ref.null nofunc)))
;; IMMUT: (elem $6 (table $table) (i32.const 0) funcref (item (ref.null nofunc)))
(elem $6 (i32.const 0) funcref (item (ref.null nofunc)))

;; CHECK: (export "call" (func $call))

;; CHECK: (func $nop (type $func)
;; CHECK-NEXT: (nop)
;; CHECK-NEXT: )
;; IMMUT: (export "call" (func $call))

;; IMMUT: (func $nop (type $func)
;; IMMUT-NEXT: (nop)
;; IMMUT-NEXT: )
(func $nop (type $func)
(nop)
)

;; CHECK: (func $call (type $func)
;; CHECK-NEXT: (unreachable)
;; CHECK-NEXT: )
;; IMMUT: (func $call (type $func)
;; IMMUT-NEXT: (unreachable)
;; IMMUT-NEXT: )
(func $call (export "call")
;; This can be optimized to an unreachable.
(call_indirect $table (type $func)
(i32.const 0)
)
)
)
Loading