Skip to content

Use an invalid table index as the callback for one-way functions #2942

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
mergify merged 3 commits into from
Dec 10, 2021
Merged

Use an invalid table index as the callback for one-way functions #2942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f752d3
Use an invalid table index as the callback for one-way functions
nomeata Nov 27, 2021
01d66ea
Update tests
nomeata Nov 27, 2021
90705e4
Merge branch 'master' into joachim/oneway
mergify[bot] Dec 10, 2021
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
8 changes: 5 additions & 3 deletions src/codegen/compile.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6361,9 +6361,11 @@ module FuncDec = struct
get_cb_index

let ignoring_callback env =
let name = "@ignore_callback" in
Func.define_built_in env name ["env", I32Type] [] (fun env -> G.nop);
compile_unboxed_const (E.add_fun_ptr env (E.built_in env name))
(* for one-way calls, we use an invalid table entry as the callback. this
way, the callback, when it comes back, will (safely) trap, even if the
module has completely changed in between. This way, one-way calls do not
get in the way of safe instantaneous upgrades *)
compile_unboxed_const (-1l)

let cleanup_callback env =
let name = "@cleanup_callback" in
Expand Down
4 changes: 2 additions & 2 deletions test/run-drun/ok/oneshot-callbacks.ic-ref-run.ok
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ debug.print: ping! 1
debug.print: go 1: 1
debug.print: ping-async! 1
debug.print: go 2: 1
← rejected (RC_CANISTER_ERROR): canister did not respond
← rejected (RC_CANISTER_ERROR): canister trapped: EvalTrapError :0.1 "uninitialized element -1"
→ update go(false)
debug.print: go 0: 0
debug.print: ping! 1
Expand All @@ -67,4 +67,4 @@ debug.print: ping! 1
debug.print: go 1: 1
debug.print: ping-async! 1
debug.print: go 2: 1
← rejected (RC_CANISTER_ERROR): canister did not respond
← rejected (RC_CANISTER_ERROR): canister trapped: EvalTrapError :0.1 "uninitialized element -1"